Skip to content

Commit 2f458e5

Browse files
amartinezcsucamartinezcsuc
committed
Merge branch 'release/1.4.1'
2 parents 25f2ddb + 0a1f39e commit 2f458e5

File tree

186 files changed

+9488
-3638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+9488
-3638
lines changed

‎binding-core/src/main/java/org/csuc/deserialize/JaxbUnmarshal.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ public JaxbUnmarshal(SAXSource saxSource, Class[] classType) {
191191
u.setEventHandler( vec );
192192
u.setSchema(addSchema(classType));
193193

194-
// turn off the JAXB provider's default validation mechanism to
195-
// avoid duplicate validation
194+
// turn off the JAXB provider's default quality mechanism to
195+
// avoid duplicate quality
196196
u.setValidating( false );
197197

198198
// unmarshal

‎binding-core/src/main/java/org/csuc/deserialize/JibxUnMarshall.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public JibxUnMarshall(InputStream ins, Charset enc, Class<?> classType) {
4040
element = unmarshaller.unmarshalDocument(ins, enc.toString());
4141

4242
}catch (JiBXException e) {
43-
error = e;
43+
error = e;
4444
}
4545
}
4646

‎echoes-gui/echoes-gui-client.json‎

Lines changed: 86 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,105 @@
11
{
2-
"apps":[
2+
"apps": [
33
{
4-
"name":"Auth0-Server",
5-
"cwd":"${project.parent.basedir}/echoes-gui/echoes-gui-client",
6-
"script":"./server.js"
4+
"name": "ECHOES-GUI",
5+
"cwd": "${project.parent.basedir}/echoes-gui/echoes-gui-client",
6+
"script": "./server.js"
77
},
88
{
9-
"name":"Auth0 API",
10-
"cwd":"${project.parent.basedir}/echoes-gui/echoes-gui-client",
11-
"script":"./api.js"
9+
"name": "RabbitMQ-Consumer-Analyse",
10+
"cwd": "${project.parent.basedir}/",
11+
"script": "/usr/bin/java",
12+
"args": [
13+
"-jar",
14+
"bin/echoes-gui-consumer-analyse-${echoes.gui.consumer.analyse.version}-shaded.jar"
15+
],
16+
"env": {
17+
},
18+
"node_args": [
19+
],
20+
"log_date_format": "YYYY-MM-DD HH:mm Z",
21+
"exec_interpreter": "none",
22+
"exec_mode": "fork"
23+
},
24+
{
25+
"name": "RabbitMQ-Consumer-Recollect",
26+
"cwd": "${project.parent.basedir}/",
27+
"script": "/usr/bin/java",
28+
"args": [
29+
"-jar",
30+
"bin/echoes-gui-consumer-recollect-${echoes.gui.consumer.recollect.version}-shaded.jar"
31+
],
32+
"env": {
33+
},
34+
"node_args": [
35+
],
36+
"log_date_format": "YYYY-MM-DD HH:mm Z",
37+
"exec_interpreter": "none",
38+
"exec_mode": "fork"
39+
},
40+
{
41+
"name": "RabbitMQ-Consumer-Publish",
42+
"cwd": "${project.parent.basedir}/",
43+
"script": "/usr/bin/java",
44+
"args": [
45+
"-jar",
46+
"bin/echoes-gui-consumer-publish-${echoes.gui.consumer.publish.version}-shaded.jar"
47+
],
48+
"env": {
49+
},
50+
"node_args": [
51+
],
52+
"log_date_format": "YYYY-MM-DD HH:mm Z",
53+
"exec_interpreter": "none",
54+
"exec_mode": "fork"
55+
},
56+
{
57+
"name": "RabbitMQ-Consumer-Quality-Assurance",
58+
"cwd": "${project.parent.basedir}/",
59+
"script": "/usr/bin/java",
60+
"args": [
61+
"-jar",
62+
"bin/echoes-gui-consumer-quality-assurance-${echoes.gui.consumer.quality.assurance.version}-shaded.jar"
63+
],
64+
"env": {
65+
},
66+
"node_args": [
67+
],
68+
"log_date_format": "YYYY-MM-DD HH:mm Z",
69+
"exec_interpreter": "none",
70+
"exec_mode": "fork"
1271
},
1372
{
14-
"name":"RabbitMQ-Consumer",
15-
"cwd":"${project.parent.basedir}/",
16-
"script":"/usr/bin/java",
17-
"args":[
73+
"name": "RabbitMQ-Consumer-Zip",
74+
"cwd": "${project.parent.basedir}/",
75+
"script": "/usr/bin/java",
76+
"args": [
1877
"-jar",
19-
"bin/echoes-gui-consumer-${echoes.gui.consumer.version}.jar"
78+
"bin/echoes-gui-consumer-zip-${echoes.gui.consumer.zip.version}-shaded.jar"
2079
],
21-
"env":{
80+
"env": {
2281
},
23-
"node_args":[
82+
"node_args": [
2483
],
25-
"log_date_format":"YYYY-MM-DD HH:mm Z",
26-
"exec_interpreter":"none",
27-
"exec_mode":"fork"
84+
"log_date_format": "YYYY-MM-DD HH:mm Z",
85+
"exec_interpreter": "none",
86+
"exec_mode": "fork"
2887
},
2988
{
30-
"name":"Jetty-Server",
31-
"cwd":"${project.parent.basedir}/",
32-
"script":"/usr/bin/java",
33-
"args":[
89+
"name": "Jetty-Server",
90+
"cwd": "${project.parent.basedir}/",
91+
"script": "/usr/bin/java",
92+
"args": [
3493
"-jar",
3594
"bin/echoes-gui-server-${echoes.gui.server.version}.jar"
3695
],
37-
"env":{
96+
"env": {
3897
},
39-
"node_args":[
98+
"node_args": [
4099
],
41-
"log_date_format":"YYYY-MM-DD HH:mm Z",
42-
"exec_interpreter":"none",
43-
"exec_mode":"fork"
100+
"log_date_format": "YYYY-MM-DD HH:mm Z",
101+
"exec_interpreter": "none",
102+
"exec_mode": "fork"
44103
}
45104
]
46-
}
105+
}

‎echoes-gui/echoes-gui-client/.env.example‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1+
# AUTH0 CONFIG
12
AUTH0_AUDIENCE={API_IDENTIFIER}
2-
AUTH0_DOMAIN={DOMAIN}
3+
AUTH0_DOMAIN={DOMAIN}
4+
5+
# GUI CONFIG
6+
GUI_HOSTNAME={GUI_HOSTNAME}
7+
GUI_PORT={GUI_PORT}
8+
9+
# API CONFIG
10+
API_HOSTNAME={API_HOSTNAME}
11+
API_PORT={API_PORT}

‎echoes-gui/echoes-gui-client/app/analyse/analyse.controller.detail.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
.module('app')
77
.controller('AnalyseControllerDetail', analyseDetail);
88

9-
analyseDetail.$inject = ['$scope', 'authService', '$stateParams', 'echoesChart', 'restApi', '$log'];
9+
analyseDetail.$inject = ['$scope', 'authService', '$stateParams', 'echoesChart', 'restApi', '$log', '$state'];
1010

11-
function analyseDetail($scope, authService, $stateParams, echoesChart, restApi, $log) {
11+
function analyseDetail($scope, authService, $stateParams, echoesChart, restApi, $log, $state) {
1212
var vm = this;
1313
vm.title = 'analyse-detail';
1414
vm.auth = authService;
@@ -17,13 +17,11 @@
1717

1818
if (authService.getCachedProfile()) {
1919
vm.profile = authService.getCachedProfile();
20-
2120
run();
2221
} else {
2322
authService.getProfile(function (err, profile) {
2423
vm.profile = profile;
2524
$scope.$apply();
26-
2725
run();
2826
});
2927
}
@@ -33,12 +31,12 @@
3331
restApi.getAnalyseError({
3432
user: vm.profile.sub,
3533
id: vm._id,
36-
}).then(function (_data) {
37-
$log.info(_data);
34+
}).then(function (_d) {
35+
$log.info(_d);
3836

39-
vm.data = _data.data;
40-
}).catch(function (_data) {
41-
$log.info(_data);
37+
vm.data = _d.data;
38+
}).catch(function (_d) {
39+
$log.info(_d);
4240
$state.go("404");
4341
});
4442
}

‎echoes-gui/echoes-gui-client/app/analyse/analyse.controller.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
vm.page = $stateParams.page;
2424
vm.count = $stateParams.count;
2525

26+
27+
2628
if (authService.getCachedProfile()) {
2729
vm.profile = authService.getCachedProfile();
2830
run(vm.page, vm.count);
@@ -55,7 +57,7 @@
5557
vm.tableParams = ngTableParams(vm.data, _count)
5658
}).catch(function (_data) {
5759
$log.info(_data);
58-
$state.go("404");
60+
//$state.go("404");
5961
});
6062

6163
restApi.getAnalyseStatusAggregation({
@@ -64,7 +66,7 @@
6466
vm.chart = echoesChart.getAggregationDoughnut(_data.data)
6567
}).catch(function (_data) {
6668
console.log(_data)
67-
$state.go("404");
69+
//$state.go("404");
6870
})
6971
}
7072

@@ -86,7 +88,7 @@
8688
return d.data._embedded;
8789
}).catch(function (_data) {
8890
$log.info(_data);
89-
$state.go("404");
91+
//$state.go("404");
9092
});
9193
}
9294
});
@@ -106,7 +108,7 @@
106108
$state.go($state.current, {}, {reload: true});
107109
}).catch(function (_data) {
108110
$log.info(_data);
109-
$state.go("404");
111+
//$state.go("404");
110112
});
111113
}
112114

