cpee 1.3.175 → 1.3.176

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 (91) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/index.html +1 -1
  3. data/cockpit/js/instance.js +40 -37
  4. data/cockpit/lib/relaxngui.js +4 -0
  5. data/cockpit/lib/ui.css +0 -5
  6. data/cockpit/lib/ui.js +6 -2
  7. data/cockpit/rngtest.html +74 -0
  8. data/cockpit/rngtest.rng +60 -0
  9. data/cockpit/rngtest.xml +15 -0
  10. data/cockpit/testsets/Concurrent.xml +2 -2
  11. data/cockpit/testsets/Coopis Testset.xml +4 -4
  12. data/cockpit/testsets/Linear.xml +3 -3
  13. data/cockpit/testsets/Mangler 1.xml +1 -1
  14. data/cockpit/testsets/Mangler 2.xml +8 -8
  15. data/cockpit/testsets/SOPROMO Test Sonification.xml +10 -10
  16. data/cockpit/testsets/Syncing P34 1.xml +4 -4
  17. data/cockpit/testsets/Syncing P34 2.xml +4 -4
  18. data/cockpit/testsets/Syncing P34 3.xml +4 -4
  19. data/cockpit/testsets/Syncing P34.xml +4 -4
  20. data/cockpit/testsets/TEST - Wrong Positions.xml +20 -20
  21. data/cockpit/testsets/Update.xml +11 -0
  22. data/cockpit/testsets/Worklist Test.xml +39 -0
  23. data/cockpit/testsets/testsets.xml +4 -0
  24. data/cpee.gemspec +1 -1
  25. data/lib/cpee/callback.rb +6 -2
  26. data/lib/cpee/controller.rb +8 -8
  27. data/lib/cpee/handler_notifications.rb +4 -4
  28. data/lib/cpee/handler_properties.rb +5 -5
  29. data/lib/cpee/implementation.rb +1 -1
  30. data/server/handlerwrappers/default.rb +30 -25
  31. data/server/handlerwrappers/soap.rb +13 -13
  32. data/server/instances/1/properties.xml +69 -101
  33. data/server/instances/10/properties.xml +106 -70
  34. data/server/instances/11/properties.xml +133 -73
  35. data/server/instances/12/properties.xml +1 -0
  36. data/server/instances/14/notifications/5bcce90b170116a77fb25aea4e133acc/consumer-secret +1 -0
  37. data/server/instances/14/notifications/5bcce90b170116a77fb25aea4e133acc/producer-secret +1 -0
  38. data/server/instances/{13/notifications/4ff0cde5161c44dae49b263cbc12eaf8 → 14/notifications/5bcce90b170116a77fb25aea4e133acc}/subscription.xml +0 -0
  39. data/server/instances/14/properties.xml +160 -160
  40. data/server/instances/15/properties.xml +28 -314
  41. data/server/instances/16/properties.xml +28 -249
  42. data/server/instances/17/properties.xml +28 -130
  43. data/server/instances/18/properties.xml +3 -2
  44. data/server/instances/19/properties.xml +0 -1
  45. data/server/instances/2/properties.xml +191 -44
  46. data/server/instances/20/properties.xml +46 -0
  47. data/server/instances/21/properties.xml +46 -0
  48. data/server/instances/22/notifications/f9c504b8c715ec94a99fc3c6a660c53a/consumer-secret +1 -0
  49. data/server/instances/22/notifications/f9c504b8c715ec94a99fc3c6a660c53a/producer-secret +1 -0
  50. data/server/instances/22/notifications/f9c504b8c715ec94a99fc3c6a660c53a/subscription.xml +23 -0
  51. data/server/instances/22/properties.xml +112 -0
  52. data/server/instances/23/notifications/0a5a059f4ae897aee1446d560210dec0/consumer-secret +1 -0
  53. data/server/instances/23/notifications/0a5a059f4ae897aee1446d560210dec0/producer-secret +1 -0
  54. data/server/instances/23/notifications/0a5a059f4ae897aee1446d560210dec0/subscription.xml +23 -0
  55. data/server/instances/23/properties.xml +148 -0
  56. data/server/instances/24/properties.xml +66 -0
  57. data/server/instances/25/properties.xml +46 -0
  58. data/server/instances/26/properties.xml +112 -0
  59. data/server/instances/27/properties.xml +212 -0
  60. data/server/instances/28/properties.xml +363 -0
  61. data/server/instances/29/properties.xml +148 -0
  62. data/server/instances/3/properties.xml +70 -44
  63. data/server/instances/30/properties.xml +150 -0
  64. data/server/instances/31/properties.xml +52 -0
  65. data/server/instances/32/properties.xml +52 -0
  66. data/server/instances/33/properties.xml +60 -0
  67. data/server/instances/34/properties.xml +148 -0
  68. data/server/instances/35/properties.xml +148 -0
  69. data/server/instances/36/properties.xml +150 -0
  70. data/server/instances/37/notifications/2b67c793efcea22d88beaa28249001be/consumer-secret +1 -0
  71. data/server/instances/37/notifications/2b67c793efcea22d88beaa28249001be/producer-secret +1 -0
  72. data/server/instances/37/notifications/2b67c793efcea22d88beaa28249001be/subscription.xml +34 -0
  73. data/server/instances/37/notifications/5f979ed943f91ff75d75e551ba0642d6/consumer-secret +1 -0
  74. data/server/instances/37/notifications/5f979ed943f91ff75d75e551ba0642d6/producer-secret +1 -0
  75. data/server/instances/37/notifications/5f979ed943f91ff75d75e551ba0642d6/subscription.xml +33 -0
  76. data/server/instances/37/properties.xml +57 -0
  77. data/server/instances/4/properties.xml +28 -68
  78. data/server/instances/5/properties.xml +10 -70
  79. data/server/instances/6/properties.xml +175 -55
  80. data/server/instances/7/properties.xml +118 -52
  81. data/server/instances/8/properties.xml +112 -50
  82. data/server/instances/9/properties.xml +115 -47
  83. data/server/resources/topics.xml +15 -15
  84. data/server/resources/transformation_dslx.xsl +43 -5
  85. data/test/cb.rb +9 -0
  86. metadata +44 -9
  87. data/server/instances/12/notifications/8d7f2ae546a742fce3a0a488266ea51d/consumer-secret +0 -1
  88. data/server/instances/12/notifications/8d7f2ae546a742fce3a0a488266ea51d/producer-secret +0 -1
  89. data/server/instances/12/notifications/8d7f2ae546a742fce3a0a488266ea51d/subscription.xml +0 -6
  90. data/server/instances/13/notifications/4ff0cde5161c44dae49b263cbc12eaf8/consumer-secret +0 -1
  91. data/server/instances/13/notifications/4ff0cde5161c44dae49b263cbc12eaf8/producer-secret +0 -1
