cpee 2.1.141 → 2.1.143
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/cockpit/compliance-view.html +2 -5
- data/cockpit/compliance.html +2 -5
- data/cockpit/conformance.html +299 -0
- data/cockpit/css/compliance.css +3 -64
- data/cockpit/css/ui.css +7 -5
- data/cockpit/edit.html +1 -4
- data/cockpit/graph.html +1 -4
- data/cockpit/index.html +1 -4
- data/cockpit/js/compliance.js +85 -396
- data/cockpit/js/extended_columns.js +1 -1
- data/cockpit/js/instance.js +3 -3
- data/cockpit/js/mp-conformance.js +84 -0
- data/cockpit/js/parameters.js +3 -1
- data/cockpit/js/ui.js +2 -2
- data/cockpit/js/wfadaptor.js +41 -30
- data/cockpit/llm.html +1 -4
- data/cockpit/llmmodel.html +1 -4
- data/cockpit/model.html +1 -4
- data/cockpit/only_llm.html +1 -4
- data/cockpit/rngs/aggregations.rng +15 -0
- data/cockpit/rngs/intervals.rng +12 -0
- data/cockpit/rngs/nlrequirements.rng +8 -0
- data/cockpit/rngs/requirements.rng +2 -2
- data/cockpit/rngs/rules.rng +30 -0
- data/cockpit/themes/base.js +5 -4
- data/cockpit/track.html +1 -4
- data/cpee.gemspec +1 -1
- data/lib/cpee/implementation_callbacks.rb +4 -2
- data/lib/cpee/implementation_notifications.rb +2 -2
- data/server/executionhandlers/ruby/controller.rb +4 -1
- metadata +7 -1
data/cockpit/js/parameters.js
CHANGED
|
@@ -52,7 +52,9 @@ $(document).ready(function() {
|
|
|
52
52
|
var but = $(document).find('#parameters ui-content ui-area:not(.inactive) > div button.relaxngui_control, ui-tabbed.parameters ui-content ui-area:not(.inactive) > div button.relaxngui_control');
|
|
53
53
|
but.click();
|
|
54
54
|
var inp = $(document).find('#parameters ui-content ui-area:not(.inactive) > div input, ui-tabbed.parameters ui-content ui-area:not(.inactive) > div input');
|
|
55
|
-
|
|
55
|
+
var cur = $(inp[inp.length-2]);
|
|
56
|
+
if (cur.is('[readonly]')) { cur = $(inp[inp.length-1]); } // readonly name, value is active instead
|
|
57
|
+
cur.focus();
|
|
56
58
|
var are = $(document).find('#parameters ui-content ui-area:not(.inactive) > div, ui-tabbed.parameters ui-content ui-area:not(.inactive) > div');
|
|
57
59
|
var tab = $(document).find('#parameters ui-content ui-area:not(.inactive) > div > div, ui-tabbed.parameters ui-content ui-area:not(.inactive) > div > div');
|
|
58
60
|
are.animate({ scrollTop: tab.height() }, "slow");
|
data/cockpit/js/ui.js
CHANGED
|
@@ -13,7 +13,7 @@ function config_defaults(){
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
$(document).ready(function() {
|
|
16
|
-
if (!(
|
|
16
|
+
if (!(Cookies.get('cpee_iagree')) &&$("body > div[id='disclaimer']").length > 0) {
|
|
17
17
|
$("body > :not([id='disclaimer'])").remove();
|
|
18
18
|
$("body > [id='disclaimer']").removeClass('hidden');
|
|
19
19
|
|
|
@@ -25,7 +25,7 @@ $(document).ready(function() {
|
|
|
25
25
|
}
|
|
26
26
|
});
|
|
27
27
|
$("#icontinue").click(function(){
|
|
28
|
-
|
|
28
|
+
Cookies.set('cpee_iagree','yes');
|
|
29
29
|
location.reload();
|
|
30
30
|
});
|
|
31
31
|
} else {
|
data/cockpit/js/wfadaptor.js
CHANGED
|
@@ -171,7 +171,7 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
|
|
|
171
171
|
if ( typeof manifestation.elements[element].description === 'string' ) {
|
|
172
172
|
manifestation.elements[element].description = [ manifestation.elements[element].description ];
|
|
173
173
|
}
|
|
174
|
-
if (
|
|
174
|
+
if (Array.isArray(manifestation.elements[element].description)) {
|
|
175
175
|
manifestation.elements[element].description.forEach(function(val,ind){
|
|
176
176
|
deferreds.push(
|
|
177
177
|
$.ajax({
|
|
@@ -493,13 +493,13 @@ function WfIllustrator(wf_adaptor) { // View {{{
|
|
|
493
493
|
var debug_dim = this.dim.debug = function() { //{{{
|
|
494
494
|
line = '\n';
|
|
495
495
|
for (let i=1; i < self.dim.symbols.length; i++) {
|
|
496
|
-
line +=
|
|
496
|
+
line += i.sprintf('%02d') + ': ';
|
|
497
497
|
if (self.dim.symbols[i]) {
|
|
498
498
|
for (let j=1; j < self.dim.symbols[i].length; j++) {
|
|
499
499
|
line += ' [ ';
|
|
500
|
-
if (self.dim.symbols[i] && self.dim.symbols[i][j] && self.dim.symbols[i][j].x) { line +=
|
|
500
|
+
if (self.dim.symbols[i] && self.dim.symbols[i][j] && self.dim.symbols[i][j].x) { line += self.dim.symbols[i][j].x.sprintf('%3d'); } else { line += ' '; }
|
|
501
501
|
line += ', ';
|
|
502
|
-
if (self.dim.symbols[i] && self.dim.symbols[i][j] && self.dim.symbols[i][j].width) { line +=
|
|
502
|
+
if (self.dim.symbols[i] && self.dim.symbols[i][j] && self.dim.symbols[i][j].width) { line += self.dim.symbols[i][j].width.sprintf('%3d'); } else { line += ' '; }
|
|
503
503
|
line += ' ] ';
|
|
504
504
|
}
|
|
505
505
|
}
|
|
@@ -846,32 +846,43 @@ function WfIllustrator(wf_adaptor) { // View {{{
|
|
|
846
846
|
if (g.attr('element-endpoint')) {
|
|
847
847
|
let tsym = self.get_symbol(g.attr('element-endpoint'));
|
|
848
848
|
if (tsym) {
|
|
849
|
-
let
|
|
850
|
-
|
|
851
|
-
if (
|
|
852
|
-
|
|
853
|
-
|
|
849
|
+
let tpart = (p) => $('.part-' + p,tsym);
|
|
850
|
+
let tnor = tpart('normal');
|
|
851
|
+
if (tnor.length + tpart('start').length + tpart('middle').length + tpart('end').length == 0) {
|
|
852
|
+
// a plain icon, all of it is the normal part
|
|
853
|
+
tnor = $X('<g class="part-normal" xmlns="http://www.w3.org/2000/svg"></g>');
|
|
854
|
+
tnor.append($(tsym.documentElement.children).clone());
|
|
854
855
|
}
|
|
855
|
-
if (
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
|
|
862
|
-
|
|
863
|
-
|
|
864
|
-
|
|
865
|
-
|
|
866
|
-
|
|
867
|
-
|
|
868
|
-
|
|
856
|
+
if (tpart('start').length + tpart('middle').length + tpart('end').length == 0) {
|
|
857
|
+
// only a normal part: the icon has no place for a label, so none is shown
|
|
858
|
+
$('.part-start, .part-middle, .part-end',sym).remove();
|
|
859
|
+
} else {
|
|
860
|
+
// an own middle without an end is not clipped after the label, so then the default end goes as well
|
|
861
|
+
if (tpart('middle').length > 0 || tpart('end').length > 0) {
|
|
862
|
+
$('.part-end',sym).remove();
|
|
863
|
+
}
|
|
864
|
+
if (tpart('end').length > 0) {
|
|
865
|
+
sym.prepend(tpart('end').clone());
|
|
866
|
+
}
|
|
867
|
+
if (tpart('middle').length > 0) {
|
|
868
|
+
$('.part-middle',sym).remove();
|
|
869
|
+
sym.prepend(tpart('middle').clone());
|
|
870
|
+
}
|
|
871
|
+
let dsta = $('.part-start',sym);
|
|
872
|
+
if (tpart('start').length > 0) {
|
|
873
|
+
dsta.remove();
|
|
874
|
+
sym.prepend(tpart('start').clone());
|
|
875
|
+
} else if (dsta.length > 0 && tnor.length > 0) {
|
|
876
|
+
// without an own start, the normal part is the start, clipped like the default start
|
|
877
|
+
let tsta = tnor.clone().attr('class','part-start');
|
|
878
|
+
if (dsta.attr('clip-path')) { tsta.attr('clip-path',dsta.attr('clip-path')); }
|
|
879
|
+
dsta.remove();
|
|
880
|
+
sym.prepend(tsta);
|
|
881
|
+
}
|
|
869
882
|
}
|
|
870
|
-
if (
|
|
883
|
+
if (tnor.length > 0) {
|
|
871
884
|
$('.part-normal',sym).remove();
|
|
872
|
-
|
|
873
|
-
ts.append($(tsym.documentElement.children).clone());
|
|
874
|
-
sym.prepend(ts);
|
|
885
|
+
sym.prepend(tnor.clone());
|
|
875
886
|
}
|
|
876
887
|
}
|
|
877
888
|
let tprop = self.get_properties(g.attr('element-endpoint'));
|
|
@@ -1251,7 +1262,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
1251
1262
|
// Adaption functions {{{
|
|
1252
1263
|
this.insert_after = function(new_node, target, source_opts) { // {{{
|
|
1253
1264
|
reset_used_id_list();
|
|
1254
|
-
if (
|
|
1265
|
+
if (Array.isArray(new_node)) {
|
|
1255
1266
|
$.each(new_node,function(k,v){
|
|
1256
1267
|
var nn = self.source(v,source_opts);
|
|
1257
1268
|
target.after(nn);
|
|
@@ -1266,7 +1277,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
1266
1277
|
} // }}}
|
|
1267
1278
|
this.insert_first_into = function(new_node, target, source_opts) { // {{{
|
|
1268
1279
|
reset_used_id_list();
|
|
1269
|
-
if (
|
|
1280
|
+
if (Array.isArray(new_node)) {
|
|
1270
1281
|
$.each(new_node,function(k,v){
|
|
1271
1282
|
var nn = self.source(v,source_opts);
|
|
1272
1283
|
target.prepend(nn);
|
|
@@ -1281,7 +1292,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
1281
1292
|
} // }}}
|
|
1282
1293
|
this.insert_last_into = function(new_node, target) { // {{{
|
|
1283
1294
|
reset_used_id_list();
|
|
1284
|
-
if (
|
|
1295
|
+
if (Array.isArray(new_node)) {
|
|
1285
1296
|
$.each(new_node,function(k,v){
|
|
1286
1297
|
var nn = self.source(v);
|
|
1287
1298
|
target.append(nn);
|
data/cockpit/llm.html
CHANGED
|
@@ -25,11 +25,8 @@
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
29
28
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/
|
|
31
|
-
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
32
|
-
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
29
|
+
<script type="text/javascript" src="/js_libs/js.cookie.min.js"></script>
|
|
33
30
|
|
|
34
31
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
35
32
|
|
data/cockpit/llmmodel.html
CHANGED
|
@@ -25,11 +25,8 @@
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
29
28
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/
|
|
31
|
-
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
32
|
-
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
29
|
+
<script type="text/javascript" src="/js_libs/js.cookie.min.js"></script>
|
|
33
30
|
|
|
34
31
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
35
32
|
|
data/cockpit/model.html
CHANGED
|
@@ -25,11 +25,8 @@
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
29
28
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/
|
|
31
|
-
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
32
|
-
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
29
|
+
<script type="text/javascript" src="/js_libs/js.cookie.min.js"></script>
|
|
33
30
|
|
|
34
31
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
35
32
|
|
data/cockpit/only_llm.html
CHANGED
|
@@ -25,11 +25,8 @@
|
|
|
25
25
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
26
26
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
27
27
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
28
|
-
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
29
28
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
30
|
-
<script type="text/javascript" src="/js_libs/
|
|
31
|
-
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
32
|
-
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
29
|
+
<script type="text/javascript" src="/js_libs/js.cookie.min.js"></script>
|
|
33
30
|
|
|
34
31
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
35
32
|
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
<element rngui:version="1.2" name="aggregations" ns="http://cpee.org/ns/properties/2.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
|
|
2
|
+
<zeroOrMore rngui:label="Create Aggregation">
|
|
3
|
+
<element name='aggregation' rngui:header='Aggregation'>
|
|
4
|
+
<element name='id' rngui:label='Identifier'>
|
|
5
|
+
<data type="string" rngui:label="value"/>
|
|
6
|
+
</element>
|
|
7
|
+
<element name='aggregation-operation' rngui:label='Aggregation Operation'>
|
|
8
|
+
<data type="string" rngui:label="value"/>
|
|
9
|
+
</element>
|
|
10
|
+
<element name='window-predicate' rngui:label='Window Predicate'>
|
|
11
|
+
<data type="string" rngui:label="value"/>
|
|
12
|
+
</element>
|
|
13
|
+
</element>
|
|
14
|
+
</zeroOrMore>
|
|
15
|
+
</element>
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
<element rngui:version="1.2" name="intervals" ns="http://cpee.org/ns/properties/2.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
|
|
2
|
+
<zeroOrMore rngui:label="Create Interval">
|
|
3
|
+
<element name='interval' rngui:header='Interval'>
|
|
4
|
+
<element name='id' rngui:label='Identifier'>
|
|
5
|
+
<data type="string" rngui:label="value"/>
|
|
6
|
+
</element>
|
|
7
|
+
<element name='validity_predicate' rngui:label='Validity Predicate (event, state, trace)'>
|
|
8
|
+
<data type="string" rngui:label="value"/>
|
|
9
|
+
</element>
|
|
10
|
+
</element>
|
|
11
|
+
</zeroOrMore>
|
|
12
|
+
</element>
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
<element rngui:version="1.2" name="nlrequirements" ns="http://cpee.org/ns/properties/2.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
|
|
2
|
+
<zeroOrMore rngui:label="Create NL Requirement">
|
|
3
|
+
<element rngui:label='Name' rngui:action_button_label="Extract" rngui:action_button_handler="extract_single_nl_requirement(entry)">
|
|
4
|
+
<anyName rngui:unique="true" rngui:default="javascript:next_requirement_id()" rngui:readonly="true"/>
|
|
5
|
+
<data type="string" rngui:label="Write natural-language requirement"/>
|
|
6
|
+
</element>
|
|
7
|
+
</zeroOrMore>
|
|
8
|
+
</element>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<element rngui:version="1.2" name="requirements" ns="http://cpee.org/ns/properties/2.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
|
|
2
2
|
<zeroOrMore rngui:label="Create Requirement">
|
|
3
|
-
<element rngui:label='Name'>
|
|
4
|
-
<anyName rngui:unique="true"/>
|
|
3
|
+
<element rngui:label='Name' rngui:action_button_label="Save" rngui:action_button_handler="save_requirements()">
|
|
4
|
+
<anyName rngui:unique="true" rngui:default="javascript:next_requirement_id()" rngui:readonly="true"/>
|
|
5
5
|
<data type="string" rngui:label="value"/>
|
|
6
6
|
</element>
|
|
7
7
|
</zeroOrMore>
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
<element rngui:version="1.2" name="rules" ns="http://cpee.org/ns/properties/2.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
|
|
2
|
+
<zeroOrMore rngui:label="Create Rules">
|
|
3
|
+
<element name='rule' rngui:header='Rule'>
|
|
4
|
+
<element name='rule_id' rngui:label='Rule Identifier'>
|
|
5
|
+
<data type="string" rngui:label="value"/>
|
|
6
|
+
</element>
|
|
7
|
+
<element name='interval' rngui:label='Validity Interval (event, state, trace)'>
|
|
8
|
+
<data type="string" rngui:label="value"/>
|
|
9
|
+
</element>
|
|
10
|
+
<element name='filter' rngui:label='Event Filter (event, state)'>
|
|
11
|
+
<data type="string" rngui:label="value"/>
|
|
12
|
+
</element>
|
|
13
|
+
<element name='spawn_condition' rngui:label='Spawn Condition (event, state, trace)'>
|
|
14
|
+
<data type="string" rngui:label="value"/>
|
|
15
|
+
</element>
|
|
16
|
+
<element name='predicate' rngui:label='Predicate (event, state, trace)'>
|
|
17
|
+
<data type="string" rngui:label="value"/>
|
|
18
|
+
</element>
|
|
19
|
+
<element name='termination_predicate' rngui:label='Termination Predicate (event, state, trace)'>
|
|
20
|
+
<data type="string" rngui:label="value"/>
|
|
21
|
+
</element>
|
|
22
|
+
<element name='action_sat' rngui:label='Satisfaction Action (event, state, trace)'>
|
|
23
|
+
<data type="string" rngui:label="value"/>
|
|
24
|
+
</element>
|
|
25
|
+
<element name='action_viol' rngui:label='Compensation Action (event, state, trace)'>
|
|
26
|
+
<data type="string" rngui:label="value"/>
|
|
27
|
+
</element>
|
|
28
|
+
</element>
|
|
29
|
+
</zeroOrMore>
|
|
30
|
+
</element>
|
data/cockpit/themes/base.js
CHANGED
|
@@ -34,7 +34,7 @@ function WFAdaptorManifestationBase(adaptor) {
|
|
|
34
34
|
//{{{ Return the svgid for the selected task
|
|
35
35
|
this.selected = function(){
|
|
36
36
|
var svgid = 'unknown';
|
|
37
|
-
|
|
37
|
+
self.adaptor.illustrator.get_elements().each(function(key,value) {
|
|
38
38
|
if ($(value).hasClass('selected')) {
|
|
39
39
|
svgid = $(value).attr('element-id');
|
|
40
40
|
}
|
|
@@ -44,7 +44,7 @@ function WFAdaptorManifestationBase(adaptor) {
|
|
|
44
44
|
//{{{ Return the svgids for all marked tasks
|
|
45
45
|
this.marked = function(){
|
|
46
46
|
var svgid = [];
|
|
47
|
-
|
|
47
|
+
self.adaptor.illustrator.get_elements().each(function(key,value) {
|
|
48
48
|
if ($(value).hasClass('marked')) {
|
|
49
49
|
svgid.push($(value).attr('element-id'));
|
|
50
50
|
}
|
|
@@ -54,7 +54,7 @@ function WFAdaptorManifestationBase(adaptor) {
|
|
|
54
54
|
//{{{ Return the json for all marked tasks
|
|
55
55
|
this.marked_text = function(){
|
|
56
56
|
var nodes = [];
|
|
57
|
-
var markymark =
|
|
57
|
+
var markymark = self.marked().uniq();
|
|
58
58
|
$(markymark).each(function(key,svgid){
|
|
59
59
|
var node = self.adaptor.description.get_node_by_svg_id(svgid);
|
|
60
60
|
nodes.push($(node).serializePrettyXML());
|
|
@@ -110,7 +110,8 @@ function WFAdaptorManifestationBase(adaptor) {
|
|
|
110
110
|
check2.push(value.type);
|
|
111
111
|
});
|
|
112
112
|
|
|
113
|
-
|
|
113
|
+
// all types of the copied nodes are allowed in the group
|
|
114
|
+
if (nodes.length > 0 && check1.uniq().length == check1.intersection(check2).length) {
|
|
114
115
|
if (myid == localStorage.getItem('marked_from')) {
|
|
115
116
|
$(nodes).each(function(key,node){
|
|
116
117
|
nodes[key] = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
|
data/cockpit/track.html
CHANGED
|
@@ -24,11 +24,8 @@
|
|
|
24
24
|
<!-- libs, do not modify. When local than load local libs. -->
|
|
25
25
|
<script type="text/javascript" src="/js_libs/jquery.min.js"></script>
|
|
26
26
|
<script type="text/javascript" src="/js_libs/uidash_util.js"></script>
|
|
27
|
-
<script type="text/javascript" src="/js_libs/printf.js"></script>
|
|
28
27
|
<script type="text/javascript" src="/js_libs/strftime.min.js"></script>
|
|
29
|
-
<script type="text/javascript" src="/js_libs/
|
|
30
|
-
<script type="text/javascript" src="/js_libs/underscore.min.js"></script>
|
|
31
|
-
<script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
|
|
28
|
+
<script type="text/javascript" src="/js_libs/js.cookie.min.js"></script>
|
|
32
29
|
|
|
33
30
|
<script type="text/javascript" src="/js_libs/relaxngui.js"></script>
|
|
34
31
|
|
data/cpee.gemspec
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
s.name = "cpee"
|
|
3
|
-
s.version = "2.1.
|
|
3
|
+
s.version = "2.1.143"
|
|
4
4
|
s.platform = Gem::Platform::RUBY
|
|
5
5
|
s.license = "LGPL-3.0-or-later"
|
|
6
6
|
s.summary = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
|
|
@@ -102,7 +102,8 @@ module CPEE
|
|
|
102
102
|
{},
|
|
103
103
|
{},
|
|
104
104
|
'true',
|
|
105
|
-
opts[:redis]
|
|
105
|
+
opts[:redis],
|
|
106
|
+
0
|
|
106
107
|
)
|
|
107
108
|
else
|
|
108
109
|
@status = 404
|
|
@@ -169,7 +170,8 @@ module CPEE
|
|
|
169
170
|
{},
|
|
170
171
|
{},
|
|
171
172
|
@p[0].class == Riddl::Parameter::Simple ? @p[0].value : @p[0].value.read,
|
|
172
|
-
opts[:redis]
|
|
173
|
+
opts[:redis],
|
|
174
|
+
0
|
|
173
175
|
)
|
|
174
176
|
else
|
|
175
177
|
@status = 400
|
|
@@ -196,7 +196,7 @@ module CPEE
|
|
|
196
196
|
|
|
197
197
|
def self::sse_distributor(opts) #{{{
|
|
198
198
|
conn = opts[:redis_dyn].call "Server SSE"
|
|
199
|
-
conn.psubscribe('forward:*','event
|
|
199
|
+
conn.psubscribe('forward:*','event:*:state/change') do |on|
|
|
200
200
|
on.pmessage do |pat, what, message|
|
|
201
201
|
if pat == 'forward:*'
|
|
202
202
|
id, key = what.match(/forward:([^\/]+)\/(.+)/).captures
|
|
@@ -208,7 +208,7 @@ module CPEE
|
|
|
208
208
|
else
|
|
209
209
|
DeleteSubscription::set(id,opts,key)
|
|
210
210
|
end
|
|
211
|
-
elsif pat == 'event
|
|
211
|
+
elsif pat == 'event:*:state/change'
|
|
212
212
|
mess = JSON.parse(message[message.index(' ')+1..-1])
|
|
213
213
|
state = mess.dig('content','state')
|
|
214
214
|
if state == 'finished' || state == 'abandoned'
|
|
@@ -161,7 +161,10 @@ class Controller
|
|
|
161
161
|
### end all votes or it will not work
|
|
162
162
|
Thread.new do # doing stuff in trap context is a nono. but in a thread its fine :-)
|
|
163
163
|
@votes.each do |key|
|
|
164
|
-
|
|
164
|
+
# BEWARE111!!!1!! only send to worker 0, as voting goes through single worker
|
|
165
|
+
# (cause i am not smart enough to make it work with multiple workers. Also voting
|
|
166
|
+
# should not happen often, so the complexity is not worth it for now).
|
|
167
|
+
CPEE::Message::send(:'vote-response',key,base,@id,uuid,info,true,@redis,0)
|
|
165
168
|
end
|
|
166
169
|
end
|
|
167
170
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cpee
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.
|
|
4
|
+
version: 2.1.143
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Juergen eTM Mangler
|
|
@@ -250,6 +250,7 @@ files:
|
|
|
250
250
|
- cockpit/compliance.html
|
|
251
251
|
- cockpit/config.json
|
|
252
252
|
- cockpit/config.json.example
|
|
253
|
+
- cockpit/conformance.html
|
|
253
254
|
- cockpit/contrib/graph_example.svg
|
|
254
255
|
- cockpit/contrib/legend.svg
|
|
255
256
|
- cockpit/contrib/symbols.svg
|
|
@@ -284,6 +285,7 @@ files:
|
|
|
284
285
|
- cockpit/js/llm.js
|
|
285
286
|
- cockpit/js/model.js
|
|
286
287
|
- cockpit/js/modifiers.js
|
|
288
|
+
- cockpit/js/mp-conformance.js
|
|
287
289
|
- cockpit/js/parameters.js
|
|
288
290
|
- cockpit/js/track.js
|
|
289
291
|
- cockpit/js/ui.js
|
|
@@ -292,11 +294,15 @@ files:
|
|
|
292
294
|
- cockpit/llmmodel.html
|
|
293
295
|
- cockpit/model.html
|
|
294
296
|
- cockpit/only_llm.html
|
|
297
|
+
- cockpit/rngs/aggregations.rng
|
|
295
298
|
- cockpit/rngs/attributes.rng
|
|
296
299
|
- cockpit/rngs/dataelements.rng
|
|
297
300
|
- cockpit/rngs/documents.rng
|
|
298
301
|
- cockpit/rngs/endpoints.rng
|
|
302
|
+
- cockpit/rngs/intervals.rng
|
|
303
|
+
- cockpit/rngs/nlrequirements.rng
|
|
299
304
|
- cockpit/rngs/requirements.rng
|
|
305
|
+
- cockpit/rngs/rules.rng
|
|
300
306
|
- cockpit/templates.legacy/Async.xml
|
|
301
307
|
- cockpit/templates.legacy/BCO.xml
|
|
302
308
|
- cockpit/templates.legacy/BCS.xml
|