cpee 1.5.15 → 1.5.16

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.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/testsets/Async.xml +17 -13
  3. data/cockpit/testsets/BCO.xml +37 -20
  4. data/cockpit/testsets/BCS.xml +37 -20
  5. data/cockpit/testsets/Centurio.xml +12 -9
  6. data/cockpit/testsets/Concurrent.xml +8 -7
  7. data/cockpit/testsets/Coopis Testset.xml +12 -9
  8. data/cockpit/testsets/Endpoints and Data Manipulation.xml +4 -5
  9. data/cockpit/testsets/ICSOC Testset.xml +30 -19
  10. data/cockpit/testsets/Infinity.xml +4 -2
  11. data/cockpit/testsets/Lego Boxer.xml +2 -2
  12. data/cockpit/testsets/Lego Conveyor.xml +2 -2
  13. data/cockpit/testsets/Lego Crane.xml +2 -2
  14. data/cockpit/testsets/Lego Ejector.xml +2 -2
  15. data/cockpit/testsets/Lego Plate.xml +2 -2
  16. data/cockpit/testsets/Lego Transporter.xml +2 -2
  17. data/cockpit/testsets/LgLinear.xml +43 -24
  18. data/cockpit/testsets/Linear.xml +41 -22
  19. data/cockpit/testsets/Log.xml +12 -11
  20. data/cockpit/testsets/Mangler 1.xml +27 -16
  21. data/cockpit/testsets/Mangler 2.xml +19 -12
  22. data/cockpit/testsets/Promise.xml +35 -14
  23. data/cockpit/testsets/SOPROMO Test Sonification.xml +18 -15
  24. data/cockpit/testsets/Subprocess.xml +18 -14
  25. data/cockpit/testsets/Syncing P34 1.xml +42 -23
  26. data/cockpit/testsets/Syncing P34 2.xml +42 -23
  27. data/cockpit/testsets/Syncing P34 3.xml +42 -23
  28. data/cockpit/testsets/Syncing P34.xml +42 -23
  29. data/cockpit/testsets/TEST - Bad Loop.xml +50 -29
  30. data/cockpit/testsets/TEST - Wrong Positions.xml +74 -35
  31. data/cockpit/testsets/Take_5.xml +18 -14
  32. data/cockpit/testsets/Update.xml +5 -4
  33. data/cockpit/testsets/Worklist Parallel.xml +13 -6
  34. data/cockpit/testsets/Worklist Test CPEE.xml +4 -3
  35. data/cockpit/testsets/Worklist Test.xml +7 -4
  36. data/cockpit/testsets/Worklist Test2.xml +7 -4
  37. data/cockpit/testsets/convert_preset.rb +32 -0
  38. data/cockpit/testsets/testsets.xml +1 -1
  39. data/cockpit/testsets/transformations.xml +1 -1
  40. data/cockpit/themes/compact/theme.js +1 -1
  41. data/cockpit/themes/extended/theme.js +1 -1
  42. data/cockpit/themes/packed/theme.js +1 -1
  43. data/cpee.gemspec +1 -1
  44. metadata +2 -1
data/cockpit/testsets/Take_5.xml CHANGED
@@ -15,17 +15,21 @@
15
15
  <timeout>5</timeout>
16
16
  </arguments>
17
17
  </parameters>
18
- <finalize output="result">data.a = 17</finalize>
19
- <update output="result"/>
20
- <_timing>
21
- <_timing_min/>
22
- <_timing_max/>
23
- <_timing_avg/>
24
- </_timing>
25
- <_notes>
26
- <_notes_general/>
27
- <_attachments/>
28
- </_notes>
18
+ <code>
19
+ <finalize output="result">data.a = 17</finalize>
20
+ <update output="result"/>
21
+ </code>
22
+ <annotations>
23
+ <_timing>
24
+ <_timing_min/>
25
+ <_timing_max/>
26
+ <_timing_avg/>
27
+ </_timing>
28
+ <_notes>
29
+ <_notes_general/>
30
+ <_attachments/>
31
+ </_notes>
32
+ </annotations>
29
33
  </call>
30
34
  </description>
31
35
  </description>
@@ -35,10 +39,10 @@
35
39
  <endpoints type="none"/>
36
40
  </transformation>
37
41
  <attributes>