data/cockpit/testsets/Mangler 2.xml CHANGED
@@ -27,8 +27,8 @@
27
27
  <persons>data.persons</persons>
28
28
  </parameters>
29
29
  </parameters>
30
- <manipulate output="result"> data.airline = result.value('id')
31
- data.costs += result.value('costs').to_f</manipulate>
30
+ <finalize output="result"> data.airline = result.value('id')
31
+ data.costs += result.value('costs').to_f</finalize>
32
32
  </call>
33
33
  <parallel>
34
34
  <loop pre_test="data.persons > 0">
@@ -40,8 +40,8 @@
40
40
  <to>data.to</to>
41
41
  </parameters>
42
42
  </parameters>
43
- <manipulate output="result"> data.hotels &lt;&lt; result.value('id')
44
- data.costs += result.value('costs').to_f</manipulate>
43
+ <finalize output="result"> data.hotels &lt;&lt; result.value('id')
44
+ data.costs += result.value('costs').to_f</finalize>
45
45
  </call>
46
46
  </parallel_branch>
47
47
  <manipulate id="a3"> data.persons -= 1</manipulate>
@@ -55,8 +55,8 @@
55
55
  <to>data.to</to>
56
56
  </parameters>
57
57
  </parameters>
58
- <manipulate output="result"> data.hotels &lt;&lt; result.value('id')
59
- data.costs += result.value('costs').to_f</manipulate>
58
+ <finalize output="result"> data.hotels &lt;&lt; result.value('id')
59
+ data.costs += result.value('costs').to_f</finalize>
60
60
  </call>