@@ -152,7 +154,7 @@
152154
$state.go($state.current, {}, {reload: true});
153155
}).catch(function (_data) {
154156
$log.info(_data);
155-
$state.go("404");
157+
//$state.go("404");
156158
});
157159
}
158160
};

‎echoes-gui/echoes-gui-client/app/analyse/analyse.detail.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h2>{{vm.title}}</h2>
4747

4848
<uib-accordion>
4949
<div uib-accordion-group class="panel-default" heading="Exception">
50-
<pre>{{vm.data | json : spacing}}</pre>
50+
<pre>{{vm.data.exception}}</pre>
5151
</div>
5252

5353
</uib-accordion>

‎echoes-gui/echoes-gui-client/app/analyse/analyse.html‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
<div class="panel panel-default" ng-show="vm.data._size > 0">
88
<div class="panel-heading"><h3>Statistics</h3></div>
99
<div class="panel-body">
10-
<canvas id="doughnut" class="chart chart-doughnut" chart-data="vm.chart.data"
11-
chart-labels="vm.chart.labels"
12-
chart-options="vm.chart.options" chart-colors="vm.chart.colors" height="50%"></canvas>
10+
<div class="col-lg-2"></div>
11+
<div class="col-lg-8">
12+
<canvas class="chart chart-doughnut" chart-data="vm.chart.data"
13+
chart-labels="vm.chart.labels"
14+
chart-options="vm.chart.options" chart-colors="vm.chart.colors"></canvas>
15+
</div>
16+
<div class="col-lg-2"></div>
1317
</div>
1418
</div>
1519

