cpee 1.5.21 → 1.5.26
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/cockpit/index.html +2 -2
- data/cockpit/js/instance.js +6 -6
- data/cockpit/rngs/attributes.rng +2 -2
- data/cockpit/rngs/dataelements.rng +2 -2
- data/cockpit/rngs/endpoints.rng +2 -2
- data/cockpit/{testsets → templates.legacy}/Async.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/BCO.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/BCS.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/Centurio.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/Concurrent.xml +0 -0
- data/cockpit/testsets/Coopis Testset.xml b/data/cockpit/templates.legacy/Coopis → Testset.xml +0 -0
- data/cockpit/testsets/Endpoints and Data Manipulation.xml b/data/cockpit/templates.legacy/Endpoints and Data → Manipulation.xml +0 -0
- data/cockpit/testsets/ICSOC Testset.xml b/data/cockpit/templates.legacy/ICSOC → Testset.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/Infinity.xml +0 -0
- data/cockpit/testsets/Lego Boxer.xml b/data/cockpit/templates.legacy/Lego → Boxer.xml +0 -0
- data/cockpit/testsets/Lego Conveyor.xml b/data/cockpit/templates.legacy/Lego → Conveyor.xml +0 -0
- data/cockpit/testsets/Lego Crane.xml b/data/cockpit/templates.legacy/Lego → Crane.xml +0 -0
- data/cockpit/testsets/Lego Ejector.xml b/data/cockpit/templates.legacy/Lego → Ejector.xml +0 -0
- data/cockpit/testsets/Lego Full.xml b/data/cockpit/templates.legacy/Lego → Full.xml +0 -0
- data/cockpit/testsets/Lego Liddy.xml b/data/cockpit/templates.legacy/Lego → Liddy.xml +0 -0
- data/cockpit/testsets/Lego Plate.xml b/data/cockpit/templates.legacy/Lego → Plate.xml +0 -0
- data/cockpit/testsets/Lego Transporter.xml b/data/cockpit/templates.legacy/Lego → Transporter.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/Lego_Part_1.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/LgLinear.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/Linear.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/Log.xml +0 -0
- data/cockpit/testsets/Mangler 1.xml b/data/cockpit/templates.legacy/Mangler → 1.xml +0 -0
- data/cockpit/testsets/Mangler 2.xml b/data/cockpit/templates.legacy/Mangler → 2.xml +0 -0
- data/cockpit/testsets/Manuel Labels.xml b/data/cockpit/templates.legacy/Manuel → Labels.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/Promise.xml +0 -0
- data/cockpit/testsets/SOPROMO Test Sonification.xml b/data/cockpit/templates.legacy/SOPROMO Test → Sonification.xml +0 -0
- data/cockpit/testsets/Syncing P34 1.xml b/data/cockpit/templates.legacy/Syncing P34 → 1.xml +0 -0
- data/cockpit/testsets/Syncing P34 2.xml b/data/cockpit/templates.legacy/Syncing P34 → 2.xml +0 -0
- data/cockpit/testsets/Syncing P34 3.xml b/data/cockpit/templates.legacy/Syncing P34 → 3.xml +0 -0
- data/cockpit/testsets/Syncing P34.xml b/data/cockpit/templates.legacy/Syncing → P34.xml +0 -0
- data/cockpit/testsets/TEST - Bad Loop.xml b/data/cockpit/templates.legacy/TEST - Bad → Loop.xml +0 -0
- data/cockpit/testsets/TEST - Wrong Positions.xml b/data/cockpit/templates.legacy/TEST - Wrong → Positions.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/Update.xml +0 -0
- data/cockpit/testsets/Worklist Parallel.xml b/data/cockpit/templates.legacy/Worklist → Parallel.xml +0 -0
- data/cockpit/testsets/Worklist Test CPEE.xml b/data/cockpit/templates.legacy/Worklist Test → CPEE.xml +0 -0
- data/cockpit/testsets/Worklist Test.xml b/data/cockpit/templates.legacy/Worklist → Test.xml +0 -0
- data/cockpit/testsets/Worklist Test2.xml b/data/cockpit/templates.legacy/Worklist → Test2.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/convert_preset.rb +0 -0
- data/cockpit/{testsets → templates.legacy}/testsets.xml +0 -0
- data/cockpit/{testsets → templates.legacy}/transformations.xml +0 -0
- data/cockpit/templates/BPM 2020 Manual Adjust.xml +235 -0
- data/cockpit/templates/BPM 2020 Solution Baseline.xml +250 -0
- data/cockpit/templates/BPM 2020 Solution NN.xml +243 -0
- data/cockpit/templates/BPM 2020 Solution View.xml +200 -0
- data/cockpit/templates/BPM 2020.xml +15 -0
- data/cockpit/templates/Coopis 2010.xml +76 -0
- data/cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml +80 -0
- data/cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml +80 -0
- data/cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml +80 -0
- data/cockpit/{testsets/Take_5.xml → templates/Worklist.xml} +15 -21
- data/cockpit/templates/convert_preset.rb +32 -0
- data/cockpit/templates/testsets.xml +11 -0
- data/cockpit/templates/transformations.xml +4 -0
- data/cockpit/themes/compact/rngs/call.rng +6 -0
- data/cockpit/themes/compact/rngs/callmanipulate.rng +6 -0
- data/cockpit/themes/compact/theme.js +1 -1
- data/cockpit/themes/default/theme.js +1 -1
- data/cockpit/themes/extended/rngs/call.rng +6 -0
- data/cockpit/themes/extended/rngs/callmanipulate.rng +6 -0
- data/cockpit/themes/extended/theme.js +7 -22
- data/cockpit/themes/model/theme.js +1 -1
- data/cockpit/themes/packed/rngs/call.rng +6 -0
- data/cockpit/themes/packed/rngs/callmanipulate.rng +6 -0
- data/cockpit/themes/packed/theme.js +1 -1
- data/cockpit/themes/preset/rngs/call.rng +6 -0
- data/cockpit/themes/preset/rngs/callmanipulate.rng +6 -0
- data/cockpit/themes/preset/theme.js +1 -1
- data/cpee.gemspec +1 -1
- data/lib/cpee/controller.rb +1 -1
- data/lib/cpee/instantiation.rb +9 -8
- data/log/sic.rb +1 -0
- data/server/handlerwrappers/default.rb +5 -1
- data/server/resources/transformation_dslx.xsl +0 -2
- data/tools/instantiation/instantiation +1 -0
- data/tools/server/server.rb +1 -0
- metadata +55 -52
- data/cockpit/test.html +0 -40
- data/cockpit/testsets/Subprocess.xml +0 -56
- data/server/resources/notifications/logging/consumer-secret +0 -1
- data/server/resources/notifications/logging/producer-secret +0 -1
- data/server/resources/notifications/logging/subscription.xml +0 -19
- data/server/resources/test1.xml +0 -58
- data/server/resources/test2.xml +0 -60
- data/server/resources/test3.xml +0 -217
- data/server/server.pid +0 -1
@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
65
65
|
var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
|
66
66
|
$(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
|
67
67
|
}
|
68
|
-
if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
|
68
|
+
if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
|
69
69
|
$(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
|
70
70
|
}
|
71
71
|
save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
|
@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
65
65
|
var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
|
66
66
|
$(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
|
67
67
|
}
|
68
|
-
if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
|
68
|
+
if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
|
69
69
|
$(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
|
70
70
|
}
|
71
71
|
save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
|
@@ -92,6 +92,12 @@
|
|
92
92
|
</element>
|
93
93
|
<element name="annotations" rngui:header="Annotations">
|
94
94
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
95
|
+
<element name="_timing_wait" rngui:label='ω - Wait'>
|
96
|
+
<data type='float' rngui:label='[0,1]' rngui:default='0.5'/>
|
97
|
+
</element>
|
98
|
+
<element name="_timing_threshold" rngui:label='κ - Threshold'>
|
99
|
+
<data type='float' rngui:label='[0,3,n]' rngui:default='3'/>
|
100
|
+
</element>
|
95
101
|
<element name="_timing_min" rngui:label='Min in min'>
|
96
102
|
<data type='float' rngui:label='Minutes'/>
|
97
103
|
</element>
|
@@ -115,6 +115,12 @@
|
|
115
115
|
</element>
|
116
116
|
<element name="annotations" rngui:header="Annotations">
|
117
117
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
118
|
+
<element name="_timing_wait" rngui:label='ω - Wait'>
|
119
|
+
<data type='float' rngui:label='[0,1]'/>
|
120
|
+
</element>
|
121
|
+
<element name="_timing_threshold" rngui:label='κ - Threshold'>
|
122
|
+
<data type='float' rngui:label='[0,3,n]'/>
|
123
|
+
</element>
|
118
124
|
<element name="_timing_min" rngui:label='Min in min'>
|
119
125
|
<data type='float' rngui:label='Minutes'/>
|
120
126
|
</element>
|
@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
65
65
|
var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
|
66
66
|
$(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
|
67
67
|
}
|
68
|
-
if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
|
68
|
+
if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
|
69
69
|
$(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
|
70
70
|
}
|
71
71
|
save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
|
@@ -264,33 +264,18 @@ function WFAdaptorManifestation(adaptor) {
|
|
264
264
|
'label': function(node){
|
265
265
|
var rep = $('body').attr('current-resources');
|
266
266
|
var ep = self.endpoints[$(node).attr('endpoint')];
|
267
|
-
var
|
267
|
+
var wait = $('_timing_wait',$(node).children('annotations')).text();
|
268
|
+
var threshold = $('_timing_threshold',$(node).children('annotations')).text();
|
268
269
|
var lab = $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'');
|
269
270
|
var ret = [ { column: 'ID', value: $(node).attr('id') } ];
|
270
271
|
if (lab != '') {
|
271
272
|
ret.unshift( { column: 'Label', value: lab } );
|
272
273
|
}
|
273
|
-
if (
|
274
|
-
|
275
|
-
ret.push({ column: 'Resource', value: lnd });
|
276
|
-
if (save['endpoints_cache'][lnd] && save['endpoints_cache'][lnd].properties) {
|
277
|
-
var prop = save['endpoints_cache'][lnd].properties;
|
278
|
-
if (prop.resource) {
|
279
|
-
if (prop.resource == 'exclusive' && prop.lock) {
|
280
|
-
ret.push({ column: 'RP', value: prop.resource + ' (' + prop.lock + ')' });
|
281
|
-
} else {
|
282
|
-
ret.push({ column: 'RP', value: prop.resource });
|
283
|
-
}
|
284
|
-
}
|
285
|
-
if (prop.alternatives) {
|
286
|
-
ret.push({ column: 'R#', value: prop.alternatives.length + 1});
|
287
|
-
} else {
|
288
|
-
ret.push({ column: 'R#', value: '1' });
|
289
|
-
}
|
290
|
-
}
|
274
|
+
if (wait != '') {
|
275
|
+
ret.push({ column: 'Wait', value: 'ω = ' + wait });
|
291
276
|
}
|
292
|
-
if (
|
293
|
-
ret.push({ column: '
|
277
|
+
if (threshold != '') {
|
278
|
+
ret.push({ column: 'Threshold', value: 'κ = ' + threshold });
|
294
279
|
}
|
295
280
|
return ret;
|
296
281
|
},
|
@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
65
65
|
var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
|
66
66
|
$(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
|
67
67
|
}
|
68
|
-
if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
|
68
|
+
if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
|
69
69
|
$(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
|
70
70
|
}
|
71
71
|
save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
|
@@ -92,6 +92,12 @@
|
|
92
92
|
</element>
|
93
93
|
<element name="annotations" rngui:header="Annotations">
|
94
94
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
95
|
+
<element name="_timing_wait" rngui:label='ω - Wait'>
|
96
|
+
<data type='float' rngui:label='[0,1]' rngui:default='0.5'/>
|
97
|
+
</element>
|
98
|
+
<element name="_timing_threshold" rngui:label='κ - Threshold'>
|
99
|
+
<data type='float' rngui:label='[0,3,n]' rngui:default='3'/>
|
100
|
+
</element>
|
95
101
|
<element name="_timing_min" rngui:label='Min in min'>
|
96
102
|
<data type='float' rngui:label='Minutes'/>
|
97
103
|
</element>
|
@@ -115,6 +115,12 @@
|
|
115
115
|
</element>
|
116
116
|
<element name="annotations" rngui:header="Annotations">
|
117
117
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
118
|
+
<element name="_timing_wait" rngui:label='ω - Wait'>
|
119
|
+
<data type='float' rngui:label='[0,1]'/>
|
120
|
+
</element>
|
121
|
+
<element name="_timing_threshold" rngui:label='κ - Threshold'>
|
122
|
+
<data type='float' rngui:label='[0,3,n]'/>
|
123
|
+
</element>
|
118
124
|
<element name="_timing_min" rngui:label='Min in min'>
|
119
125
|
<data type='float' rngui:label='Minutes'/>
|
120
126
|
</element>
|
@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
65
65
|
var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
|
66
66
|
$(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
|
67
67
|
}
|
68
|
-
if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
|
68
|
+
if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
|
69
69
|
$(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
|
70
70
|
}
|
71
71
|
save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
|
@@ -92,6 +92,12 @@
|
|
92
92
|
</element>
|
93
93
|
<element name="annotations" rngui:header="Annotations">
|
94
94
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
95
|
+
<element name="_timing_wait" rngui:label='ω - Wait'>
|
96
|
+
<data type='float' rngui:label='[0,1]' rngui:default='0.5'/>
|
97
|
+
</element>
|
98
|
+
<element name="_timing_threshold" rngui:label='κ - Threshold'>
|
99
|
+
<data type='float' rngui:label='[0,3,n]' rngui:default='3'/>
|
100
|
+
</element>
|
95
101
|
<element name="_timing_min" rngui:label='Min in min'>
|
96
102
|
<data type='float' rngui:label='Minutes'/>
|
97
103
|
</element>
|
@@ -115,6 +115,12 @@
|
|
115
115
|
</element>
|
116
116
|
<element name="annotations" rngui:header="Annotations">
|
117
117
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
118
|
+
<element name="_timing_wait" rngui:label='ω - Wait'>
|
119
|
+
<data type='float' rngui:label='[0,1]'/>
|
120
|
+
</element>
|
121
|
+
<element name="_timing_threshold" rngui:label='κ - Threshold'>
|
122
|
+
<data type='float' rngui:label='[0,3,n]'/>
|
123
|
+
</element>
|
118
124
|
<element name="_timing_min" rngui:label='Min in min'>
|
119
125
|
<data type='float' rngui:label='Minutes'/>
|
120
126
|
</element>
|
@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
65
65
|
var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
|
66
66
|
$(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
|
67
67
|
}
|
68
|
-
if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
|
68
|
+
if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
|
69
69
|
$(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
|
70
70
|
}
|
71
71
|
save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
|
data/cpee.gemspec
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = "cpee"
|
3
|
-
s.version = "1.5.
|
3
|
+
s.version = "1.5.26"
|
4
4
|
s.platform = Gem::Platform::RUBY
|
5
5
|
s.license = "LGPL-3.0"
|
6
6
|
s.summary = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"
|
data/lib/cpee/controller.rb
CHANGED
@@ -373,7 +373,7 @@ module CPEE
|
|
373
373
|
node = doc.find("/p:properties/p:state").first
|
374
374
|
state = node.text
|
375
375
|
end
|
376
|
-
if call_vote("state/change", :instance => @id, :info => info, :state => state)
|
376
|
+
if call_vote("state/change", :instance => @id, :info => info, :state => state, :attributes => attributes_translated)
|
377
377
|
case state
|
378
378
|
when 'stopping'
|
379
379
|
stop
|
data/lib/cpee/instantiation.rb
CHANGED
@@ -34,7 +34,7 @@ module CPEE
|
|
34
34
|
doc.register_namespace 'desc', 'http://cpee.org/ns/description/1.0'
|
35
35
|
doc.register_namespace 'prop', 'http://riddl.org/ns/common-patterns/properties/1.0'
|
36
36
|
|
37
|
-
srv = Riddl::Client.new(cpee, cpee
|
37
|
+
srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
|
38
38
|
res = srv.resource("/")
|
39
39
|
if name
|
40
40
|
doc.find("/testset/attributes/prop:info").each do |e|
|
@@ -109,7 +109,7 @@ module CPEE
|
|
109
109
|
|
110
110
|
if cb
|
111
111
|
cbk = SecureRandom.uuid
|
112
|
-
srv = Riddl::Client.new(cpee, cpee
|
112
|
+
srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
|
113
113
|
status, response = srv.resource("/#{instance}/notifications/subscriptions/").post [
|
114
114
|
Riddl::Parameter::Simple.new("url",File.join(selfurl,'callback',cbk)),
|
115
115
|
Riddl::Parameter::Simple.new("topic","state"),
|
@@ -126,7 +126,7 @@ module CPEE
|
|
126
126
|
private :handle_waiting
|
127
127
|
def handle_starting(cpee,instance,behavior) #{{{
|
128
128
|
if behavior =~ /_running$/
|
129
|
-
srv = Riddl::Client.new(cpee, cpee
|
129
|
+
srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
|
130
130
|
res = srv.resource("/#{instance}/properties/values")
|
131
131
|
status, response = res.put [
|
132
132
|
Riddl::Parameter::Simple.new('name', 'state'),
|
@@ -141,7 +141,7 @@ module CPEE
|
|
141
141
|
JSON::parse(data).each do |k,v|
|
142
142
|
content.root.add(k,v)
|
143
143
|
end
|
144
|
-
srv = Riddl::Client.new(cpee, cpee
|
144
|
+
srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
|
145
145
|
res = srv.resource("/#{instance}/properties/values/dataelements/")
|
146
146
|
status, response = res.patch [
|
147
147
|
Riddl::Parameter::Complex.new('content','text/xml',content.to_s)
|
@@ -154,7 +154,7 @@ module CPEE
|
|
154
154
|
JSON::parse(data).each do |k,v|
|
155
155
|
content.root.add(k,v)
|
156
156
|
end
|
157
|
-
srv = Riddl::Client.new(cpee, cpee
|
157
|
+
srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
|
158
158
|
res = srv.resource("/#{instance}/properties/values/endpoints/")
|
159
159
|
status, response = res.patch [
|
160
160
|
Riddl::Parameter::Complex.new('content','text/xml',content.to_s)
|
@@ -280,7 +280,7 @@ module CPEE
|
|
280
280
|
cblist = @a[2]
|
281
281
|
instance = @p[1].value
|
282
282
|
|
283
|
-
srv = Riddl::Client.new(cpee, cpee
|
283
|
+
srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
|
284
284
|
res = srv.resource("/#{instance}/properties/values/attributes/uuid")
|
285
285
|
status, response = res.get
|
286
286
|
|
@@ -296,7 +296,6 @@ module CPEE
|
|
296
296
|
|
297
297
|
class ContinueTask < Riddl::Implementation #{{{
|
298
298
|
def response
|
299
|
-
cpee = @h['X_CPEE'] || @a[0]
|
300
299
|
cblist = @a[1]
|
301
300
|
topic = @p[1].value
|
302
301
|
event_name = @p[2].value
|
@@ -305,6 +304,8 @@ module CPEE
|
|
305
304
|
key = @r.last
|
306
305
|
cb, condition, instance, uuid, instance_url = cblist.lrange(key,0,-1)
|
307
306
|
|
307
|
+
cpee = File.dirname(instance_url)
|
308
|
+
|
308
309
|
orisend = {
|
309
310
|
'CPEE-INSTANCE' => instance,
|
310
311
|
'CPEE-INSTANCE-URL' => instance_url,
|
@@ -315,7 +316,7 @@ module CPEE
|
|
315
316
|
|
316
317
|
if notification['state'] == condition
|
317
318
|
cblist.del(key)
|
318
|
-
srv = Riddl::Client.new(cpee, cpee
|
319
|
+
srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
|
319
320
|
res = srv.resource("/#{instance}/properties/values/dataelements")
|
320
321
|
status, response = res.get
|
321
322
|
if status >= 200 && status < 300
|
data/log/sic.rb
CHANGED
@@ -58,6 +58,7 @@ def help
|
|
58
58
|
puts ' Copy: sic.rb https://centurio.work/log/865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml copy'
|
59
59
|
puts ' Copy: sic.rb ~/Projects/cpee/log/logs/865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml copy'
|
60
60
|
puts ' View: sic.rb 865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml'
|
61
|
+
true
|
61
62
|
end
|
62
63
|
|
63
64
|
react(ARGV[0]) || help
|
@@ -16,7 +16,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
|
|
16
16
|
def self::inform_state_change(arguments,newstate) # {{{
|
17
17
|
controller = arguments[0]
|
18
18
|
controller.serialize_state!
|
19
|
-
controller.notify("state/change", :instance => controller.instance, :instance_uuid => controller.uuid, :state => newstate, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
|
19
|
+
controller.notify("state/change", :instance => controller.instance, :instance_uuid => controller.uuid, :state => newstate, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => controller.attributes_translated)
|
20
20
|
controller.finalize_if_finished
|
21
21
|
end # }}}
|
22
22
|
def self::inform_syntax_error(arguments,err,code)# {{{
|
@@ -65,6 +65,10 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
|
|
65
65
|
params
|
66
66
|
end #}}}
|
67
67
|
|
68
|
+
def additional
|
69
|
+
{ :attributes => @controller.attributes_translated } rescue {}
|
70
|
+
end
|
71
|
+
|
68
72
|
def proto_curl(parameters) #{{{
|
69
73
|
params = []
|
70
74
|
callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
|
@@ -390,9 +390,7 @@
|
|
390
390
|
<xsl:text>]</xsl:text>
|
391
391
|
</xsl:when>
|
392
392
|
<xsl:when test="count(*) > 0 and name()='report'">
|
393
|
-
<xsl:text>[</xsl:text>
|
394
393
|
<xsl:apply-templates select="d:*" mode="plainmulti"/>
|
395
|
-
<xsl:text>]</xsl:text>
|
396
394
|
</xsl:when>
|
397
395
|
<xsl:when test="count(*) > 0 and not(name()='arguments')">
|
398
396
|
<xsl:text>{</xsl:text>
|
data/tools/server/server.rb
CHANGED
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: 1.5.
|
4
|
+
version: 1.5.26
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Juergen eTM Mangler
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: tools
|
13
13
|
cert_chain: []
|
14
|
-
date: 2020-06
|
14
|
+
date: 2020-10-06 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: riddl
|
@@ -161,49 +161,59 @@ files:
|
|
161
161
|
- cockpit/rngs/attributes.rng
|
162
162
|
- cockpit/rngs/dataelements.rng
|
163
163
|
- cockpit/rngs/endpoints.rng
|
164
|
-
- cockpit/
|
165
|
-
- cockpit/
|
166
|
-
- cockpit/
|
167
|
-
- cockpit/
|
168
|
-
- cockpit/
|
169
|
-
- cockpit/
|
170
|
-
- cockpit/
|
171
|
-
- cockpit/
|
172
|
-
- cockpit/
|
173
|
-
- cockpit/
|
174
|
-
- cockpit/
|
175
|
-
- cockpit/
|
176
|
-
- cockpit/
|
177
|
-
- cockpit/
|
178
|
-
- cockpit/
|
179
|
-
- cockpit/
|
180
|
-
- cockpit/
|
181
|
-
- cockpit/
|
182
|
-
- cockpit/
|
183
|
-
- cockpit/
|
184
|
-
- cockpit/
|
185
|
-
- cockpit/
|
186
|
-
- cockpit/
|
187
|
-
- cockpit/
|
188
|
-
- cockpit/
|
189
|
-
- cockpit/
|
190
|
-
- cockpit/
|
191
|
-
- cockpit/
|
192
|
-
- cockpit/
|
193
|
-
- cockpit/
|
194
|
-
- cockpit/
|
195
|
-
- cockpit/
|
196
|
-
- cockpit/
|
197
|
-
- cockpit/
|
198
|
-
- cockpit/
|
199
|
-
- cockpit/
|
200
|
-
- cockpit/
|
201
|
-
- cockpit/
|
202
|
-
- cockpit/testsets
|
203
|
-
- cockpit/
|
204
|
-
- cockpit/
|
205
|
-
- cockpit/
|
206
|
-
- cockpit/
|
164
|
+
- cockpit/templates.legacy/Async.xml
|
165
|
+
- cockpit/templates.legacy/BCO.xml
|
166
|
+
- cockpit/templates.legacy/BCS.xml
|
167
|
+
- cockpit/templates.legacy/Centurio.xml
|
168
|
+
- cockpit/templates.legacy/Concurrent.xml
|
169
|
+
- cockpit/templates.legacy/Coopis Testset.xml
|
170
|
+
- cockpit/templates.legacy/Endpoints and Data Manipulation.xml
|
171
|
+
- cockpit/templates.legacy/ICSOC Testset.xml
|
172
|
+
- cockpit/templates.legacy/Infinity.xml
|
173
|
+
- cockpit/templates.legacy/Lego Boxer.xml
|
174
|
+
- cockpit/templates.legacy/Lego Conveyor.xml
|
175
|
+
- cockpit/templates.legacy/Lego Crane.xml
|
176
|
+
- cockpit/templates.legacy/Lego Ejector.xml
|
177
|
+
- cockpit/templates.legacy/Lego Full.xml
|
178
|
+
- cockpit/templates.legacy/Lego Liddy.xml
|
179
|
+
- cockpit/templates.legacy/Lego Plate.xml
|
180
|
+
- cockpit/templates.legacy/Lego Transporter.xml
|
181
|
+
- cockpit/templates.legacy/Lego_Part_1.xml
|
182
|
+
- cockpit/templates.legacy/LgLinear.xml
|
183
|
+
- cockpit/templates.legacy/Linear.xml
|
184
|
+
- cockpit/templates.legacy/Log.xml
|
185
|
+
- cockpit/templates.legacy/Mangler 1.xml
|
186
|
+
- cockpit/templates.legacy/Mangler 2.xml
|
187
|
+
- cockpit/templates.legacy/Manuel Labels.xml
|
188
|
+
- cockpit/templates.legacy/Promise.xml
|
189
|
+
- cockpit/templates.legacy/SOPROMO Test Sonification.xml
|
190
|
+
- cockpit/templates.legacy/Syncing P34 1.xml
|
191
|
+
- cockpit/templates.legacy/Syncing P34 2.xml
|
192
|
+
- cockpit/templates.legacy/Syncing P34 3.xml
|
193
|
+
- cockpit/templates.legacy/Syncing P34.xml
|
194
|
+
- cockpit/templates.legacy/TEST - Bad Loop.xml
|
195
|
+
- cockpit/templates.legacy/TEST - Wrong Positions.xml
|
196
|
+
- cockpit/templates.legacy/Update.xml
|
197
|
+
- cockpit/templates.legacy/Worklist Parallel.xml
|
198
|
+
- cockpit/templates.legacy/Worklist Test CPEE.xml
|
199
|
+
- cockpit/templates.legacy/Worklist Test.xml
|
200
|
+
- cockpit/templates.legacy/Worklist Test2.xml
|
201
|
+
- cockpit/templates.legacy/convert_preset.rb
|
202
|
+
- cockpit/templates.legacy/testsets.xml
|
203
|
+
- cockpit/templates.legacy/transformations.xml
|
204
|
+
- cockpit/templates/BPM 2020 Manual Adjust.xml
|
205
|
+
- cockpit/templates/BPM 2020 Solution Baseline.xml
|
206
|
+
- cockpit/templates/BPM 2020 Solution NN.xml
|
207
|
+
- cockpit/templates/BPM 2020 Solution View.xml
|
208
|
+
- cockpit/templates/BPM 2020.xml
|
209
|
+
- cockpit/templates/Coopis 2010.xml
|
210
|
+
- cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml
|
211
|
+
- cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml
|
212
|
+
- cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml
|
213
|
+
- cockpit/templates/Worklist.xml
|
214
|
+
- cockpit/templates/convert_preset.rb
|
215
|
+
- cockpit/templates/testsets.xml
|
216
|
+
- cockpit/templates/transformations.xml
|
207
217
|
- cockpit/themes/compact/rngs/alternative.rng
|
208
218
|
- cockpit/themes/compact/rngs/call.rng
|
209
219
|
- cockpit/themes/compact/rngs/callmanipulate.rng
|
@@ -541,20 +551,13 @@ files:
|
|
541
551
|
- server/handlerwrappers/default.rb
|
542
552
|
- server/handlerwrappers/soap.rb
|
543
553
|
- server/resources/empty_dslx.xml
|
544
|
-
- server/resources/notifications/logging/consumer-secret
|
545
|
-
- server/resources/notifications/logging/producer-secret
|
546
|
-
- server/resources/notifications/logging/subscription.xml
|
547
554
|
- server/resources/properties.init
|
548
555
|
- server/resources/properties.schema.active
|
549
556
|
- server/resources/properties.schema.finished
|
550
557
|
- server/resources/properties.schema.inactive
|
551
|
-
- server/resources/test1.xml
|
552
|
-
- server/resources/test2.xml
|
553
|
-
- server/resources/test3.xml
|
554
558
|
- server/resources/topics.xml
|
555
559
|
- server/resources/transformation.xml
|
556
560
|
- server/resources/transformation_dslx.xsl
|
557
|
-
- server/server.pid
|
558
561
|
- server/server.rb
|
559
562
|
- test/callback.rb
|
560
563
|
- tools/cpee
|