61
61
  </parallel_branch>
62
62
  <parallel_branch pass="data.persons" local="p">
@@ -67,8 +67,8 @@
67
67
  <to>data.to</to>
68
68
  </parameters>
69
69
  </parameters>
70
- <manipulate output="result"> data.hotels &lt;&lt; result.value('id')
71
- data.costs += result.value('costs').to_f</manipulate>
70
+ <finalize output="result"> data.hotels &lt;&lt; result.value('id')
71
+ data.costs += result.value('costs').to_f</finalize>
72
72
  </call>
73
73
  </parallel_branch>
74
74
  <manipulate id="a6"> data.persons -= 1</manipulate>
data/cockpit/testsets/SOPROMO Test Sonification.xml CHANGED
@@ -13,12 +13,12 @@
13
13
  </dataelements>
14
14
  <handlers>
15
15
  <handler url="http://localhost:9299/events">
16
- <events topic='running'>activity_calling,activity_failed,activity_manipulating,activity_done</events>
17
- <events topic='properties/dataelements'>change</events>
18
- <events topic='properties/endpoints'>change</events>
19
- <events topic='properties/description'>error</events>
20
- <events topic='properties/state'>change</events>
21
- <events topic='properties/status'>change</events>
16
+ <events topic='activity'>calling,failed,manipulating,done</events>
17
+ <events topic='dataelements'>change</events>
18
+ <events topic='endpoints'>change</events>
19
+ <events topic='description'>error</events>
20
+ <events topic='state'>change</events>
21
+ <events topic='status'>change</events>
22
22
  </handler>
23
23
  </handlers>
24
24
  <endpoints>
@@ -37,9 +37,9 @@
37
37
  <persons>data.persons</persons>
38
38
  </parameters>
39
39
  </parameters>
40
- <manipulate output="result"> data.airline = result.value('id')
40
+ <finalize output="result"> data.airline = result.value('id')
41
41
  data.costs += result.value('costs').to_f
42
- status.update 1, 'Hotel'</manipulate>
42
+ status.update 1, 'Hotel'</finalize>
43
43
  </call>
44
44
  <parallel>
45
45
  <loop pre_test="data.persons > 0">
@@ -51,8 +51,8 @@
51
51
  <to>data.to</to>
52
52
  </parameters>
53
53
  </parameters>
54
- <manipulate output="result"> data.hotels &lt;&lt; result.value('id')
55
- data.costs += result.value('costs').to_f</manipulate>
54
+ <finalize output="result"> data.hotels &lt;&lt; result.value('id')
55
+ data.costs += result.value('costs').to_f</finalize>
56
56
  </call>
57
57
  </parallel_branch>
58
58
  <manipulate id="a3"> data.persons -= 1</manipulate>
data/cockpit/testsets/Syncing P34 1.xml CHANGED
@@ -7,7 +7,7 @@
7
7
  </dataelements><!--}}}-->
8
8
  <handlers><!--{{{-->
9
9
  <handler url="http://localhost:9299/1/events">
10
- <votes topic='running'>syncing_before,syncing_after</votes>
10
+ <votes topic='activity'>syncing_before,syncing_after</votes>
11
11
  </handler>
12
12
  </handlers><!--}}}-->
13
13
  <endpoints><!--{{{-->
@@ -23,7 +23,7 @@
23
23
  <timeout>2</timeout>
24
24
  </parameters>
25
25
  </parameters><!--}}}-->
26
- <manipulate output="result"> data.x += "a1,"</manipulate>
26
+ <finalize output="result"> data.x += "a1,"</finalize>
27
27
  </call>
28
28
  <call id="a2" endpoint="timeouts">
29
29
  <parameters><!--{{{-->
@@ -32,7 +32,7 @@
32
32
  <timeout>4</timeout>
33
33
  </parameters>
34
34
  </parameters><!--}}}-->
35
- <manipulate output="result"> data.x += "a2,"</manipulate>
35
+ <finalize output="result"> data.x += "a2,"</finalize>
36
36
  </call>
