cpee 1.3.142 → 1.3.143

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f729bc55e4293f383cc4b93627e0cfd32ce32659
4
- data.tar.gz: 299679f674e22fd2957f4f4490a1365c6f709638
3
+ metadata.gz: 0ae3f4d7b61ed1029ceb890670cb439298b59f7a
4
+ data.tar.gz: a6faf202b077864bcce52c315f39ca49b83cf004
5
5
  SHA512:
6
- metadata.gz: 21dc89b170d17f11cfd38ff838965416589970780949a67e465a37c2e59cd7d6e97930fb65f391d542b100e439f5eeb293b825a5725a5d744a71ee5a73c9e7bc
7
- data.tar.gz: b2caf50ad1372911e2da106ca3c0719d22b2230ff96c9e4238cc70e02dd5bfc12a5c9da65aeb77d0e0910bcf9310ef7982042b979a94fec7b9ee1d231231ef7f
6
+ metadata.gz: 3595bc2ca17c98e78353f924dfc7a445ed1e7e37c6c8484abf90e139e8160b7e7d2214b4688fef11be9faa49f5f17d5351eac05146710d71ba536a961ad8894b
7
+ data.tar.gz: 804d4f1019aa248a441ad25e565a160dc733c7271e6e7b302ecbfe5dc7a0d6d33709668c2ccfd5ce51d7673140b8151a535ab5b0010ee74905ebc27c12ce7326
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.142"
3
+ s.version = "1.3.143"
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"
@@ -439,7 +439,7 @@ module CPEE
439
439
  Thread.new(ke,ur) do |key,url|
440
440
  ev = build_notification(key,what,content,'event')
441
441
  if url.class == String
442
- client = Riddl::Client.new(url,nil,:xmpp => @opts[:xmpp])
442
+ client = Riddl::Client.new(url,'http://riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml',:xmpp => @opts[:xmpp])
443
443
  client.post ev.map{|k,v|Riddl::Parameter::Simple.new(k,v)} rescue nil
444
444
  elsif url.class == Riddl::Utils::Notifications::Producer::WS
445
445
  e = XML::Smart::string("<event/>")
@@ -475,7 +475,7 @@ module CPEE
475
475
  c['callback'] = callback
476
476
  notf = build_notification(k,what,c,'vote',callback)
477
477
  if u.class == String
478
- client = Riddl::Client.new(u)
478
+ client = Riddl::Client.new(u,'http://riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml',:xmpp => @opts[:xmpp])
479
479
  params = notf.map{|ke,va|Riddl::Parameter::Simple.new(ke,va)}
480
480
  @mutex.synchronize do
481
481
  status, result, headers = client.post params
@@ -0,0 +1 @@
1
+ d206763d6042af84dad267ae316c2a00
@@ -0,0 +1 @@
1
+ 63f8cb395dd00d19bf520b0ffa283007
@@ -0,0 +1,27 @@
1
+ <subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
2
+ <topic id="running">
3
+ <event>activity_calling</event>
4
+ <event>activity_manipulating</event>
5
+ <event>activity_failed</event>
6
+ <event>activity_done</event>
7
+ </topic>
8
+ <topic id="properties/position">
9
+ <event>change</event>
10
+ </topic>
11
+ <topic id="properties/description">
12
+ <event>change</event>
13
+ <event>error</event>
14
+ </topic>
15
+ <topic id="properties/state">
16
+ <event>change</event>
17
+ </topic>
18
+ <topic id="properties/dataelements">
19
+ <event>change</event>
20
+ </topic>
21
+ <topic id="properties/endpoints">
22
+ <event>change</event>
23
+ </topic>
24
+ <topic id="properties/handlers">
25
+ <event>change</event>
26
+ </topic>
27
+ </subscription>
@@ -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>