cpee 2.1.30 → 2.1.32

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e5b91153e5d1f79bffd42f93f011cce42a0595f5fe17cfd0b7f6dd5a39852518
4
- data.tar.gz: 8cfccd832f88ea23ed93d4d5bda91e2b5e9414ca195e797a665911b62b2373f5
3
+ metadata.gz: f1021b5fe513c40b5d489dc062285fe8295693da2f0e93cf7027b31b48b48bd6
4
+ data.tar.gz: f3c04a3878251f76ef08cfabc841e2612bb99c41074234807a15d8b1c483f9aa
5
5
  SHA512:
6
- metadata.gz: b1e149e8b4ae2b28df6a30d2757b29c54aab7d65ca4f51ee7d9c226b36bceb448064439ae6e93995ee0e32a0fba01b6841ab1fb8b88afbefd2483b38c426b798
7
- data.tar.gz: 75a3f332f847963e76c1c8557cf14af6f9f6f0b61d7722bdc09a9a864d86ae2593a2f4a695c23e1c30a12c1fa86aa0f2ef2858d8acfeeb6653eee14578d8f03a
6
+ metadata.gz: 3182222b1327b83a77c3c2936b1147d2bbf2ed1b442c5e6bbf25d79a0b430211cee29b375ce88a8852fbfd5b5e260862d3ccc53a63828c257ead2cb995382547
7
+ data.tar.gz: 8aaa771f5d6ace88b4704364d2dd657ce15478dae0201e0ef24f6287988166433e741bade35cf5994a1238e9430c34970c146ffe6243cfd2e6afcf27f8c98055
@@ -0,0 +1,297 @@
1
+ <?xml version="1.0"?>
2
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
3
+ <executionhandler>ruby</executionhandler>
4
+ <dataelements/>
5
+ <endpoints>
6
+ <timeout>https://cpee.org/services/timeout.php</timeout>
7
+ <subprocess>https://cpee.org/flow/start/url/</subprocess>
8
+ <frames_init>https-post://cpee.org/out/frames/simple/</frames_init>
9
+ <send>https-post://cpee.org/ing/correlators/message/send/</send>
10
+ <frames_display>https-put://cpee.org/out/frames/simple/</frames_display>
11
+ <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
12
+ <user>https-post://cpee.org/services/timeout-user.php</user>
13
+ <auto>https-post://cpee.org/services/timeout-auto.php</auto>
14
+ </endpoints>
15
+ <attributes>
16
+ <info>Frames</info>
17
+ <creator>Christine Ashcreek</creator>
18
+ <author>Christine Ashcreek</author>
19
+ <modeltype>CPEE</modeltype>
20
+ <guarded>none</guarded>
21
+ <guarded_id/>
22
+ <model_uuid>5ed82f61-a382-49b5-a420-c63e01d5a9f5</model_uuid>
23
+ <model_version/>
24
+ <theme>extended</theme>
25
+ <design_dir>Templates.dir</design_dir>
26
+ <design_stage>development</design_stage>
27
+ </attributes>
28
+ <description>
29
+ <description xmlns="http://cpee.org/ns/description/1.0">
30
+ <call id="a1" endpoint="frames_init">
31
+ <parameters>
32
+ <label>"Init Frame"</label>
33
+ <arguments>
34
+ <style_url>https://cpee.org/form/frames.css</style_url>
35
+ <document_url/>
36
+ <x_amount>5</x_amount>
37
+ <y_amount>8</y_amount>
38
+ <lang>de-at</lang>
39
+ <document_name>Show Info</document_name>
40
+ </arguments>
41
+ </parameters>
42
+ <annotations>
43
+ <_timing>
44
+ <_timing_weight/>
45
+ <_timing_avg/>
46
+ <_context_data_analysis>
47
+ <probes/>
48
+ <ips/>
49
+ </_context_data_analysis>
50
+ <report>
51
+ <url/>
52
+ </report>
53
+ <explanations/>
54
+ </_timing>
55
+ <_notes>
56
+ <_notes_general/>
57
+ </_notes>
58
+ </annotations>
59
+ <documentation>
60
+ <input/>
61
+ <output/>
62
+ <implementation>
63
+ <description/>
64
+ </implementation>
65
+ </documentation>
66
+ </call>
67
+ <call id="a3" endpoint="frames_display">
68
+ <parameters>
69
+ <label>Clear </label>
70
+ <arguments>
71
+ <type>set</type>
72
+ <lx>0</lx>
73
+ <ly>0</ly>
74
+ <x_amount>5</x_amount>
75
+ <y_amount>8</y_amount>
76
+ <button/>
77
+ <style/>
78
+ <urls/>
79
+ <default/>
80
+ </arguments>
81
+ </parameters>
82
+ <annotations>
83
+ <_timing>
84
+ <_timing_weight/>
85
+ <_timing_avg/>
86
+ <_context_data_analysis>
87
+ <probes/>
88
+ <ips/>
89
+ </_context_data_analysis>
90
+ <report>
91
+ <url/>
92
+ </report>
93
+ <explanations/>
94
+ </_timing>
95
+ <_notes>
96
+ <_notes_general/>
97
+ </_notes>
98
+ </annotations>
99
+ <documentation>
100
+ <input/>
101
+ <output/>
102
+ <implementation>
103
+ <description/>
104
+ </implementation>
105
+ </documentation>
106
+ </call>
107
+ <call id="a6" endpoint="frames_display">
108
+ <parameters>
109
+ <label>Show Header</label>
110
+ <arguments>
111
+ <type>set</type>
112
+ <lx>0</lx>
113
+ <ly>0</ly>
114
+ <x_amount>5</x_amount>
115
+ <y_amount>1</y_amount>
116
+ <button/>
117
+ <style/>
118
+ <urls>
119
+ <urls_item>
120
+ <lang>de-at</lang>
121
+ <url>https://cpee.org/form/tum-header.html</url>
122
+ </urls_item>
123
+ </urls>
124
+ <default/>
125
+ </arguments>
126
+ </parameters>
127
+ <annotations>
128
+ <_timing>
129
+ <_timing_weight/>
130
+ <_timing_avg/>
131
+ <_context_data_analysis>
132
+ <probes/>
133
+ <ips/>
134
+ </_context_data_analysis>
135
+ <report>
136
+ <url/>
137
+ </report>
138
+ <explanations/>
139
+ </_timing>
140
+ <_notes>
141
+ <_notes_general/>
142
+ </_notes>
143
+ </annotations>
144
+ <documentation>
145
+ <input/>
146
+ <output/>
147
+ <implementation>
148
+ <description/>
149
+ </implementation>
150
+ </documentation>
151
+ </call>
152
+ <call id="a5" endpoint="frames_display">
153
+ <parameters>
154
+ <label>Display Graph</label>
155
+ <arguments>
156
+ <type>set</type>
157
+ <lx>3</lx>
158
+ <ly>1</ly>
159
+ <x_amount>2</x_amount>
160
+ <y_amount>7</y_amount>
161
+ <button/>
162
+ <style/>
163
+ <urls>
164
+ <urls_item>
165
+ <lang>de-at</lang>
166
+ <url>!"https://cpee.org/flow/graph.html?monitor=" + cpee.instance_url</url>
167
+ </urls_item>
168
+ </urls>
169
+ <default/>
170
+ </arguments>
171
+ </parameters>
172
+ <annotations>
173
+ <_timing>
174
+ <_timing_weight/>
175
+ <_timing_avg/>
176
+ <_context_data_analysis>
177
+ <probes/>
178
+ <ips/>
179
+ </_context_data_analysis>
180
+ <report>
181
+ <url/>
182
+ </report>
183
+ <explanations/>
184
+ </_timing>
185
+ <_notes>
186
+ <_notes_general/>
187
+ </_notes>
188
+ </annotations>
189
+ <documentation>
190
+ <input/>
191
+ <output/>
192
+ <implementation>
193
+ <description/>
194
+ </implementation>
195
+ </documentation>
196
+ </call>
197
+ <loop mode="post_test" condition="true">
198
+ <_probability>
199
+ <_probability_min/>
200
+ <_probability_max/>
201
+ <_probability_avg/>
202
+ </_probability>
203
+ <call id="a2" endpoint="frames_display">
204
+ <parameters>
205
+ <label>Show Button</label>
206
+ <arguments>
207
+ <type>wait</type>
208
+ <lx>0</lx>
209
+ <ly>1</ly>
210
+ <x_amount>1</x_amount>
211
+ <y_amount>1</y_amount>
212
+ <button/>
213
+ <style/>
214
+ <urls>
215
+ <urls_item>
216
+ <lang>de-at</lang>
217
+ <url>https://cpee.org/form/button.html</url>
218
+ </urls_item>
219
+ </urls>
220
+ <default/>
221
+ </arguments>
222
+ </parameters>
223
+ <annotations>
224
+ <_timing>
225
+ <_timing_weight/>
226
+ <_timing_avg/>
227
+ <_context_data_analysis>
228
+ <probes/>
229
+ <ips/>
230
+ </_context_data_analysis>
231
+ <report>
232
+ <url/>
233
+ </report>
234
+ <explanations/>
235
+ </_timing>
236
+ <_notes>
237
+ <_notes_general/>
238
+ </_notes>
239
+ </annotations>
240
+ <documentation>
241
+ <input/>
242
+ <output/>
243
+ <implementation>
244
+ <description/>
245
+ </implementation>
246
+ </documentation>
247
+ </call>
248
+ <call id="a7" endpoint="frames_display">
249
+ <parameters>
250
+ <label>Clear Button</label>
251
+ <arguments>
252
+ <type>set</type>
253
+ <lx>0</lx>
254
+ <ly>1</ly>
255
+ <x_amount>1</x_amount>
256
+ <y_amount>1</y_amount>
257
+ <button/>
258
+ <style/>
259
+ <urls/>
260
+ <default/>
261
+ </arguments>
262
+ </parameters>
263
+ <annotations>
264
+ <_timing>
265
+ <_timing_weight/>
266
+ <_timing_avg/>
267
+ <_context_data_analysis>
268
+ <probes/>
269
+ <ips/>
270
+ </_context_data_analysis>
271
+ <report>
272
+ <url/>
273
+ </report>
274
+ <explanations/>
275
+ </_timing>
276
+ <_notes>
277
+ <_notes_general/>
278
+ </_notes>
279
+ </annotations>
280
+ <documentation>
281
+ <input/>
282
+ <output/>
283
+ <implementation>
284
+ <description/>
285
+ </implementation>
286
+ </documentation>
287
+ </call>
288
+ <stop id="a4"/>
289
+ </loop>
290
+ </description>
291
+ </description>
292
+ <transformation>
293
+ <description type="copy"/>
294
+ <dataelements type="none"/>
295
+ <endpoints type="none"/>
296
+ </transformation>
297
+ </testset>
@@ -1,12 +1,15 @@
1
1
  <?xml version="1.0"?>
