cpee 1.3.167 → 1.3.169

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 (34) hide show
  1. checksums.yaml +4 -4
  2. data/cpee.gemspec +1 -1
  3. data/server/handlerwrappers/default.rb +3 -1
  4. data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/consumer-secret +1 -0
  5. data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/producer-secret +1 -0
  6. data/server/instances/{16/notifications/d412275a0c76f202ecb65bfff859cf32 → 1/notifications/d12eff1ac812661c05d7090ce7394cf9}/subscription.xml +0 -3
  7. data/server/instances/1/properties.xml +69 -101
  8. data/server/instances/10/properties.xml +106 -70
  9. data/server/instances/11/notifications/e0910b6b5536976209bca471780066f1/consumer-secret +1 -0
  10. data/server/instances/11/notifications/e0910b6b5536976209bca471780066f1/producer-secret +1 -0
  11. data/server/instances/{13/notifications/4ff0cde5161c44dae49b263cbc12eaf8 → 11/notifications/e0910b6b5536976209bca471780066f1}/subscription.xml +11 -7
  12. data/server/instances/11/properties.xml +133 -73
  13. data/server/instances/2/properties.xml +191 -44
  14. data/server/instances/3/properties.xml +70 -44
  15. data/server/instances/4/properties.xml +28 -68
  16. data/server/instances/5/properties.xml +10 -70
  17. data/server/instances/6/properties.xml +175 -55
  18. data/server/instances/7/properties.xml +118 -52
  19. data/server/instances/8/properties.xml +112 -50
  20. data/server/instances/9/properties.xml +115 -47
  21. metadata +108 -117
  22. data/server/instances/12/notifications/8d7f2ae546a742fce3a0a488266ea51d/consumer-secret +0 -1
  23. data/server/instances/12/notifications/8d7f2ae546a742fce3a0a488266ea51d/producer-secret +0 -1
  24. data/server/instances/12/notifications/8d7f2ae546a742fce3a0a488266ea51d/subscription.xml +0 -6
  25. data/server/instances/12/properties.xml +0 -43
  26. data/server/instances/13/notifications/4ff0cde5161c44dae49b263cbc12eaf8/consumer-secret +0 -1
  27. data/server/instances/13/notifications/4ff0cde5161c44dae49b263cbc12eaf8/producer-secret +0 -1
  28. data/server/instances/13/properties.xml +0 -146
  29. data/server/instances/14/properties.xml +0 -332
  30. data/server/instances/15/properties.xml +0 -330
  31. data/server/instances/16/notifications/d412275a0c76f202ecb65bfff859cf32/consumer-secret +0 -1
  32. data/server/instances/16/notifications/d412275a0c76f202ecb65bfff859cf32/producer-secret +0 -1
  33. data/server/instances/16/properties.xml +0 -265
  34. data/server/server.pid +0 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 02e61062d563c87e26436f94789bf2afa142ec64
4
- data.tar.gz: d184fba43665672dd02b1c3538e85fcc04b693b5
3
+ metadata.gz: 8d20a645cd5602319c252baed2c151cd1a6ea266
4
+ data.tar.gz: a089ecaf444932dcfdb1b6b192dbcb7563233e88
5
5
  SHA512:
6
- metadata.gz: 3cd3c1d205e31818b4762a241e804c9009a715bf0d957766270587a498401a2e5106bf574b3f1dc187e73ed6754bc247b100cd0109a02cb0abf2bac3ab58cd7c
7
- data.tar.gz: 36b3658d3581d5ee4283525e388fa915704cbb800145337835c8e6fb84a0ef7c30e1e75090eb6fdc4ca5a2cdd9045496eca33baeefc62f8fc6a390f01914a958
6
+ metadata.gz: 57bcce0f278869e45f44966bb9a3f5318621791a86b32d91cfa04c82d2007e056aefe2a3e6b5f34322161b206416de7302618eca7ef78e04436c1c4aa71201d9
7
+ data.tar.gz: 8cdc6249a12fadc991ae264efcd16e28e25462048218f12e790533ad336df23f0be0949d38d28788eafb0a0db97e09cd12be3deaaf4da5a0505fb64d669c580c
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.167"
3
+ s.version = "1.3.169"
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"
@@ -41,7 +41,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
41
41
  end