@@ -20,10 +24,10 @@ <h3>{{vm.title}} <span class="badge badge-light">{{vm.data._size}}</span>
2024
</h3>
2125
</div>
2226
<div class="panel-body">
23-
<div class="table-responsive col-12 col-sm-12 col-lg-12">
27+
<div class="table-responsive col-xs-12 col-sm-12 col-lg-12">
2428
<table ng-table="vm.tableParams" class="table" show-filter="false">
2529
<tr ng-repeat="data in $data">
26-
<td title="'status'">
30+
<td title="'job'">
2731
<span ng-if="data.status == 'ERROR'"
2832
class="glyphicon glyphicon-remove-sign text-danger"></span>
2933
<span ng-if="data.status == 'END'"
@@ -32,27 +36,21 @@ <h3>{{vm.title}} <span class="badge badge-light">{{vm.data._size}}</span>
3236
class="glyphicon glyphicon-play-circle text-info"></span>
3337
<span ng-if="data.status == 'QUEUE'" class="glyphicon glyphicon-hourglass"></span>
3438
</td>
39+
<td title="'status'">
40+
<i class="fas fa-circle text-muted"></i><i class="fas fa-circle text-muted"></i><i class="fas fa-circle text-muted"></i>
41+
</td>
3542
<td title="'id'">
3643
<a ng-if="data.status != 'ERROR'"
3744
ng-class="{'btn disabled' : data.status != 'END' && data.status != 'ERROR' }"
3845
target="_self"
3946
href="/rest/api/analyse/user/{{vm.profile.sub}}/id/{{data._id}}/download">{{data._id}}</a>
4047
<a ui-sref="analyse-detail({_id: '{{data._id}}'})" ng-if="data.status == 'ERROR'">{{data._id}}</a>
4148
</td>
42-
<td title="'format'">
43-
{{data.format}}
44-
</td>
45-
<td title="'method'">
46-
{{data.method}}
47-
</td>
48-
<td title="'type'">
49-
{{data.type}}
50-
</td>
5149
<td title="'input'">
52-
{{data.value}}
50+
{{data.value | limitTo: 50}}<span ng-if="data.value.length > 50">...</span>
5351
</td>
5452
<td title="'timestamp'">
55-
{{data.timestamp}}
53+
{{data.timestamp.year}}-{{data.timestamp.monthValue}}-{{data.timestamp.dayOfMonth}}
5654
</td>
5755
<td title="'remove'">
5856
<a ng-click="remove(data._id)">

0 commit comments

Comments
 (0)