2
2
  <testset xmlns="http://cpee.org/ns/properties/2.0">
3
3
  <executionhandler>ruby</executionhandler>
4
- <dataelements>
5
- <bla/>
6
- </dataelements>
4
+ <dataelements/>
7
5
  <endpoints>
8
6
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
9
- <worklist>http://cpee.org:9398</worklist>
7
+ <subprocess>https-post://cpee.org/flow/start/url/</subprocess>
8
+ <worklist>https-post://cpee.org/worklist/server/</worklist>
9
+ <send>https-post://cpee.org/ing/correlators/message/send/</send>
10
+ <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
11
+ <user>https-post://cpee.org/services/timeout-user.php</user>
12
+ <auto>https-post://cpee.org/services/timeout-auto.php</auto>
10
13
  </endpoints>
11
14
  <attributes>
12
15
  <info>Worklist</info>
@@ -23,14 +26,15 @@
23
26
  <call id="a1" endpoint="worklist">
24
27
  <parameters>
25
28
  <label>OK OR NOT OK</label>
26
- <method>:post</method>
27
29
  <arguments>
28
- <orgmodel>organisation1</orgmodel>
30
+ <orgmodel>https://cpee.org/~demo/orgviz/organisation_informatik.xml</orgmodel>
29
31
  <domain>VirtualBusiness1</domain>