37
37
  <call id="a3" endpoint="timeout">
38
38
  <parameters><!--{{{-->
@@ -41,7 +41,7 @@
41
41
  <timeout>4</timeout>
42
42
  </parameters>
43
43
  </parameters><!--}}}-->
44
- <manipulate output="result"> data.x += "a3,"</manipulate>
44
+ <finalize output="result"> data.x += "a3,"</finalize>
45
45
  </call>
46
46
  </description><!--}}}-->
47
47
  </description>
data/cockpit/testsets/Syncing P34 2.xml CHANGED
@@ -7,7 +7,7 @@
7
7
  </dataelements><!--}}}-->
8
8
  <handlers><!--{{{-->
9
9
  <handler url="http://localhost:9299/1/events">
10
- <votes topic='running'>syncing_before,syncing_after</votes>
10
+ <votes topic='activity'>syncing_before,syncing_after</votes>
11
11
  </handler>
12
12
  </handlers><!--}}}-->
13
13
  <endpoints><!--{{{-->
@@ -23,7 +23,7 @@
23
23
  <timeout>2</timeout>
24
24
  </parameters>
25
25
  </parameters><!--}}}-->
26
- <manipulate output="result"> data.x += "a1,"</manipulate>
26
+ <finalize output="result"> data.x += "a1,"</finalize>
27
27
  </call>
28
28
  <call id="a2" endpoint="timeouts">
29
29
  <parameters><!--{{{-->
@@ -32,7 +32,7 @@
32
32
  <timeout>10</timeout>
33
33
  </parameters>
34
34
  </parameters><!--}}}-->
35
- <manipulate output="result"> data.x += "a2,"</manipulate>
35
+ <finalize output="result"> data.x += "a2,"</finalize>
36
36
  </call>
37
37
  <call id="a3" endpoint="timeout">
38
38
  <parameters><!--{{{-->
@@ -41,7 +41,7 @@
41
41
  <timeout>4</timeout>
42
42
  </parameters>
43
43
  </parameters><!--}}}-->
44
- <manipulate output="result"> data.x += "a3,"</manipulate>
44
+ <finalize output="result"> data.x += "a3,"</finalize>
45
45
  </call>
46
46
  </description><!--}}}-->
47
47
  </description>
data/cockpit/testsets/Syncing P34 3.xml CHANGED
@@ -7,7 +7,7 @@
7
7
  </dataelements><!--}}}-->
8
8
  <handlers><!--{{{-->
9
9
  <handler url="http://localhost:9299/1/events">
10
- <votes topic='running'>syncing_before,syncing_after</votes>
10
+ <votes topic='activity'>syncing_before,syncing_after</votes>
11
11
  </handler>
12
12
  </handlers><!--}}}-->
13
13
  <endpoints><!--{{{-->
@@ -23,7 +23,7 @@
23
23
  <timeout>2</timeout>
24
24
  </parameters>
25
25
  </parameters><!--}}}-->
26
- <manipulate output="result"> data.x += "a1,"</manipulate>
26
+ <finalize output="result"> data.x += "a1,"</finalize>
27
27
  </call>
28
28
  <call id="a2" endpoint="timeouts">
29
29
  <parameters><!--{{{-->
@@ -32,7 +32,7 @@
32
32
  <timeout>16</timeout>
33
33
  </parameters>
34
34
  </parameters><!--}}}-->
35
- <manipulate output="result"> data.x += "a2,"</manipulate>
35
+ <finalize output="result"> data.x += "a2,"</finalize>
36
36
  </call>
37
37
  <call id="a3" endpoint="timeout">
38
38
  <parameters><!--{{{-->
@@ -41,7 +41,7 @@
41
41
  <timeout>4</timeout>
42
42
  </parameters>
43
43
  </parameters><!--}}}-->
44
- <manipulate output="result"> data.x += "a3,"</manipulate>
44
+ <finalize output="result"> data.x += "a3,"</finalize>
45
45
  </call>
46
46
  </description><!--}}}-->
47
47
  </description>
data/cockpit/testsets/Syncing P34.xml CHANGED
@@ -7,7 +7,7 @@
7
7
  </dataelements><!--}}}-->
8
8
  <handlers><!--{{{-->
9
9
  <handler url="http://localhost:9299/1/events">
10
- <votes topic='running'>syncing_before,syncing_after</votes>
10
+ <votes topic='activity'>syncing_before,syncing_after</votes>
11
11
  </handler>
12
12
  </handlers><!--}}}-->
13
13
  <endpoints><!--{{{-->
@@ -23,7 +23,7 @@
23
23
  <timeout>2</timeout>
24
24
  </parameters>
25
25
  </parameters><!--}}}-->
26
- <manipulate output="result"> data.x += "a1,"</manipulate>
26
+ <finalize output="result"> data.x += "a1,"</finalize>
27
27
  </call>
28
28
  <call id="a2" endpoint="timeouts">
29
29
  <parameters><!--{{{-->
@@ -32,7 +32,7 @@
32
32
  <timeout>4</timeout>
33
33
  </parameters>
34
34
  </parameters><!--}}}-->
35
- <manipulate output="result"> data.x += "a2,"</manipulate>
35
+ <finalize output="result"> data.x += "a2,"</finalize>
36
36
  </call>
37
37
  <call id="a3" endpoint="timeout">
38
38
  <parameters><!--{{{-->
@@ -41,7 +41,7 @@
41
41
  <timeout>4</timeout>
42
42
  </parameters>
43
43
  </parameters><!--}}}-->
44
- <manipulate output="result"> data.x += "a3,"</manipulate>
44
+ <finalize output="result"> data.x += "a3,"</finalize>
45
45
  </call>
46
46
  </description><!--}}}-->
47
47
  </description>
data/cockpit/testsets/TEST - Wrong Positions.xml CHANGED
@@ -20,9 +20,9 @@
20
20
  <op1>data.wait</op1>
21
21
  </parameters>
22
22
  </parameters><!--}}}-->
23
- <manipulate output="result">
23
+ <finalize output="result">
24
24
  data.wait -= 1
25
- </manipulate>
25
+ </finalize>
26
26
  </call>
27
27
  <manipulate id="b1_a02">
28
28
  data.wait += 1
@@ -36,9 +36,9 @@
36
36
  <op1>data.wait</op1>
37
37
  </parameters>
38
38
  </parameters><!--}}}-->
39
- <manipulate output="result">
39
+ <finalize output="result">
40
40
  data.wait -= 1
41
- </manipulate>
41
+ </finalize>
42
42
  </call>
43
43
  <call id="b1_a04" endpoint="services">
44
44
  <parameters><!--{{{-->
@@ -47,9 +47,9 @@
47
47
  <op1>data.wait</op1>
48
48
  </parameters>
49
49
  </parameters><!--}}}-->
50
- <manipulate output="result">
50
+ <finalize output="result">
51
51
  data.wait -= 1
52
- </manipulate>
52
+ </finalize>
53
53
  </call>
54
54
  <manipulate id="b1_a05">
55
55
  data.wait += 1
@@ -63,9 +63,9 @@
63
63
  <op1>data.wait</op1>
64
64
  </parameters>
65
65
  </parameters><!--}}}-->
66
- <manipulate output="result">
66
+ <finalize output="result">
67
67
  data.wait -= 1
68
- </manipulate>
68
+ </finalize>
69
69
  </call>
70
70
  <manipulate id="b1_a07">
71
71
  data.wait += 1
@@ -77,9 +77,9 @@
77
77
  <op1>data.wait</op1>
78
78
  </parameters>
79
79
  </parameters><!--}}}-->
80
- <manipulate output="result">
80
+ <finalize output="result">
81
81
  data.wait -= 1
82
- </manipulate>
82
+ </finalize>
83
83
  </call>
84
84
  </parallel_branch>
85
85
  </parallel>
@@ -92,9 +92,9 @@
92
92
  <op1>data.wait</op1>
93
93
  </parameters>
94
94
  </parameters><!--}}}-->
95
- <manipulate output="result">
95
+ <finalize output="result">
96
96
  data.wait -= 1
97
- </manipulate>
97
+ </finalize>
98
98
  </call>
99
99
  <manipulate id="b2_a02">