38
- <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0"></info>
42
+ <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
39
43
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
40
- <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">default</theme>
44
+ <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
41
45
  <customer xmlns="http://riddl.org/ns/common-patterns/properties/1.0">pilotfabrik</customer>
42
46
  <status xmlns="http://riddl.org/ns/common-patterns/properties/1.0">development</status>
43
47
  </attributes>
44
- </testset>
48
+ </testset>
data/cockpit/testsets/Update.xml CHANGED
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <dataelements/>
4
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
@@ -14,8 +13,10 @@
14
13
  <method>:post</method>
15
14
  <arguments/>
16
15
  </parameters>
17
- <finalize>data.a = result.value</finalize>
18
- <update>data.b = result.value</update>
16
+ <code>
17
+ <finalize>data.a = result.value</finalize>
18
+ <update>data.b = result.value</update>
19
+ </code>
19
20
  </call>
20
21
  </description>
21
22
  </description>
@@ -28,4 +29,4 @@
28
29
  <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Enter info here</info>
29
30
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
30
31
  </attributes>
31
- </testset>
32
+ </testset>
data/cockpit/testsets/Worklist Parallel.xml CHANGED
@@ -1,4 +1,3 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
2
  <dataelements>
4
3
  <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
@@ -29,7 +28,9 @@
29
28
  <text>"sehr gut"</text>
30
29
  </arguments>
31
30
  </parameters>
32
- <finalize>data.a = result</finalize>
31
+ <code>
32
+ <finalize>data.a = result</finalize>
33
+ </code>
33
34
  </call>
34
35
  </parallel_branch>
35
36
  <parallel_branch>
@@ -46,7 +47,9 @@
46
47
  <text>"totalo kaputto"</text>
47
48
  </arguments>
48
49
  </parameters>
49
- <finalize>data.b = result</finalize>
50
+ <code>
51
+ <finalize>data.b = result</finalize>
52
+ </code>
50
53
  </call>
51
54
  </parallel_branch>
52
55
  <parallel_branch>
@@ -63,7 +66,9 @@
63
66
  <text>"ein Totalschaden"</text>
64
67
  </arguments>
65
68
  </parameters>
66
- <finalize>data.c = result</finalize>
69
+ <code>
70
+ <finalize>data.c = result</finalize>
71
+ </code>
67
72
  </call>
68
73
  </parallel_branch>
69
74
  </parallel>
@@ -80,7 +85,9 @@
80
85
  <text>"fetzen hin"</text>
81
86
  </arguments>
82
87
  </parameters>
83
- <finalize>data.bla = result</finalize>
88
+ <code>
89
+ <finalize>data.bla = result</finalize>
90
+ </code>
84
91
  </call>
85
92
  </description>
86
93
  </description>
@@ -94,4 +101,4 @@
94
101
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
95
102
  <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
96
103
  </attributes>
97
- </testset>
104
+ </testset>
data/cockpit/testsets/Worklist Test CPEE.xml CHANGED
@@ -1,6 +1,7 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
- <dataelements><bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/></dataelements>
2
+ <dataelements>
3
+ <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
4
+ </dataelements>
4
5
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
6
  <endpoints>
6
7
  <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
@@ -36,4 +37,4 @@
36
37
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
37
38
  <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
38
39
  </attributes>
39
- </testset>
40
+ </testset>
data/cockpit/testsets/Worklist Test.xml CHANGED
@@ -1,6 +1,7 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
- <dataelements><bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/></dataelements>
2
+ <dataelements>
3
+ <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
4
+ </dataelements>
4
5
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
6
  <endpoints>
6
7
  <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
@@ -22,7 +23,9 @@
22
23
  <text>"fetzen hin"</text>
23
24
  </arguments>
24
25
  </parameters>
25
- <finalize>data.bla = result</finalize>
26
+ <code>
27
+ <finalize>data.bla = result</finalize>
28
+ </code>
26
29
  </call>
27
30
  </description>
28
31
  </description>
@@ -36,4 +39,4 @@
36
39
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
37
40
  <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
38
41
  </attributes>
39
- </testset>
42
+ </testset>
data/cockpit/testsets/Worklist Test2.xml CHANGED
@@ -1,6 +1,7 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
- <dataelements><bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/></dataelements>
2
+ <dataelements>
3
+ <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
4
+ </dataelements>
4
5
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
6
  <endpoints>
6
7
  <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