30
32
  <form>https://cpee.org/~demo/form/form-f.html</form>
31
33
  <role>Assistant</role>
32
- <schaden>55546</schaden>
33
- <text>fetzen hin</text>
34
+ <data>
35
+ <schaden>10000</schaden>
36
+ <text>destroyed</text>
37
+ </data>
34
38
  </arguments>
35
39
  </parameters>
36
40
  <code>
@@ -67,7 +71,6 @@
67
71
  </code>
68
72
  </documentation>
69
73
  </call>
70
- <stop id="a2"/>
71
74
  </description>
72
75
  </description>
73
76
  <transformation>
data/cpee.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "2.1.30"
3
+ s.version = "2.1.32"
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.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -227,7 +227,7 @@ module CPEE
227
227
  end #}}}
228
228
  class PutState < Riddl::Implementation #{{{
229
229
  def self::set(id,opts,state)
230
- CPEE::Persistence::set_item(id,opts,'state',:state => state, :timestamp => Time.now.xmlschema(3))
230
+ CPEE::Persistence::set_item(id,opts,'state',:state => state, :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h)
231
231
  end
232
232
 
233
233
  def self::run(id,opts,state)
@@ -77,7 +77,15 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
77
77
  end #}}}
78
78
 
79
79
  def additional #{{{