100
100
  data.wait += 1
@@ -108,9 +108,9 @@
108
108
  <op1>data.wait</op1>
109
109
  </parameters>
110
110
  </parameters><!--}}}-->
111
- <manipulate output="result">
111
+ <finalize output="result">
112
112
  data.wait -= 1
113
- </manipulate>
113
+ </finalize>
114
114
  </call>
115
115
  <call id="b2_a04" endpoint="services">
116
116
  <parameters><!--{{{-->
@@ -119,9 +119,9 @@
119
119
  <op1>data.wait</op1>
120
120
  </parameters>
121
121
  </parameters><!--}}}-->
122
- <manipulate output="result">
122
+ <finalize output="result">
123
123
  data.wait -= 1
124
- </manipulate>
124
+ </finalize>
125
125
  </call>
126
126
  <manipulate id="b2_a05">
127
127
  data.wait += 1
@@ -135,9 +135,9 @@
135
135
  <op1>data.wait</op1>
136
136
  </parameters>
137
137
  </parameters><!--}}}-->
138
- <manipulate output="result">
138
+ <finalize output="result">
139
139
  data.wait -= 1
140
- </manipulate>
140
+ </finalize>
141
141
  </call>
142
142
  <manipulate id="b2_a07">
143
143
  data.wait += 1
@@ -149,9 +149,9 @@
149
149
  <op1>data.wait</op1>
150
150
  </parameters>
151
151
  </parameters><!--}}}-->
152
- <manipulate output="result">
152
+ <finalize output="result">
153
153
  data.wait -= 1
154
- </manipulate>
154
+ </finalize>
155
155
  </call>
156
156
  </parallel_branch>
157
157
  </parallel>
data/cockpit/testsets/Update.xml ADDED
@@ -0,0 +1,11 @@
1
+ <testset><dataelements/><handlerwrapper>DefaultHandlerWrapper</handlerwrapper><endpoints><cb xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/callback.simple.php</cb></endpoints><positions/><description><description xmlns="http://cpee.org/ns/description/1.0">
2
+ <call id="a1" endpoint="cb">
3
+ <parameters>
4
+ <label>"Update"</label>
5
+ <method>:post</method>
6
+ <parameters/>
7
+ </parameters>
8
+ <finalize>data.a = result.value</finalize>
9
+ <update>data.b = result.value</update>
10
+ </call>
11
+ </description></description><transformation><description type="copy"/><dataelements type="none"/><endpoints type="none"/></transformation><attributes><info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Enter info here</info><modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype></attributes></testset>
data/cockpit/testsets/Worklist Test.xml ADDED
@@ -0,0 +1,39 @@
1
+ <?xml version="1.0"?>
2
+ <testset>
3
+ <dataelements><bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/></dataelements>
4
+ <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
+ <endpoints>
6
+ <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
7
+ <cb xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://solo.wst.univie.ac.at:9302</cb>
8
+ </endpoints>
9
+ <positions/>
10
+ <description>
11
+ <description xmlns="http://cpee.org/ns/description/1.0">
12
+ <call id="a1" endpoint="cb">
13
+ <parameters>
14
+ <label>"OK OR NOT OK"</label>
15
+ <method>:post</method>
16
+ <parameters>
17
+ <orgmodel>"organisation1"</orgmodel>
18
+ <domain>"Virtual Business 1"</domain>
19
+ <form>"http://solo.wst.univie.ac.at/form/form-f.html"</form>
20
+ <role>"regular"</role>
21
+ <schaden>"55546"</schaden>
22
+ <text>"fetzen hin"</text>
23
+ </parameters>
24
+ </parameters>
25
+ <finalize>data.bla = result.value</finalize>
26
+ </call>
27
+ </description>
28
+ </description>
29
+ <transformation>
30
+ <description type="copy"/>
31
+ <dataelements type="none"/>
32
+ <endpoints type="none"/>
33
+ </transformation>
34
+ <attributes>
35
+ <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
36
+ <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
37
+ <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
38
+ </attributes>
39
+ </testset>
data/cockpit/testsets/testsets.xml CHANGED
@@ -14,4 +14,8 @@
14
14
  <testset>Syncing P34 2</testset>