@@ -23,7 +24,9 @@
23
24
  <text>"fetzen hin"</text>
24
25
  </parameters>
25
26
  </parameters>
26
- <finalize>data.bla = result</finalize>
27
+ <code>
28
+ <finalize>data.bla = result</finalize>
29
+ </code>
27
30
  </call>
28
31
  </description>
29
32
  </description>
@@ -37,4 +40,4 @@
37
40
  <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
38
41
  <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
39
42
  </attributes>
40
- </testset>
43
+ </testset>
data/cockpit/testsets/convert_preset.rb ADDED
@@ -0,0 +1,32 @@
1
+ #!/usr/bin/ruby
2
+ require 'xml/smart'
3
+
4
+ Dir['*.xml'].each do |f|
5
+ XML::Smart.modify(f) do |doc|
6
+ p f
7
+ doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
8
+ doc.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
9
+ if doc.root.qname.name == 'testset'
10
+ doc.find('//d:call').each do |e|
11
+ x = e.find('d:finalize')
12
+ if x.length > 0
13
+ code = x.first.add_before 'code'
14
+ code.add x
15
+ code.add e.find('d:update')
16
+ end
17
+ x = e.find('d:_timing')
18
+ if x.length > 0
19
+ code = x.first.add_before 'annotations'
20
+ code.add x
21
+ code.add e.find('d:_notes')
22
+ end
23
+ end
24
+ begin
25
+ if doc.find('//attributes/p:theme').any?
26
+ doc.find('//attributes/p:theme').first.text = 'preset'
27
+ end
28
+ rescue
29
+ end
30
+ end
31
+ end
32
+ end
data/cockpit/testsets/testsets.xml CHANGED
@@ -32,4 +32,4 @@
32
32
  <testset>Lego Crane</testset>
33
33
  <testset>Lego Plate</testset>
34
34
  <!--testset>Manuel Labels</testset-->
35
- </testsets>
35
+ </testsets>
data/cockpit/testsets/transformations.xml CHANGED
@@ -1,4 +1,4 @@
1
1
  <transformations>
2
2
  <transformation>CPEE</transformation>
3
3
  <transformation>Signavio</transformation>
4
- </transformations>
4
+ </transformations>
data/cockpit/themes/compact/theme.js CHANGED
@@ -1240,6 +1240,6 @@ function WFAdaptorManifestation(adaptor) {
1240
1240
  }//}}}
1241
1241
  }; /*}}}*/
1242
1242
  this.elements.scripts = { /*{{{*/
1243
- 'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
1243
+ 'description': [self.adaptor.theme_dir + 'rngs/scripts.rng']
1244
1244
  }; /*}}}*/
1245
1245
  }
data/cockpit/themes/extended/theme.js CHANGED
@@ -250,7 +250,7 @@ function WFAdaptorManifestation(adaptor) {
250
250
  'label': function(node){
251
251
  var rep = $('body').attr('current-resources');
252
252
  var ep = self.endpoints[$(node).attr('endpoint')];
253
- var avg = $('> _timing_avg',$(node).children('_timing')).text();
253
+ var avg = $('_timing_avg',$(node).children('annotations')).text();
254
254
  var lab = $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'');
255
255
  var ret = [ { column: 'ID', value: $(node).attr('id') } ];
256
256
  if (lab != '') {
data/cockpit/themes/packed/theme.js CHANGED
@@ -1240,6 +1240,6 @@ function WFAdaptorManifestation(adaptor) {
1240
1240
  }//}}}
1241
1241
  }; /*}}}*/
1242
1242
  this.elements.scripts = { /*{{{*/
1243
- 'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
1243
+ 'description': [self.adaptor.theme_dir + 'rngs/scripts.rng']
1244
1244
  }; /*}}}*/
1245
1245
  }
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.15"
3
+ s.version = "1.5.16"
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"
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.15
4
+ version: 1.5.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -175,6 +175,7 @@ files:
175
175
  - cockpit/testsets/Worklist Test CPEE.xml
176
176
  - cockpit/testsets/Worklist Test.xml
177
177
  - cockpit/testsets/Worklist Test2.xml
178
+ - cockpit/testsets/convert_preset.rb
178
179
  - cockpit/testsets/testsets.xml
179
180
  - cockpit/testsets/transformations.xml
180
181
  - cockpit/themes/compact/theme.js