cpee 1.3.209 → 1.3.211

Sign up to get free protection for your applications and to get access to all the features.
Files changed (53) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +5 -5
  3. data/cockpit/contrib/transformation1.xsl +9 -9
  4. data/cockpit/index.html +6 -4
  5. data/cockpit/js/details.js +54 -56
  6. data/cockpit/js/instance.js +15 -5
  7. data/cockpit/js/parameters.js +28 -28
  8. data/cockpit/js/wfadaptor.js +32 -16
  9. data/cockpit/testsets/Centurio.xml +72 -0
  10. data/cockpit/testsets/Lego Plate.xml +1 -1
  11. data/cockpit/testsets/Lego Transporter.xml +11 -147
  12. data/cockpit/testsets/Linear.xml +3 -0
  13. data/cockpit/testsets/Syncing P34 1.xml +9 -1
  14. data/cockpit/testsets/Syncing P34 2.xml +9 -1
  15. data/cockpit/testsets/Syncing P34 3.xml +9 -1
  16. data/cockpit/testsets/Syncing P34.xml +9 -1
  17. data/cockpit/testsets/testsets.xml +1 -0
  18. data/cockpit/themes/default/theme.js +22 -21
  19. data/cockpit/themes/labels/theme.js +786 -0
  20. data/cpee.gemspec +4 -2
  21. data/lib/cpee/controller.rb +0 -5
  22. data/server/handlerwrappers/default.rb +9 -15
  23. data/server/handlerwrappers/soap.rb +10 -10
  24. data/server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/consumer-secret +1 -0
  25. data/server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/producer-secret +1 -0
  26. data/server/instances/{6/notifications/0e9f3728f00c0562870110697bd8819c → 10/notifications/182434032285ca1d06a8b6554b8889c8}/subscription.xml +6 -21
  27. data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/consumer-secret +1 -0
  28. data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/producer-secret +1 -0
  29. data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/subscription.xml +6 -0
  30. data/server/instances/10/properties.xml +187 -0
  31. data/server/instances/11/properties.xml +191 -0
  32. data/server/instances/12/properties.xml +191 -0
  33. data/server/instances/13/properties.xml +204 -0
  34. data/server/instances/14/properties.xml +31 -0
  35. data/server/instances/15/properties.xml +30 -0
  36. data/server/instances/16/properties.xml +29 -0
  37. data/server/instances/17/properties.xml +29 -0
  38. data/server/instances/18/properties.xml +31 -0
  39. data/server/instances/19/properties.xml +31 -0
  40. data/server/instances/20/properties.xml +191 -0
  41. data/server/instances/7/properties.xml +120 -0
  42. data/server/instances/8/properties.xml +118 -0
  43. data/server/instances/9/properties.xml +120 -0
  44. data/test/callback.rb +2 -2
  45. data/tools/cpee +38 -0
  46. data/tools/server/resources/notifications/logging/consumer-secret +1 -0
  47. data/tools/server/resources/notifications/logging/producer-secret +1 -0
  48. data/tools/server/resources/notifications/logging/subscription.xml +7 -0
  49. data/tools/server/resources/properties.init +47 -0
  50. data/tools/server/server.rb +14 -0
  51. metadata +33 -7
  52. data/server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/consumer-secret +0 -1
  53. data/server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/producer-secret +0 -1
@@ -0,0 +1,72 @@
1
+ <?xml version="1.0"?>
2
+ <testset>
3
+ <positions/>
4
+ <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
+ <dataelements>
6
+ <losgroesse>3</losgroesse>
7
+ <spec>12345</spec>
8
+ <qualitaet>null</qualitaet>
9
+ <drilled>[]</drilled>
10
+ <typ>Typ A</typ>
11
+ <score>0</score>
12
+ </dataelements>
13
+ <endpoints>
14
+ <cut>http://gruppe.wst.univie.ac.at/~mangler/services/cut.php</cut>
15
+ <drill>http://gruppe.wst.univie.ac.at/~mangler/services/drill.php</drill>
16
+ <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
17
+ </endpoints>
18
+ <description>
19
+ <description xmlns="http://cpee.org/ns/description/1.0">
20
+ <call id="a1" endpoint="cut">
21
+ <parameters>
22
+ <label>Schneiden</label>
23
+ <method>:post</method>
24
+ <arguments>
25
+ <typ>data.typ</typ>
26
+ <spec>data.spec</spec>
27
+ <losgroesse>data.losgroesse</losgroesse>
28
+ </arguments>
29
+ </parameters>
30
+ <finalize output="result">data.qualitaet = result.value('id')
31
+ data.score += result.value('score').to_f
32
+ status.update 1, 'Produziert'</finalize>
33
+ </call>
34
+ <parallel>
35
+ <loop mode="pre_test" condition="data.losgroesse > 0">
36
+ <parallel_branch pass="data.losgroesse" local="p">
37
+ <call id="a2" endpoint="drill">
38
+ <parameters>
39
+ <label>Bohren</label>
40
+ <method>:post</method>
41
+ <arguments>
42
+ <to>data.to</to>
43
+ </arguments>
44
+ </parameters>
45
+ <finalize output="result">data.drilled &lt;&lt; result.value('id')
46
+ data.score += result.value('score').to_f</finalize>
47
+ </call>
48
+ </parallel_branch>
49
+ <manipulate id="a3">data.losgroesse -= 1</manipulate>
50
+ </loop>
51
+ </parallel>
52
+ <choose>
53
+ <alternative condition="data.score > 700">
54
+ <call id="a4" endpoint="approve">
55
+ <parameters>
56
+ <label>Beurteilen</label>
57
+ <method>:post</method>
58
+ <arguments>
59
+ <score>data.score</score>
60
+ </arguments>
61
+ </parameters>
62
+ </call>
63
+ </alternative>
64
+ </choose>
65
+ </description>
66
+ </description>
67
+ <transformation>
68
+ <description type='copy'/>
69
+ <dataelements type='rest'/>
70
+ <endpoints type='rest'/>
71
+ </transformation>
72
+ </testset>
@@ -11,7 +11,7 @@
11
11
  <positions/>
12
12
  <description>
13
13
  <description xmlns="http://cpee.org/ns/description/1.0">
14
- <loop mode="pre_test" condition="data.i&lt;2">
14
+ <loop mode="pre_test" condition="data.i&lt;4">
15
15
  <call id="a1" endpoint="move">
16
16
  <parameters>
17
17
  <label>Move to next station</label>
@@ -1,166 +1,29 @@
1
- <?xml version="1.0"?>
2
1
  <testset>
3
- <dataelements>
4
- <i xmlns="http://riddl.org/ns/common-patterns/properties/1.0">1</i>
5
- </dataelements>
2
+ <dataelements/>
6
3
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
7
4
  <endpoints>
8
- <folders xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://dispenser.wst.univie.ac.at:9200/folders</folders>
9
- <ldown xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://pusher.wst.univie.ac.at:9200/lever/down</ldown>
10
- <lup xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://pusher.wst.univie.ac.at:9200/lever/up</lup>
11
- <speed xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://dispenser.wst.univie.ac.at:9200/speed</speed>
12
- <mstart xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://dispenser.wst.univie.ac.at:9200/motor/start</mstart>
13
- <mstop xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://dispenser.wst.univie.ac.at:9200/motor/stop</mstop>
14
- <sstop xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://pusher.wst.univie.ac.at:9200/sensor/stop</sstop>
15
- <dispense xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://pusher.wst.univie.ac.at:9200/dispense</dispense>
16
- <gpos xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://dispenser.wst.univie.ac.at:9200/go_to_pos</gpos>
17
- <gfolder xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://dispenser.wst.univie.ac.at:9200/folder/next</gfolder>
5
+ <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
6
+ <dispense xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://transporter.wst.univie.ac.at:9200/dispense</dispense>
7
+ <stein xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://transporter.wst.univie.ac.at:9200/stein</stein>
18
8
  </endpoints>
19
9
  <positions/>
20
10
  <description>
21
11
  <description xmlns="http://cpee.org/ns/description/1.0">
22
- <call id="a15" endpoint="speed">
12
+ <call id="a1" endpoint="stein">
23
13
  <parameters>