15
15
  <testset>Syncing P34 3</testset>
16
16
  <testset>Signavio Model Base</testset>
17
+ <testset>Worklist Test</testset>
18
+ <testset>Worklist Test CPEE</testset>
19
+ <testset>Worklist Parallel</testset>
20
+ <testset>Update</testset>
17
21
  </testsets>
data/cpee.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "1.3.175"
3
+ s.version = "1.3.176"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3"
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/callback.rb CHANGED
@@ -32,8 +32,12 @@ module CPEE
32
32
  nil
33
33
  end
34
34
 
35
- def callback(result)
36
- @handler.send @method, result, *@data
35
+ def callback(result=nil,options=nil)
36
+ if options
37
+ @handler.send @method, result, options, *@data
38
+ else
39
+ @handler.send @method, result, *@data
40
+ end
37
41
  end
38
42
  end
39
43
 
data/lib/cpee/controller.rb CHANGED
@@ -146,7 +146,7 @@ module CPEE
146
146
  # only remove vote_callbacks, the other stuff is removed by
147
147
  # the instance stopping cleanup
148
148
  if c.method == :vote_callback
149
- c.callback(nil)
149
+ c.callback
150
150
  true
151
151
  else
152
152
  false
@@ -296,7 +296,7 @@ module CPEE
296
296
  end #}}}
297
297
  def unserialize_state! #{{{
298
298
  state = @properties.data.find("string(/p:properties/p:state)")
299
- if call_vote("properties/state/change", :instance => @id, :info => info, :state => state)
299
+ if call_vote("state/change", :instance => @id, :info => info, :state => state)
300
300
  case state
301
301
  when 'stopping'
302
302
  stop
@@ -416,7 +416,7 @@ module CPEE
416
416
  @instance.data[k.value.to_sym] = ValueHelper::parse(v.value)
417
417
  node.add(k.value,ValueHelper::generate(v.value))
418
418
  end
419
- nots << ["properties/dataelements/change", {:instance => instance, :changed => JSON::generate(@instance.data)}]
419
+ nots << ["dataelements/change", {:instance => instance, :changed => JSON::generate(@instance.data)}]
420
420
  end
421
421
 
422
422
  ### endpoints extraction
@@ -447,11 +447,11 @@ module CPEE
447
447
  @instance.endpoints[k.value.to_sym] = ValueHelper::parse(v.value)
448
448
  node.add(k.value,ValueHelper::generate(v.value))
449
449
  end
450
- nots << ["properties/endpoints/change", {:instance => instance, :changed => JSON::generate(@instance.endpoints)}]
450
+ nots << ["endpoints/change", {:instance => instance, :changed => JSON::generate(@instance.endpoints)}]
451
451
  end
452
- nots << ['properties/description/change', { :instance => instance }]
452
+ nots << ["description/change", { :instance => instance }]
453
453
  rescue => err
454
- nots << ["properties/description/error", { :instance => instance, :message => err.message }]
454
+ nots << ["description/error", { :instance => instance, :message => err.message }]
455
455
  end
456
456
  end
457
457
  nots
@@ -512,7 +512,7 @@ module CPEE
512
512
  if headers["CPEE_CALLBACK"] && headers["CPEE_CALLBACK"] == 'true'
513
513
  @callbacks[callback] = Callback.new("vote #{notf.find{|a,b| a == 'notification'}[1]}", self, :vote_callback, what, k, :http, continue, voteid, callback, inum)
514
514
  else
515
- vote_callback(result,continue,voteid,callback, inum)
515
+ vote_callback(result,nil,continue,voteid,callback,inum)
516
516
  end
517
517
  end
518
518
  elsif u.class == Riddl::Utils::Notifications::Producer::WS
@@ -534,7 +534,7 @@ module CPEE
534
534
  end
535
535
  end # }}}
536
536
 
537
- def vote_callback(result,continue,voteid,callback,num)# {{{
537
+ def vote_callback(result,options,continue,voteid,callback,num)# {{{
538
538
  @callbacks.delete(callback)
539
539
  if result == :DELETE
540
540
  @votes_results[voteid] << true