42
42
  params << Riddl::Header.new("CPEE_BASE",@controller.base_url)
43
43
  params << Riddl::Header.new("CPEE_INSTANCE",@controller.instance_url)
44
- params << Riddl::Header.new("CPEE_CALLBACK",callback)
44
+ params << Riddl::Header.new("CPEE_CALLBACK",@controller.instance_url + '/callbacks/' + callback)
45
45
 
46
46
  type = parameters[:method] || 'post'
47
47
  client = Riddl::Client.new(@handler_endpoint)
@@ -155,6 +155,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
155
155
  result = JSON::parse(result[0].value.read)
156
156
  elsif result[0].mimetype == 'application/xml' || result[0].mimetype == 'text/xml'
157
157
  result = XML::Smart::string(result[0].value.read)
158
+ elsif result[0].mimetype == 'text/plain'
159
+ result = result[0].value.read
158
160
  else
159
161
  result = result[0]
160
162
  end
@@ -0,0 +1 @@
1
+ d206763d6042af84dad267ae316c2a00
@@ -0,0 +1 @@
1
+ 63f8cb395dd00d19bf520b0ffa283007
@@ -21,9 +21,6 @@
21
21
  <topic id="properties/endpoints">
22
22
  <event>change</event>
23
23
  </topic>
24
- <topic id="properties/handlerwrapper">
25
- <event>result</event>
26
- </topic>
27
24
  <topic id="properties/handlers">
28
25
  <event>change</event>
29
26
  </topic>
@@ -1,90 +1,65 @@
1
1
  <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
- <info>Enter info here</info>
3
- <state>ready</state>
2
+ <info>asd</info>
3
+ <state>stopped</state>
4
4
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
- <positions/>
5
+ <positions>
6
+ <a1>after</a1>
7
+ </positions>
6
8
  <dataelements>
7
- <persons>3</persons>
8
- <card>Visa_12345</card>
9
- <airline>null</airline>
10
- <hotels>[]</hotels>
11
- <from>Vienna</from>
12
- <to>Prague</to>
13
- <costs>0</costs>
9
+ <x/>
14
10
  </dataelements>
15
11
  <endpoints>
16
- <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
17
- <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
18
- <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
12
+ <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
19
13
  </endpoints>
20
- <dsl>call :a1, :bookAir, { :method =&gt; "post", :parameters =&gt; { :from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons } }, &lt;&lt;-end
21
- data.airline = result.value('id')
22
- data.costs += result.value('costs').to_f
23
- status.update 1, 'Hotel'
24
- end
25
- parallel do
26
- loop pre_test{data.persons &gt; 0} do
27
- parallel_branch data.persons do |p|
28
- call :a2, :bookHotel, { :method =&gt; "post", :parameters =&gt; { :to =&gt; data.to } }, &lt;&lt;-end
29
- data.hotels &lt;&lt; result.value('id')
30
- data.costs += result.value('costs').to_f
31
- end
32
- end
33
- manipulate :a3, &lt;&lt;-end
34
- data.persons -= 1
35
- end
14
+ <dsl>parallel do
15
+ parallel_branch do
16
+ call :a4, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
36
17
  end
37
- end
38
- choose do
39
- alternative data.costs &gt; 700 do
40
- call :a4, :approve, { :method =&gt; "post", :parameters =&gt; { :costs =&gt; data.costs } }
18
+ parallel_branch do
19
+ call :a5, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; a } }
41
20
  end
42
21
  end
22
+ call :a2, :timeout, { :label =&gt; nil, :method =&gt; "post", :parameters =&gt; { :timeout =&gt; b } }, &lt;&lt;-end
23
+ data.x += "a2,"
24
+ end
43
25
  </dsl>
44
26
  <dslx>
45
27
  <description xmlns="http://cpee.org/ns/description/1.0">