80
- { :attributes => @controller.attributes }
80
+ {
81
+ :attributes => @controller.attributes,
82
+ :cpee => {
83
+ 'base' => @controller.base_url,
84
+ 'instance' => @controller.instance_id,
85
+ 'instance_url' => @controller.instance_url,
86
+ 'instance_uuid' => @controller.uuid
87
+ }
88
+ }
81
89
  end #}}}
82
90
 
83
91
  def proto_curl(parameters) #{{{
@@ -53,9 +53,9 @@ class Controller
53
53
  @loop_guard = {}
54
54
 
55
55
  @callback_keys = {}
56
- @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
57
56
 
58
- Thread.new do
57
+ @subs = Thread.new do
58
+ @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
59
59
  @psredis.psubscribe('callback-response:*','callback-end:*') do |on|
60
60
  on.pmessage do |pat, what, message|
61
61
  if pat == 'callback-response:*' && @callback_keys.has_key?(what[18..-1])
@@ -78,6 +78,10 @@ class Controller
78
78
  end
79
79
  end
80
80
  end
81
+ @psredis.close
82
+ rescue => e
83
+ sleep 1
84
+ retry
81
85
  end
82
86
  end
83
87
 
@@ -137,7 +141,6 @@ class Controller
137
141
  CPEE::Message::send(:'vote-response',key,base,@id,uuid,info,true,@redis)
138
142
  end
139
143
  end
140
- @thread.join if !@thread.nil? && @thread.alive?
141
144
  end
142
145
 
143
146
  def info
@@ -749,9 +749,9 @@
749
749
  <xsl:otherwise>
750
750
  <xsl:choose>
751
751
  <xsl:when test="substring(.,1,1) = '!'">
752
- <xsl:text>#{</xsl:text>
753
- <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
754
- <xsl:text>.to_json}</xsl:text>
752
+ <xsl:text>#{(</xsl:text>
753
+ <xsl:value-of select="substring(.,2)"/>
754
+ <xsl:text>).to_json}</xsl:text>
755
755
  </xsl:when>
756
756
  <xsl:otherwise>
757
757
  <xsl:text>\"</xsl:text>
@@ -1 +1 @@
1
- 1772897
1
+ 2206017
@@ -1 +1 @@
1
- 1772901
1
+ 2206021
@@ -1 +1 @@
1
- 1772905
1
+ 2206025
@@ -1 +1 @@
1
- 1772911
1
+ 2206029
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: 2.1.30
4
+ version: 2.1.32
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: tools
12
12
  cert_chain: []
13
- date: 2022-01-12 00:00:00.000000000 Z
13
+ date: 2022-02-03 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: riddl
@@ -221,6 +221,7 @@ files:
221
221
  - cockpit/templates.legacy/testsets.xml
222
222
  - cockpit/templates.legacy/transformations.xml
223
223
  - cockpit/templates/Coopis 2010.xml
224
+ - cockpit/templates/Frames.xml
224
225
  - cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml
225
226
  - cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml
226
227
  - cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml