Skip to content

Commit 7130b1d

Browse files
committed
fixed #281 - switched to jetty. got rid of warnings
1 parent 5971585 commit 7130b1d

File tree

6 files changed

+24
-5
lines changed

6 files changed

+24
-5
lines changed

quick-start/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ targetCompatibility = 1.8
3838
dependencies {
3939
compile("org.springframework.boot:spring-boot-starter:${springBootVersion}")
4040
compile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}")
41+
compile("org.springframework.boot:spring-boot-starter-jetty:${springBootVersion}")
4142
compile("org.springframework.boot:spring-boot-starter-websocket:${springBootVersion}")
4243
compile("org.springframework.boot:spring-boot-starter-thymeleaf:${springBootVersion}")
4344
compile("org.aspectj:aspectjweaver:1.8.9")
@@ -58,6 +59,7 @@ dependencies {
5859
configurations {
5960
all*.exclude group: 'xml-apis'
6061
all*.exclude group: 'xerces'
62+
compile.exclude module: "spring-boot-starter-tomcat"
6163
}
6264

6365
task cleanUI(type: Delete) {

quick-start/src/main/ui/app/home/home.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</div>
2626
<div class="flow-container" [ngClass]="{ 'collapsed' : isCollapsed(entity) }">
2727
<div class="padder">
28-
<div class="subheader">
28+
<div class="flow-subheader">
2929
Input Flows
3030
<div class="mdl-layout-spacer"></div>
3131
<mdl-button mdl-button-type="icon" id="new-input-flow" aria-label="New Input Flow" (click)="newInputFlow($event, entity)">
@@ -46,7 +46,7 @@
4646
</span>
4747
</li>
4848
</ul>
49-
<div class="subheader">
49+
<div class="flow-subheader">
5050
Harmonize Flows
5151
<div class="mdl-layout-spacer"></div>
5252
<mdl-button mdl-button-type="icon" id="new-harmonize-flow" aria-label="New Harmonize Flow" (click)="newHarmonizeFlow($event, entity)">

quick-start/src/main/ui/app/home/home.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $header-height: 48px;
7575
.padder {
7676
padding: 0px 10px;
7777
}
78-
padding: 0px 10px;
78+
padding: 0px 0px 0px 20px;
7979
width: 100%;
8080
box-sizing: border-box;
8181
max-height: 5000px;
@@ -104,7 +104,7 @@ $header-height: 48px;
104104
background-color: $hover-color;
105105
}
106106
}
107-
.subheader {
107+
.flow-subheader {
108108
font-weight: bold;
109109
margin: 0px;
110110
width: 100%;

quick-start/src/main/ui/app/traces/trace-viewer.component.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,18 @@ export class TraceViewerComponent implements OnInit, OnDestroy {
8181
return data;
8282
}
8383

84+
getButtonClasses(plugin) {
85+
let classes = [];
86+
if (this.currentPluginType === plugin) {
87+
classes.push('active');
88+
}
89+
90+
if (this.trace[plugin + 'Plugin'].error) {
91+
classes.push('error');
92+
}
93+
return classes.join(' ');
94+
}
95+
8496
private setCurrent(type: string) {
8597
this.currentPluginType = type;
8698
this.currentPlugin = this.trace[type + 'Plugin'];

quick-start/src/main/ui/app/traces/trace-viewer.style.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ $green-color: unquote("rgb(#{$palette-datahub-green})");
4444
}
4545
}
4646

47+
.mdl-button--primary.mdl-button--primary.mdl-button--raised.error {
48+
background-color: $red-color;
49+
border: 1px solid red;
50+
}
51+
4752
.plugin.active {
4853
font-weight: bold;
4954
box-shadow: 0 0 8px rgba(0, 0, 0, 0.28), 0 8px 16px rgba(0, 0, 0, 0.46);

quick-start/src/main/ui/app/traces/trace-viewer.tpl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<mdl-button mdl-button-type="raised" mdl-colored="primary"
1616
(click)="setCurrent(plugin)"
1717
class="plugin"
18-
[ngClass]="{'active': (currentPluginType === plugin)}">
18+
[ngClass]="getButtonClasses(plugin)">
1919
<div class="plugin-name">{{plugin}}</div>
2020
<div class="plugin-duration">{{trace[plugin + 'Plugin'].duration}}<span class="unit">s</span></div>
2121
</mdl-button>

0 commit comments

Comments
 (0)