24
- <label>Set speed for going left</label>
25
- <method>:put</method>
26
- <arguments>
27
- <speed>-750</speed>
28
- </arguments>
29
- </parameters>
30
- </call>
31
- <call id="a14" endpoint="gpos">
32
- <parameters>
33
- <label>Go to left end</label>
14
+ <label>Take Stein</label>
34
15
  <method>:post</method>
35
16
  <arguments>
36
- <pos>0</pos>
37
- <methode>1</methode>
17
+ <data>2</data>
38
18
  </arguments>
39
19
  </parameters>
40
20
  </call>
41
- <loop mode="pre_test" condition="data.i&lt;3">
42
- <call id="a13" endpoint="gfolder">
43
- <parameters>
44
- <label>Go to next folder</label>
45
- <method>:post</method>
46
- <arguments/>
47
- </parameters>
48
- <finalize output="result">data.i = data.i+1 </finalize>
49
- </call>
50
- </loop>
51
- <call id="a2" endpoint="ldown">
52
- <parameters>
53
- <label>Lever down</label>
54
- <method>:post</method>
55
- <arguments/>
56
- </parameters>
57
- </call>
58
- <call id="a3" endpoint="gfolder">
59
- <parameters>
60
- <label>Go to next folder</label>
61
- <method>:post</method>
62
- <arguments/>
63
- </parameters>
64
- </call>
65
- <call id="a4" endpoint="dispense">
21
+ <call id="a2" endpoint="dispense">
66
22
  <parameters>
67
23
  <label>Dispense</label>
68
24
  <method>:post</method>
69
- <arguments/>
70
- </parameters>
71
- </call>
72
- <call id="a5" endpoint="lup">
73
- <parameters>
74
- <label>Lever up</label>
75
- <method>:post</method>
76
- <arguments/>
77
- </parameters>
78
- </call>
79
- <call id="a16" endpoint="speed">
80
- <parameters>
81
- <label>Set Speed for right</label>
82
- <method>:put</method>
83
- <arguments>
84
- <speed>750</speed>
85
- </arguments>
86
- </parameters>
87
- </call>
88
- <call id="a17" endpoint="gpos">
89
- <parameters>
90
- <label>Go to right end</label>
91
- <method>:post</method>
92
- <arguments>
93
- <pos>3</pos>
94
- <methode>1</methode>
95
- </arguments>
96
- </parameters>
97
- </call>
98
- <call id="a18" endpoint="ldown">
99
- <parameters>
100
- <label>Lower Lever</label>
101
- <method>:post</method>
102
- <arguments/>
103
- </parameters>
104
- </call>
105
- <parallel svg-label="">
106
- <parallel_branch svg-label="">
107
- <call id="a6" endpoint="speed">
108
- <parameters>
109
- <label>Set Speed to go left</label>
110
- <method>:put</method>
111
- <arguments>
112
- <speed>-50</speed>
113
- </arguments>
114
- </parameters>
115
- </call>
116
- <call id="a7" endpoint="mstart">
117
- <parameters>
118
- <label>Go left</label>
119
- <method>:post</method>
120
- <arguments/>
121
- </parameters>
122
- </call>
123
- </parallel_branch>
124
- <parallel_branch svg-label="">
125
- <call id="a8" endpoint="sstop">
126
- <parameters>
127
- <label>StopSensor pusher</label>
128
- <method>:post</method>
129
- <arguments/>
130
- </parameters>
131
- </call>
132
- </parallel_branch>
133
- </parallel>
134
- <call id="a9" endpoint="mstop">
135
- <parameters>
136
- <label>Stop Motor</label>
137
- <method>:post</method>
138
- <arguments/>
139
- </parameters>
140
- </call>
141
- <call id="a10" endpoint="lup">
142
- <parameters>
143
- <label>Raise Lever</label>
144
- <method>:post</method>
145
- <arguments/>
146
- </parameters>
147
- </call>
148
- <call id="a11" endpoint="speed">
149
- <parameters>
150
- <label>Set Speed for right</label>
151
- <method>:put</method>
152
- <arguments>
153
- <speed>750</speed>
154
- </arguments>
155
- </parameters>
156
- </call>
157
- <call id="a12" endpoint="gpos">
158
- <parameters>
159
- <label>Go to right end</label>
160
- <method>:post</method>
161
25
  <arguments>
