cpee 1.3.206 → 1.3.207

Sign up to get free protection for your applications and to get access to all the features.
Files changed (46) hide show
  1. checksums.yaml +4 -4
  2. data/cpee.gemspec +1 -1
  3. data/lib/cpee/controller.rb +9 -1
  4. data/log/yaml/log.xml +27 -0
  5. data/log/yaml/logoverlay.xml +10 -0
  6. data/log/yaml/server.rb +122 -0
  7. data/log/yaml/topics.xml +22 -0
  8. data/log/yaml/yaml.rb +19 -0
  9. data/server/instances/1/properties.xml +1 -1
  10. data/server/instances/2/properties.xml +1 -1
  11. data/server/instances/3/properties.xml +93 -35
  12. data/server/instances/4/properties.xml +87 -35
  13. data/server/instances/5/properties.xml +87 -35
  14. data/server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/consumer-secret +1 -0
  15. data/server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/producer-secret +1 -0
  16. data/server/instances/{30/notifications/f7afc30fd195bc06ac100a9b848c5da3 → 6/notifications/0e9f3728f00c0562870110697bd8819c}/subscription.xml +3 -7
  17. data/server/instances/6/properties.xml +92 -9
  18. data/server/server.rb +1 -1
  19. metadata +10 -30
  20. data/server/instances/10/properties.xml +0 -31
  21. data/server/instances/11/properties.xml +0 -62
  22. data/server/instances/12/properties.xml +0 -152
  23. data/server/instances/13/properties.xml +0 -62
  24. data/server/instances/14/properties.xml +0 -150
  25. data/server/instances/15/properties.xml +0 -69
  26. data/server/instances/16/properties.xml +0 -63
  27. data/server/instances/17/properties.xml +0 -31
  28. data/server/instances/18/properties.xml +0 -150
  29. data/server/instances/19/properties.xml +0 -152
  30. data/server/instances/20/properties.xml +0 -68
  31. data/server/instances/21/properties.xml +0 -118
  32. data/server/instances/22/properties.xml +0 -525
  33. data/server/instances/23/properties.xml +0 -65
  34. data/server/instances/24/properties.xml +0 -65
  35. data/server/instances/25/properties.xml +0 -65
  36. data/server/instances/26/properties.xml +0 -65
  37. data/server/instances/27/properties.xml +0 -65
  38. data/server/instances/28/properties.xml +0 -65
  39. data/server/instances/29/properties.xml +0 -67
  40. data/server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/consumer-secret +0 -1
  41. data/server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/producer-secret +0 -1
  42. data/server/instances/30/properties.xml +0 -65
  43. data/server/instances/7/properties.xml +0 -62
  44. data/server/instances/8/properties.xml +0 -31
  45. data/server/instances/9/properties.xml +0 -62
  46. data/server/resources/test.rb +0 -9
data/server/instances/5/properties.xml CHANGED
@@ -1,38 +1,67 @@
1
1
  <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
2
  <attributes>
3
- <uuid>cd7e37f1-c963-4bf2-84d9-55365f62f341</uuid>
4
- <info>Lego Plate</info>
3
+ <uuid>33bdd814-1a39-4fff-a9d6-934126dcb259</uuid>
4
+ <info>Linear</info>
5
5
  <modeltype>CPEE</modeltype>
6
+ <theme>default</theme>
6
7
  </attributes>
7
- <state>finished</state>
8
+ <state>ready</state>
8
9
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
9
- <positions/>
10
+ <positions>
11
+ <a1>after</a1>
12
+ </positions>
10
13
  <dataelements>
11
- <i>0</i>
14
+ <x/>
12
15
  </dataelements>
13
16
  <endpoints>
14
17
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
15
- <move>http://plate.wst.univie.ac.at:9200/go-next</move>
16
18
  </endpoints>