46
- <call id="a1" endpoint="bookAir">
47
- <parameters>
48
- <method>post</method>
49
- <parameters>
50
- <from>data.from</from>
51
- <to>data.to</to>
52
- <persons>data.persons</persons>
53
- </parameters>
54
- </parameters>
55
- <manipulate output="result"> data.airline = result.value('id')
56
- data.costs += result.value('costs').to_f
57
- status.update 1, 'Hotel'</manipulate>
58
- </call>
59
- <parallel>
60
- <loop pre_test="data.persons &gt; 0">
61
- <parallel_branch pass="data.persons" local="p">
62
- <call id="a2" endpoint="bookHotel">
28
+ <!--{{{-->
29
+ <parallel svg-label="">
30
+ <parallel_branch svg-label="">
31
+ <call id="a4" endpoint="timeout" svg-label="">
32
+ <parameters>
33
+ <label/>
34
+ <method>post</method>
63
35
  <parameters>
64
- <method>post</method>
65
- <parameters>
66
- <to>data.to</to>
67
- </parameters>
36
+ <timeout>a</timeout>
68
37
  </parameters>
69
- <manipulate output="result"> data.hotels &lt;&lt; result.value('id')
70
- data.costs += result.value('costs').to_f</manipulate>
71
- </call>
72
- </parallel_branch>
73
- <manipulate id="a3"> data.persons -= 1</manipulate>
74
- </loop>
75
- </parallel>
76
- <choose>
77
- <alternative condition="data.costs &gt; 700">
78
- <call id="a4" endpoint="approve">
38
+ </parameters>
39
+ </call>
40
+ </parallel_branch>
41
+ <parallel_branch svg-label="">
42
+ <call id="a5" endpoint="timeout" svg-label="">
79
43
  <parameters>
44
+ <label/>
80
45
  <method>post</method>
81
46
  <parameters>
82
- <costs>data.costs</costs>
47
+ <timeout>a</timeout>
83
48
  </parameters>
84
49
  </parameters>
85
50
  </call>
86
- </alternative>
87
- </choose>
51
+ </parallel_branch>
52
+ </parallel>
53
+ <call id="a2" endpoint="timeout">
54
+ <parameters>
55
+ <label/>
56
+ <method>post</method>
57
+ <parameters>
58
+ <timeout>b</timeout>
59
+ </parameters>
60
+ </parameters>
61
+ <manipulate>data.x += "a2,"</manipulate>
62
+ </call>
88
63
  </description>
89
64
  </dslx>
90
65
  <status>
@@ -93,48 +68,41 @@ end
93
68
  </status>
94
69
  <description>
95
70
  <description xmlns="http://cpee.org/ns/description/1.0">
96
- <call id="a1" endpoint="bookAir">
97
- <parameters>
98
- <method>post</method>
99
- <parameters>
100
- <from>data.from</from>
101
- <to>data.to</to>
102
- <persons>data.persons</persons>
103
- </parameters>
104
- </parameters>
105
- <manipulate output="result"> data.airline = result.value('id')
106
- data.costs += result.value('costs').to_f
107
- status.update 1, 'Hotel'</manipulate>
108
- </call>
109
- <parallel>
110
- <loop pre_test="data.persons &gt; 0">
111
- <parallel_branch pass="data.persons" local="p">
112
- <call id="a2" endpoint="bookHotel">
71
+ <!--{{{-->
72
+ <parallel svg-label="">
73
+ <parallel_branch svg-label="">
74
+ <call id="a4" endpoint="timeout" svg-label="">
75
+ <parameters>
76
+ <label/>
77
+ <method>post</method>
113
78
  <parameters>
114
- <method>post</method>
115
- <parameters>
116
- <to>data.to</to>
117
- </parameters>
79
+ <timeout>a</timeout>
118
80
  </parameters>
119
- <manipulate output="result"> data.hotels &lt;&lt; result.value('id')
120
- data.costs += result.value('costs').to_f</manipulate>
121
- </call>
122
- </parallel_branch>
123
- <manipulate id="a3"> data.persons -= 1</manipulate>
124
- </loop>
125
- </parallel>
126
- <choose>
127
- <alternative condition="data.costs &gt; 700">
128
- <call id="a4" endpoint="approve">
81
+ </parameters>
82
+ </call>
83
+ </parallel_branch>
84
+ <parallel_branch svg-label="">
85
+ <call id="a5" endpoint="timeout" svg-label="">
129
86
  <parameters>
87
+ <label/>
130
88
  <method>post</method>
131
89
  <parameters>
132
- <costs>data.costs</costs>
90
+ <timeout>a</timeout>
133
91
  </parameters>
134
92
  </parameters>
135
93
  </call>
136
- </alternative>
137
- </choose>
94
+ </parallel_branch>
95
+ </parallel>
96
+ <call id="a2" endpoint="timeout">
97
+ <parameters>
98
+ <label/>
99
+ <method>post</method>
100
+ <parameters>
101
+ <timeout>b</timeout>
102
+ </parameters>
103
+ </parameters>
104
+ <manipulate>data.x += "a2,"</manipulate>
105
+ </call>
138
106
  </description>
139
107
  </description>
140
108
  <transformation>
@@ -1,62 +1,90 @@
1
1
  <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
2
  <info>Enter info here</info>
3
- <state>ready</state>
3
+ <state>finished</state>
4
4
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
- <positions>
6
- <a1>after</a1>
7
- </positions>
5
+ <positions/>
8
6
  <dataelements>
9
- <x/>
7
+ <persons>0</persons>
8
+ <card>Visa_12345</card>
9
+ <airline>Lufthansa</airline>
10
+ <hotels>["Rathaus","Rathaus","Ibis"]</hotels>
11
+ <from>Vienna</from>
12
+ <to>Prague</to>
13
+ <costs>940.0</costs>
10
14
  </dataelements>
11
15
  <endpoints>
12
- <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
16
+ <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
17
+ <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
18
+ <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
13
19
  </endpoints>
14
- <dsl>call :a1, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 2 } }, &lt;&lt;-end
15
- data.x += "a1,"
20
+ <dsl>call :a1, :bookAir, { :method =&gt; :post, :parameters =&gt; {:from =&gt; data.from, :to =&gt; data.to, :persons =&gt; data.persons} }, &lt;&lt;-end
21
+ data.airline = result.value('id')
22
+ data.costs += result.value('costs').to_f
23
+ status.update 1, 'Hotel'
16
24
  end
17
- call :a2, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end
18
- data.x += "a2,"
25
+ parallel do
26
+ loop pre_test{data.persons &gt; 0} do
27
+ parallel_branch data.persons do |p|
28
+ call :a2, :bookHotel, { :method =&gt; :post, :parameters =&gt; {:to =&gt; data.to} }, &lt;&lt;-end
29
+ data.hotels &lt;&lt; result.value('id')
30
+ data.costs += result.value('costs').to_f
31
+ end
32
+ end
33
+ manipulate :a3, &lt;&lt;-end
34
+ data.persons -= 1
35
+ end
36
+ end
19
37
  end
20
- call :a3, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end
21
- data.x += "a3,"
38
+ choose :inclusive do
39
+ alternative "data.costs &gt; 700" do
40
+ call :a4, :approve, { :method =&gt; :post, :parameters =&gt; {:costs =&gt; data.costs} }
41
+ end
22
42
  end
23
43
  </dsl>
24
44
  <dslx>
25
45
  <description xmlns="http://cpee.org/ns/description/1.0">
26
- <!--{{{-->
27
- <call id="a1" endpoint="timeout">
46
+ <call id="a1" endpoint="bookAir">
28
47
  <parameters>
29
- <!--{{{-->
30
- <method>post</method>
48
+ <method>:post</method>
31
49
  <parameters>
32
- <timeout>2</timeout>
50
+ <from>data.from</from>
51
+ <to>data.to</to>
52
+ <persons>data.persons</persons>
33
53
  </parameters>
34
54
  </parameters>
35
- <!--}}}-->
36
- <manipulate output="result"> data.x += "a1,"</manipulate>
37
- </call>
38
- <call id="a2" endpoint="timeout">
39
- <parameters>
40
- <!--{{{-->
41
- <method>post</method>
42
- <parameters>
43
- <timeout>4</timeout>
44
- </parameters>
45
- </parameters>
46
- <!--}}}-->
47
- <manipulate output="result"> data.x += "a2,"</manipulate>
48
- </call>
49
- <call id="a3" endpoint="timeout">
50
- <parameters>
51
- <!--{{{-->
52
- <method>post</method>
53
- <parameters>
54
- <timeout>4</timeout>
55
- </parameters>
56
- </parameters>
57
- <!--}}}-->
58
- <manipulate output="result"> data.x += "a3,"</manipulate>
55
+ <manipulate output="result"> data.airline = result.value('id')
56
+ data.costs += result.value('costs').to_f
57
+ status.update 1, 'Hotel'</manipulate>
59
58
  </call>
59
+ <parallel>
60
+ <loop pre_test="data.persons &gt; 0">
61
+ <parallel_branch pass="data.persons" local="p">
62
+ <call id="a2" endpoint="bookHotel">
63
+ <parameters>
64
+ <method>:post</method>
65
+ <parameters>
66
+ <to>data.to</to>
67
+ </parameters>
68
+ </parameters>
69
+ <manipulate output="result"> data.hotels &lt;&lt; result.value('id')
70
+ data.costs += result.value('costs').to_f</manipulate>
71
+ </call>
72
+ </parallel_branch>
73
+ <manipulate id="a3"> data.persons -= 1</manipulate>
74
+ </loop>
75
+ </parallel>
76
+ <choose>
77
+ <alternative condition="data.costs &gt; 700">
78
+ <call id="a4" endpoint="approve">
79
+ <parameters>
80
+ <method>:post</method>
81
+ <parameters>
82
+ <costs>data.costs</costs>
83
+ </parameters>
84
+ </parameters>
85
+ </call>
86
+ </alternative>
87
+ </choose>
60
88
  </description>
61
89
  </dslx>
62
90
  <status>
@@ -65,40 +93,48 @@ end
65
93
  </status>
66
94
  <description>
67
95
  <description xmlns="http://cpee.org/ns/description/1.0">
68
- <!--{{{-->
69
- <call id="a1" endpoint="timeout">
70
- <parameters>
71
- <!--{{{-->
72
- <method>post</method>
73
- <parameters>
74
- <timeout>2</timeout>
75
- </parameters>
76
- </parameters>
77
- <!--}}}-->
78
- <manipulate output="result"> data.x += "a1,"</manipulate>
79
- </call>
80
- <call id="a2" endpoint="timeout">
81
- <parameters>
82
- <!--{{{-->
83
- <method>post</method>
84
- <parameters>
85
- <timeout>4</timeout>
86
- </parameters>
87
- </parameters>
88
- <!--}}}-->
89
- <manipulate output="result"> data.x += "a2,"</manipulate>
90
- </call>
91
- <call id="a3" endpoint="timeout">
96
+ <call id="a1" endpoint="bookAir">
92
97
  <parameters>
93
- <!--{{{-->
94
- <method>post</method>
98
+ <method>:post</method>
95
99
  <parameters>
96
- <timeout>4</timeout>
100
+ <from>data.from</from>
101
+ <to>data.to</to>
102
+ <persons>data.persons</persons>
97
103
  </parameters>
98
104
  </parameters>
99
- <!--}}}-->
100
- <manipulate output="result"> data.x += "a3,"</manipulate>
105
+ <manipulate output="result"> data.airline = result.value('id')
106
+ data.costs += result.value('costs').to_f
107
+ status.update 1, 'Hotel'</manipulate>
101
108
  </call>
109
+ <parallel>
110
+ <loop pre_test="data.persons &gt; 0">
111
+ <parallel_branch pass="data.persons" local="p">
112
+ <call id="a2" endpoint="bookHotel">
113
+ <parameters>
114
+ <method>:post</method>
115
+ <parameters>
116
+ <to>data.to</to>
117
+ </parameters>
118
+ </parameters>
119
+ <manipulate output="result"> data.hotels &lt;&lt; result.value('id')
120
+ data.costs += result.value('costs').to_f</manipulate>
121
+ </call>
122
+ </parallel_branch>
123
+ <manipulate id="a3"> data.persons -= 1</manipulate>
124
+ </loop>
125
+ </parallel>
126
+ <choose>
127
+ <alternative condition="data.costs &gt; 700">
128
+ <call id="a4" endpoint="approve">
129
+ <parameters>
130
+ <method>:post</method>
131
+ <parameters>
132
+ <costs>data.costs</costs>
133
+ </parameters>
134
+ </parameters>
135
+ </call>
136
+ </alternative>
137
+ </choose>
102
138
  </description>
103
139
  </description>
104
140
  <transformation>