162
- <pos>3</pos>
163
- <methode>1</methode>
26
+ <data>2</data>
164
27
  </arguments>
165
28
  </parameters>
166
29
  </call>
@@ -172,7 +35,8 @@
172
35
  <endpoints type="none"/>
173
36
  </transformation>
174
37
  <attributes>
175
- <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Lego Transporter</info>
38
+ <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">s</info>
176
39
  <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>
177
41
  </attributes>
178
42
  </testset>
@@ -20,6 +20,7 @@
20
20
  <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
21
21
  <call id="a1" endpoint="timeout">
22
22
  <parameters><!--{{{-->
23
+ <label>Step 1</label>
23
24
  <method>:post</method>
24
25
  <arguments>
25
26
  <timeout>2</timeout>
@@ -29,6 +30,7 @@
29
30
  </call>
30
31
  <call id="a2" endpoint="timeout">
31
32
  <parameters><!--{{{-->
33
+ <label>Step 2</label>
32
34
  <method>:post</method>
33
35
  <arguments>
34
36
  <timeout>4</timeout>
@@ -38,6 +40,7 @@
38
40
  </call>
39
41
  <call id="a3" endpoint="timeout">
40
42
  <parameters><!--{{{-->
43
+ <label>Step 3</label>
41
44
  <method>:post</method>
42
45
  <arguments>
43
46
  <timeout>4</timeout>
@@ -1,12 +1,17 @@
1
1
  <?xml version="1.0"?>
2
2
  <testset>
3
+ <attributes>
4
+ <info>Syncing Instance 1</info>
5
+ <modeltype>CPEE</modeltype>
6
+ <theme>default</theme>
7
+ </attributes>
3
8
  <positions/>
4
9
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
10
  <dataelements><!--{{{-->
6
11
  <x/>
7
12
  </dataelements><!--}}}-->
8
13
  <handlers><!--{{{-->
9
- <handler url="http://localhost:9299/1/events">
14
+ <handler url="http://localhost:9399/1/events">
10
15
  <votes topic='activity'>syncing_before,syncing_after</votes>
11
16
  </handler>
12
17
  </handlers><!--}}}-->
@@ -18,6 +23,7 @@
18
23
  <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
19
24
  <call id="a1" endpoint="timeout">
20
25
  <parameters><!--{{{-->
26
+ <label>Task 1</label>
21
27
  <method>:post</method>
22
28
  <arguments>
23
29
  <timeout>2</timeout>
@@ -27,6 +33,7 @@
27
33
  </call>
28
34
  <call id="a2" endpoint="timeouts">
29
35
  <parameters><!--{{{-->
36
+ <label>Resource Synchronisation</label>
30
37
  <method>:post</method>
31
38
  <arguments>
32
39
  <timeout>4</timeout>
@@ -36,6 +43,7 @@
36
43
  </call>
37
44
  <call id="a3" endpoint="timeout">
38
45
  <parameters><!--{{{-->
46
+ <label>Task 3</label>
39
47
  <method>:post</method>
40
48
  <arguments>
41
49
  <timeout>4</timeout>
@@ -1,12 +1,17 @@
1
1
  <?xml version="1.0"?>
2
2
  <testset>
3
+ <attributes>
4
+ <info>Syncing Instance 2</info>
5
+ <modeltype>CPEE</modeltype>
6
+ <theme>default</theme>
7
+ </attributes>
3
8
  <positions/>
4
9
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
10
  <dataelements><!--{{{-->
6
11
  <x/>
7
12
  </dataelements><!--}}}-->
8
13
  <handlers><!--{{{-->
9
- <handler url="http://localhost:9299/1/events">
14
+ <handler url="http://localhost:9399/1/events">
10
15
  <votes topic='activity'>syncing_before,syncing_after</votes>
11
16
  </handler>
12
17
  </handlers><!--}}}-->
@@ -18,6 +23,7 @@
18
23
  <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
19
24
  <call id="a1" endpoint="timeout">
20
25
  <parameters><!--{{{-->
26
+ <label>Task 1</label>
21
27
  <method>:post</method>
22
28
  <arguments>
23
29
  <timeout>2</timeout>
@@ -27,6 +33,7 @@
27
33
  </call>
28
34
  <call id="a2" endpoint="timeouts">
29
35
  <parameters><!--{{{-->
36
+ <label>Resource Synchronisation</label>
30
37
  <method>:post</method>
31
38
  <arguments>
32
39
  <timeout>10</timeout>
@@ -36,6 +43,7 @@
36
43
  </call>
37
44
  <call id="a3" endpoint="timeout">
38
45
  <parameters><!--{{{-->
46
+ <label>Task 3</label>
39
47
  <method>:post</method>
40
48
  <arguments>
41
49
  <timeout>4</timeout>
@@ -1,12 +1,17 @@
1
1
  <?xml version="1.0"?>
2
2
  <testset>
3
+ <attributes>
4
+ <info>Syncing Instance 3</info>
5
+ <modeltype>CPEE</modeltype>
6
+ <theme>default</theme>
7
+ </attributes>
3
8
  <positions/>
4
9
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
10
  <dataelements><!--{{{-->
6
11
  <x/>
7
12
  </dataelements><!--}}}-->
8
13
  <handlers><!--{{{-->
9
- <handler url="http://localhost:9299/1/events">
14
+ <handler url="http://localhost:9399/1/events">
10
15
  <votes topic='activity'>syncing_before,syncing_after</votes>
11
16
  </handler>
12
17
  </handlers><!--}}}-->
@@ -18,6 +23,7 @@
18
23
  <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
19
24
  <call id="a1" endpoint="timeout">
20
25
  <parameters><!--{{{-->
26
+ <label>Task 1</label>
21
27
  <method>:post</method>
22
28
  <arguments>
23
29
  <timeout>2</timeout>
@@ -27,6 +33,7 @@
27
33
  </call>
28
34
  <call id="a2" endpoint="timeouts">
29
35
  <parameters><!--{{{-->
36
+ <label>Resource Synchronisation</label>
30
37
  <method>:post</method>
31
38
  <arguments>
32
39
  <timeout>16</timeout>
@@ -36,6 +43,7 @@
36
43
  </call>
37
44
  <call id="a3" endpoint="timeout">
38
45
  <parameters><!--{{{-->
46
+ <label>Task 3</label>
39
47
  <method>:post</method>
40
48
  <arguments>
41
49
  <timeout>4</timeout>
@@ -1,12 +1,17 @@
1
1
  <?xml version="1.0"?>
2
2
  <testset>
3
+ <attributes>
4
+ <info>Syncing</info>
5
+ <modeltype>CPEE</modeltype>
6
+ <theme>default</theme>
7
+ </attributes>
3
8
  <positions/>
4
9
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
10
  <dataelements><!--{{{-->
6
11
  <x/>
7
12
  </dataelements><!--}}}-->
8
13
  <handlers><!--{{{-->
9
- <handler url="http://localhost:9299/1/events">
14
+ <handler url="http://localhost:9399/1/events">
10
15
  <votes topic='activity'>syncing_before,syncing_after</votes>
11
16
  </handler>
12
17
  </handlers><!--}}}-->
@@ -18,6 +23,7 @@
18
23
  <description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
19
24
  <call id="a1" endpoint="timeout">
20
25
  <parameters><!--{{{-->
26
+ <label>Task 1</label>
21
27
  <method>:post</method>
22
28
  <arguments>
23
29
  <timeout>2</timeout>
@@ -27,6 +33,7 @@
27
33
  </call>
28
34
  <call id="a2" endpoint="timeouts">
29
35
  <parameters><!--{{{-->
36
+ <label>Resource Synchronisation</label>
30
37
  <method>:post</method>
31
38
  <arguments>
32
39
  <timeout>4</timeout>
@@ -36,6 +43,7 @@
36
43
  </call>
37
44
  <call id="a3" endpoint="timeout">
38
45
  <parameters><!--{{{-->
46
+ <label>Task 3</label>
39
47
  <method>:post</method>
40
48
  <arguments>
41
49
  <timeout>4</timeout>