17
- <dsl>loop pre_test{i&lt;2} do
18
- call :a1, :move, parameters: { :label =&gt; "Move to next station", :method =&gt; :post, :arguments =&gt; nil }, finalize: &lt;&lt;-END
19
- data.i= data.i + 1
20
- END
21
- end
19
+ <dsl>call :a1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }, finalize: &lt;&lt;-END
20
+ data.x += "a1,"
21
+ END
22
+ call :a2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
23
+ data.x += "a2,"
24
+ END
25
+ call :a3, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
26
+ data.x += "a3,"
27
+ END
22
28
  </dsl>
23
29
  <dslx>
24
30
  <description xmlns="http://cpee.org/ns/description/1.0">
25
- <loop mode="pre_test" condition="i&lt;2">
26
- <call id="a1" endpoint="move">
27
- <parameters>
28
- <label>Move to next station</label>
29
- <method>:post</method>
30
- <arguments/>
31
- </parameters>
32
- <finalize output="result">data.i= data.i + 1</finalize>
33
- <update output="result"/>
34
- </call>
35
- </loop>
31
+ <!--{{{-->
32
+ <call id="a1" endpoint="timeout">
33
+ <parameters>
34
+ <!--{{{-->
35
+ <method>:post</method>
36
+ <arguments>
37
+ <timeout>2</timeout>
38
+ </arguments>
39
+ </parameters>
40
+ <!--}}}-->
41
+ <finalize output="result">data.x += "a1,"</finalize>
42
+ </call>
43
+ <call id="a2" endpoint="timeout">
44
+ <parameters>
45
+ <!--{{{-->
46
+ <method>:post</method>
47
+ <arguments>
48
+ <timeout>4</timeout>
49
+ </arguments>
50
+ </parameters>
51
+ <!--}}}-->
52
+ <finalize output="result">data.x += "a2,"</finalize>
53
+ </call>
54
+ <call id="a3" endpoint="timeout">
55
+ <parameters>
56
+ <!--{{{-->
57
+ <method>:post</method>
58
+ <arguments>
59
+ <timeout>4</timeout>
60
+ </arguments>
61
+ </parameters>
62
+ <!--}}}-->
63
+ <finalize output="result">data.x += "a3,"</finalize>
64
+ </call>
36
65
  </description>
37
66
  </dslx>
38
67
  <status>
@@ -41,22 +70,45 @@ end
41
70
  </status>
42
71
  <description>
43
72
  <description xmlns="http://cpee.org/ns/description/1.0">
44
- <loop mode="pre_test" condition="i&lt;2">
45
- <call id="a1" endpoint="move">
46
- <parameters>
47
- <label>Move to next station</label>
48
- <method>:post</method>
49
- <arguments/>
50
- </parameters>
51
- <finalize output="result">data.i= data.i + 1</finalize>
52
- <update output="result"/>
53
- </call>
54
- </loop>
73
+ <!--{{{-->
74
+ <call id="a1" endpoint="timeout">
75
+ <parameters>
76
+ <!--{{{-->
77
+ <method>:post</method>
78
+ <arguments>
79
+ <timeout>2</timeout>
80
+ </arguments>
81
+ </parameters>
82
+ <!--}}}-->
83
+ <finalize output="result">data.x += "a1,"</finalize>
84
+ </call>
85
+ <call id="a2" endpoint="timeout">
86
+ <parameters>
87
+ <!--{{{-->
88
+ <method>:post</method>
89
+ <arguments>
90
+ <timeout>4</timeout>
91
+ </arguments>
92
+ </parameters>
93
+ <!--}}}-->
94
+ <finalize output="result">data.x += "a2,"</finalize>
95
+ </call>
96
+ <call id="a3" endpoint="timeout">
97
+ <parameters>
98
+ <!--{{{-->
99
+ <method>:post</method>
100
+ <arguments>
101
+ <timeout>4</timeout>
102
+ </arguments>
103
+ </parameters>
104
+ <!--}}}-->
105
+ <finalize output="result">data.x += "a3,"</finalize>
106
+ </call>
55
107
  </description>
56
108
  </description>
57
109
  <transformation>
58
110
  <description type="copy"/>
59
- <dataelements type="none"/>
60
- <endpoints type="none"/>
111
+ <dataelements type="rest"/>
112
+ <endpoints type="rest"/>
61
113
  </transformation>
62
114
  </properties>
data/server/instances/{30/notifications/f7afc30fd195bc06ac100a9b848c5da3 → 6/notifications/0e9f3728f00c0562870110697bd8819c}/subscription.xml RENAMED
@@ -5,14 +5,13 @@
5
5
  <event>manipulating</event>
6
6
  <event>failed</event>
7
7
  <event>done</event>
8
- <vote>syncing_after</vote>
9
8
  </topic>
10
- <topic id="description">
9
+ <topic id="position">
11
10
  <event>change</event>
12
- <event>error</event>
13
11
  </topic>
14
- <topic id="position">
12
+ <topic id="description">
15
13
  <event>change</event>
14
+ <event>error</event>
16
15
  </topic>
17
16
  <topic id="state">
18
17
  <event>change</event>
@@ -36,7 +35,4 @@
36
35
  <topic id="handlers">
37
36
  <event>change</event>
38
37
  </topic>
39
- <topic id="xxx">
40
- <fingerprint-with-producer-secre>xxx</fingerprint-with-producer-secre>
41
- </topic>
42
38
  </subscription>
data/server/instances/6/properties.xml CHANGED
@@ -1,31 +1,114 @@
1
1
  <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
2
  <attributes>
3
- <uuid>506f28ad-708e-4530-9e58-0df2cefa9d61</uuid>
4
- <info/>
3
+ <uuid>a5e56666-9168-4d33-b63e-81c9039c6700</uuid>
4
+ <info>Linear</info>
5
5
  <modeltype>CPEE</modeltype>
6
6
  <theme>default</theme>
7
7
  </attributes>
8
8
  <state>ready</state>
9
9
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
10
- <positions/>
11
- <dataelements/>
10
+ <positions>
11
+ <a1>after</a1>
12
+ </positions>
13
+ <dataelements>
14
+ <x/>
15
+ </dataelements>
12
16
  <endpoints>
13
17
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
14
18
  </endpoints>
15
- <dsl/>
19
+ <dsl>call :a1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }, finalize: &lt;&lt;-END
20
+ data.x += "a1,"
21
+ END
22
+ call :a2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
23
+ data.x += "a2,"
24
+ END
25
+ call :a3, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
26
+ data.x += "a3,"
27
+ END
28
+ </dsl>
16
29
  <dslx>
17
- <description xmlns="http://cpee.org/ns/description/1.0"/>
30
+ <description xmlns="http://cpee.org/ns/description/1.0">
31
+ <!--{{{-->
32
+ <call id="a1" endpoint="timeout">
33
+ <parameters>
34
+ <!--{{{-->
35
+ <method>:post</method>
36
+ <arguments>
37
+ <timeout>2</timeout>
38
+ </arguments>
39
+ </parameters>
40
+ <!--}}}-->
41
+ <finalize output="result">data.x += "a1,"</finalize>
42
+ </call>
43
+ <call id="a2" endpoint="timeout">
44
+ <parameters>
45
+ <!--{{{-->
46
+ <method>:post</method>
47
+ <arguments>
48
+ <timeout>4</timeout>
49
+ </arguments>
50
+ </parameters>
51
+ <!--}}}-->
52
+ <finalize output="result">data.x += "a2,"</finalize>
53
+ </call>
54
+ <call id="a3" endpoint="timeout">
55
+ <parameters>
56
+ <!--{{{-->
57
+ <method>:post</method>
58
+ <arguments>
59
+ <timeout>4</timeout>
60
+ </arguments>
61
+ </parameters>
62
+ <!--}}}-->
63
+ <finalize output="result">data.x += "a3,"</finalize>
64
+ </call>
65
+ </description>
18
66
  </dslx>
19
67
  <status>
20
68
  <id>0</id>
21
69
  <message>undefined</message>
22
70
  </status>
23
71
  <description>
24
- <description xmlns="http://cpee.org/ns/description/1.0"/>
72
+ <description xmlns="http://cpee.org/ns/description/1.0">
73
+ <!--{{{-->
74
+ <call id="a1" endpoint="timeout">
75
+ <parameters>
76
+ <!--{{{-->
77
+ <method>:post</method>
78
+ <arguments>
79
+ <timeout>2</timeout>
80
+ </arguments>
81
+ </parameters>
82
+ <!--}}}-->
83
+ <finalize output="result">data.x += "a1,"</finalize>
84
+ </call>
85
+ <call id="a2" endpoint="timeout">
86
+ <parameters>
87
+ <!--{{{-->
88
+ <method>:post</method>
89
+ <arguments>
90
+ <timeout>4</timeout>
91
+ </arguments>
92
+ </parameters>
93
+ <!--}}}-->
94
+ <finalize output="result">data.x += "a2,"</finalize>
95
+ </call>
96
+ <call id="a3" endpoint="timeout">
97
+ <parameters>
98
+ <!--{{{-->
99
+ <method>:post</method>
100
+ <arguments>
101
+ <timeout>4</timeout>
102
+ </arguments>
103
+ </parameters>
104
+ <!--}}}-->
105
+ <finalize output="result">data.x += "a3,"</finalize>
106
+ </call>
107
+ </description>
25
108
  </description>
26
109
  <transformation>
27
110
  <description type="copy"/>
28
- <dataelements type="none"/>
29
- <endpoints type="none"/>
111
+ <dataelements type="rest"/>
112
+ <endpoints type="rest"/>
30
113
  </transformation>
31
114
  </properties>
data/server/server.rb CHANGED
@@ -15,7 +15,7 @@
15
15
  # <http://www.gnu.org/licenses/>.
16
16
 
17
17
  require 'rubygems'
18
- gem 'nokogiri', '~> 1.6.6'
18
+ gem 'nokogiri'#, '~> 1.6.6'
19
19
  require File.expand_path(File.dirname(__FILE__) + '/../lib/cpee/implementation')
20
20
 
21
21
  Riddl::Server.new(CPEE::SERVER, :port => 9298) do
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.3.206
4
+ version: 1.3.207
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2017-02-07 00:00:00.000000000 Z
14
+ date: 2017-05-16 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: riddl
@@ -285,47 +285,27 @@ files:
285
285
  - log/server.rb
286
286
  - log/template.xes
287
287
  - log/topics.xml
288
+ - log/yaml/log.xml
289
+ - log/yaml/logoverlay.xml
290
+ - log/yaml/server.rb
291
+ - log/yaml/topics.xml
292
+ - log/yaml/yaml.rb
288
293
  - server/handlerwrappers/default.rb
289
294
  - server/handlerwrappers/soap.rb
290
295
  - server/instances/1/properties.xml
291
- - server/instances/10/properties.xml
292
- - server/instances/11/properties.xml
293
- - server/instances/12/properties.xml
294
- - server/instances/13/properties.xml
295
- - server/instances/14/properties.xml
296
- - server/instances/15/properties.xml
297
- - server/instances/16/properties.xml
298
- - server/instances/17/properties.xml
299
- - server/instances/18/properties.xml
300
- - server/instances/19/properties.xml
301
296
  - server/instances/2/properties.xml
302
- - server/instances/20/properties.xml
303
- - server/instances/21/properties.xml
304
- - server/instances/22/properties.xml
305
- - server/instances/23/properties.xml
306
- - server/instances/24/properties.xml
307
- - server/instances/25/properties.xml
308
- - server/instances/26/properties.xml
309
- - server/instances/27/properties.xml
310
- - server/instances/28/properties.xml
311
- - server/instances/29/properties.xml
312
297
  - server/instances/3/properties.xml
313
- - server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/consumer-secret
314
- - server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/producer-secret
315
- - server/instances/30/notifications/f7afc30fd195bc06ac100a9b848c5da3/subscription.xml
316
- - server/instances/30/properties.xml
317
298
  - server/instances/4/properties.xml
318
299
  - server/instances/5/properties.xml
300
+ - server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/consumer-secret
301
+ - server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/producer-secret
302
+ - server/instances/6/notifications/0e9f3728f00c0562870110697bd8819c/subscription.xml
319
303
  - server/instances/6/properties.xml
320
- - server/instances/7/properties.xml
321
- - server/instances/8/properties.xml
322
- - server/instances/9/properties.xml
323
304
  - server/resources/empty_dslx.xml
324
305
  - server/resources/properties.init
325
306
  - server/resources/properties.schema.active
326
307
  - server/resources/properties.schema.finished
327
308
  - server/resources/properties.schema.inactive
328
- - server/resources/test.rb
329
309
  - server/resources/topics.xml
330
310
  - server/resources/transformation.xml
331
311
  - server/resources/transformation_dslx.xsl
data/server/instances/10/properties.xml DELETED
@@ -1,31 +0,0 @@
1
- <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
- <attributes>
3
- <uuid>8a7ed2d4-5a9a-4d0e-876e-bd924297d286</uuid>
4
- <info/>
5
- <modeltype>CPEE</modeltype>
6
- <theme>default</theme>
7
- </attributes>
8
- <state>ready</state>
9
- <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
10
- <positions/>
11
- <dataelements/>
12
- <endpoints>
13
- <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
14
- </endpoints>
15
- <dsl/>
16
- <dslx>
17
- <description xmlns="http://cpee.org/ns/description/1.0"/>
18
- </dslx>
19
- <status>
20
- <id>0</id>
21
- <message>undefined</message>
22
- </status>
23
- <description>
24
- <description xmlns="http://cpee.org/ns/description/1.0"/>
25
- </description>
26
- <transformation>
27
- <description type="copy"/>
28
- <dataelements type="none"/>
29
- <endpoints type="none"/>
30
- </transformation>
31
- </properties>
data/server/instances/11/properties.xml DELETED
@@ -1,62 +0,0 @@
1
- <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
- <attributes>
3
- <uuid>0a8bd5ab-9ceb-4e8c-aae1-02dcefc6a2c3</uuid>
4
- <info>Lego Plate</info>
5
- <modeltype>CPEE</modeltype>
6
- </attributes>
7
- <state>stopped</state>
8
- <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
9
- <positions/>
10
- <dataelements>
11
- <i>0</i>
12
- </dataelements>
13
- <endpoints>
14
- <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
15
- <move>http://plate.wst.univie.ac.at:9200/go-next</move>
16
- </endpoints>
17
- <dsl>loop pre_test{i&lt;2} do
18
- call :a1, :move, parameters: { :label =&gt; "Move to next station", :method =&gt; :post, :arguments =&gt; nil }, finalize: &lt;&lt;-END
19
- data.i= data.i + 1
20
- END
21
- end
22
- </dsl>
23
- <dslx>
24
- <description xmlns="http://cpee.org/ns/description/1.0">
25
- <loop mode="pre_test" condition="i&lt;2">
26
- <call id="a1" endpoint="move">
27
- <parameters>
28
- <label>Move to next station</label>
29
- <method>:post</method>
30
- <arguments/>
31
- </parameters>
32
- <finalize output="result">data.i= data.i + 1</finalize>
33
- <update output="result"/>
34
- </call>
35
- </loop>
36
- </description>
37
- </dslx>
38
- <status>
39
- <id>0</id>
40
- <message>undefined</message>
41
- </status>
42
- <description>
43
- <description xmlns="http://cpee.org/ns/description/1.0">
44
- <loop mode="pre_test" condition="i&lt;2">
45
- <call id="a1" endpoint="move">
46
- <parameters>
47
- <label>Move to next station</label>
48
- <method>:post</method>
49
- <arguments/>
50
- </parameters>
51
- <finalize output="result">data.i= data.i + 1</finalize>
52
- <update output="result"/>
53
- </call>
54
- </loop>
55
- </description>
56
- </description>
57
- <transformation>
58
- <description type="copy"/>
59
- <dataelements type="none"/>
60
- <endpoints type="none"/>
61
- </transformation>
62
- </properties>