cpee 1.3.170 → 1.3.171

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/css/ui.css +4 -5
  3. data/cockpit/index.html +4 -2
  4. data/cockpit/js/details.js +4 -4
  5. data/cockpit/js/instance.js +13 -20
  6. data/cockpit/js/parameters.js +3 -3
  7. data/cockpit/js/ui.js +2 -3
  8. data/cockpit/lib/jquery-ui.custom.min.js +8 -259
  9. data/cockpit/lib/jquery.browser.js +40 -0
  10. data/cockpit/lib/jquery.min.js +4 -4
  11. data/cockpit/lib/jquery.svg.min.js +6 -0
  12. data/cockpit/lib/jquery.svgdom.min.js +6 -0
  13. data/cockpit/lib/util.js +16 -11
  14. data/cpee.gemspec +1 -1
  15. data/lib/cpee/processtransformation/cpee.rb +6 -14
  16. data/lib/cpee/processtransformation/target.rb +5 -3
  17. data/server/handlerwrappers/default.rb +7 -16
  18. data/server/instances/1/properties.xml +101 -69
  19. data/server/instances/10/properties.xml +70 -106
  20. data/server/instances/11/properties.xml +73 -133
  21. data/server/instances/12/notifications/8d7f2ae546a742fce3a0a488266ea51d/consumer-secret +1 -0
  22. data/server/instances/12/notifications/8d7f2ae546a742fce3a0a488266ea51d/producer-secret +1 -0
  23. data/server/instances/12/notifications/8d7f2ae546a742fce3a0a488266ea51d/subscription.xml +6 -0
  24. data/server/instances/12/properties.xml +43 -0
  25. data/server/instances/13/notifications/4ff0cde5161c44dae49b263cbc12eaf8/consumer-secret +1 -0
  26. data/server/instances/13/notifications/4ff0cde5161c44dae49b263cbc12eaf8/producer-secret +1 -0
  27. data/server/instances/{11/notifications/e0910b6b5536976209bca471780066f1 → 13/notifications/4ff0cde5161c44dae49b263cbc12eaf8}/subscription.xml +7 -11
  28. data/server/instances/13/properties.xml +146 -0
  29. data/server/instances/14/properties.xml +332 -0
  30. data/server/instances/15/properties.xml +330 -0
  31. data/server/instances/16/properties.xml +265 -0
  32. data/server/instances/17/properties.xml +146 -0
  33. data/server/instances/2/properties.xml +44 -191
  34. data/server/instances/3/properties.xml +44 -70
  35. data/server/instances/4/properties.xml +68 -28
  36. data/server/instances/5/properties.xml +70 -10
  37. data/server/instances/6/properties.xml +55 -175
  38. data/server/instances/7/properties.xml +52 -118
  39. data/server/instances/8/properties.xml +50 -112
  40. data/server/instances/9/properties.xml +47 -115
  41. data/server/resources/properties.init +2 -2
  42. data/server/server.pid +1 -0
  43. metadata +117 -108
  44. data/cockpit/lib/jquery.svgdom.js +0 -281
  45. data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/consumer-secret +0 -1
  46. data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/producer-secret +0 -1
  47. data/server/instances/1/notifications/d12eff1ac812661c05d7090ce7394cf9/subscription.xml +0 -27
  48. data/server/instances/11/notifications/e0910b6b5536976209bca471780066f1/consumer-secret +0 -1
  49. data/server/instances/11/notifications/e0910b6b5536976209bca471780066f1/producer-secret +0 -1
@@ -1,90 +1,62 @@
1
1
  <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
2
  <info>Enter info here</info>
3
- <state>finished</state>
3
+ <state>ready</state>
4
4
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
- <positions/>
5
+ <positions>
6
+ <a1>after</a1>
7
+ </positions>
6
8
  <dataelements>
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>
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'
14
+ <dsl>call :a1, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 2 } }, &lt;&lt;-end
15
+ data.x += "a1,"
24
16
  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
36
- end
17
+ call :a2, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end
18
+ data.x += "a2,"
37
19
  end
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
20
+ call :a3, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end
21
+ data.x += "a3,"
42
22
  end
43
23
  </dsl>
44
24
  <dslx>
45
25
  <description xmlns="http://cpee.org/ns/description/1.0">
46
- <call id="a1" endpoint="bookAir">
26
+ <!--{{{-->
27
+ <call id="a1" endpoint="timeout">
47
28
  <parameters>
48
- <method>:post</method>
29
+ <!--{{{-->
30
+ <method>post</method>
49
31
  <parameters>
50
- <from>data.from</from>
51
- <to>data.to</to>
52
- <persons>data.persons</persons>
32
+ <timeout>2</timeout>
53
33
  </parameters>
54
34
  </parameters>
55
- <manipulate output="result"> data.airline = result.value('id')
56
- data.costs += result.value('costs').to_f
57
- status.update 1, 'Hotel'</manipulate>
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>
58
59
  </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>
88
60
  </description>
89
61
  </dslx>
90
62
  <status>
@@ -93,48 +65,40 @@ end
93
65
  </status>
94
66
  <description>
95
67
  <description xmlns="http://cpee.org/ns/description/1.0">
96
- <call id="a1" endpoint="bookAir">
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">
97
92
  <parameters>
98
- <method>:post</method>
93
+ <!--{{{-->
94
+ <method>post</method>
99
95
  <parameters>
100
- <from>data.from</from>
101
- <to>data.to</to>
102
- <persons>data.persons</persons>
96
+ <timeout>4</timeout>
103
97
  </parameters>
104
98
  </parameters>
105
- <manipulate output="result"> data.airline = result.value('id')
106
- data.costs += result.value('costs').to_f
107
- status.update 1, 'Hotel'</manipulate>
99
+ <!--}}}-->
100
+ <manipulate output="result"> data.x += "a3,"</manipulate>
108
101
  </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>
138
102
  </description>
139
103
  </description>
140
104
  <transformation>
@@ -1,93 +1,62 @@
1
1
  <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
- <info>Enter info here</info>
3
- <state>stopped</state>
2
+ <info/>
3
+ <state>ready</state>
4
4
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
5
- <positions/>
6
- <dataelements/>
5
+ <positions>
6
+ <a1>after</a1>
7
+ </positions>
8
+ <dataelements>
9
+ <x/>
10
+ </dataelements>
7
11
  <endpoints>
8
12
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
9
13
  </endpoints>
10
- <dsl>choose :exclusive do
11
- alternative "true", :sim_probability =&gt; "40.0" do
12
- call :a6, nil, { :label =&gt; "da", :type =&gt; :unknown, :mid =&gt; "_5902507A-504A-4F1E-AEE3-8860BEF374B6", :parameters =&gt; nil }
13
- end
14
- otherwise :sim_probability =&gt; "60.0" do
15
- call :a5, nil, { :label =&gt; "db", :type =&gt; :unknown, :mid =&gt; "_6F6A6FEE-57EB-459D-96FB-1AA736CD6465", :parameters =&gt; nil }
16
- end
14
+ <dsl>call :a1, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 2 } }, &lt;&lt;-end
15
+ data.x += "a1,"
17
16
  end
18
- loop pre_test("true"), :sim_probability =&gt; "100.0" do
19
- call :a2, :ADVENTURE_CORRELATION_push, { :label =&gt; "Receive", :type =&gt; :smartobject, :sim_min_time =&gt; "1m", :sim_max_time =&gt; "1m", :sim_avg_time =&gt; "1m", :mid =&gt; "_A0C7F27E-5FF6-4443-9966-A370F20E1D6F", :parameters =&gt; {:SensorID =&gt; "14"} }, &lt;&lt;-end
20
- data.defectid = result.SensorData;
21
- end
22
- call :a1, :MailCO_mail, { :label =&gt; "Deliver Mail", :type =&gt; :externalManufacturingTask, :sim_min_time =&gt; "1m", :sim_max_time =&gt; "1m", :sim_avg_time =&gt; "1m", :mid =&gt; "_5F7422FB-B4A2-49CB-8071-E0FF99F0A834", :parameters =&gt; {:to =&gt; "juergen.mangler@univie.ac.at", :subject =&gt; "Defect Part", :body =&gt; "data.defectid"} }
23
- call :a3, :ADVENTURE_SPAWN, { :label =&gt; "Spawn self", :type =&gt; :spawn, :mid =&gt; "_DEF002B1-0593-4693-8AD7-48B983E5AFAE", :parameters =&gt; {:instance =&gt; "53cd4af1e4b0207100d2266e"} }
17
+ call :a2, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end
18
+ data.x += "a2,"
19
+ end
20
+ call :a3, :timeout, { :method =&gt; "post", :parameters =&gt; { :timeout =&gt; 4 } }, &lt;&lt;-end
21
+ data.x += "a3,"
24
22
  end
25
23
  </dsl>
26
24
  <dslx>
27
25
  <description xmlns="http://cpee.org/ns/description/1.0">
28
- <choose mode="exclusive">
29
- <alternative condition="true" language="text/javascript" sim_probability="40.0">
30
- <call id="a6" endpoint="">
31
- <parameters>
32
- <label>"da"</label>
33
- <type>:unknown</type>
34
- <mid>"_5902507A-504A-4F1E-AEE3-8860BEF374B6"</mid>
35
- <parameters/>
36
- </parameters>
37
- </call>
38
- </alternative>
39
- <otherwise sim_probability="60.0">
40
- <call id="a5" endpoint="">
41
- <parameters>
42
- <label>"db"</label>
43
- <type>:unknown</type>
44
- <mid>"_6F6A6FEE-57EB-459D-96FB-1AA736CD6465"</mid>
45
- <parameters/>
46
- </parameters>
47
- </call>
48
- </otherwise>
49
- </choose>
50
- <loop pre_test="true" language="text/javascript" sim_probability="100.0">
51
- <call id="a2" endpoint="ADVENTURE_CORRELATION_push">
26
+ <!--{{{-->
27
+ <call id="a1" endpoint="timeout">
28
+ <parameters>
29
+ <!--{{{-->
30
+ <method>post</method>
52
31
  <parameters>
53
- <label>"Receive"</label>
54
- <type>:smartobject</type>
55
- <sim_min_time>"1m"</sim_min_time>
56
- <sim_max_time>"1m"</sim_max_time>
57
- <sim_avg_time>"1m"</sim_avg_time>
58
- <mid>"_A0C7F27E-5FF6-4443-9966-A370F20E1D6F"</mid>
59
- <parameters>
60
- <SensorID>"14"</SensorID>
61
- </parameters>
32
+ <timeout>2</timeout>
62
33
  </parameters>
63
- <manipulate output="result" language="text/javascript">data.defectid = result.SensorData;</manipulate>
64
- </call>
65
- <call id="a1" endpoint="MailCO_mail">
34
+ </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>
66
42
  <parameters>
67
- <label>"Deliver Mail"</label>
68
- <type>:externalManufacturingTask</type>
69
- <sim_min_time>"1m"</sim_min_time>
70
- <sim_max_time>"1m"</sim_max_time>
71
- <sim_avg_time>"1m"</sim_avg_time>
72
- <mid>"_5F7422FB-B4A2-49CB-8071-E0FF99F0A834"</mid>
73
- <parameters>
74
- <to>"juergen.mangler@univie.ac.at"</to>
75
- <subject>"Defect Part"</subject>
76
- <body>"data.defectid"</body>
77
- </parameters>
43
+ <timeout>4</timeout>
78
44
  </parameters>
79
- </call>
80
- <call id="a3" endpoint="ADVENTURE_SPAWN">
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>
81
53
  <parameters>
82
- <label>"Spawn self"</label>
83
- <type>:spawn</type>
84
- <mid>"_DEF002B1-0593-4693-8AD7-48B983E5AFAE"</mid>
85
- <parameters>
86
- <instance>"53cd4af1e4b0207100d2266e"</instance>
87
- </parameters>
54
+ <timeout>4</timeout>
88
55
  </parameters>
89
- </call>
90
- </loop>
56
+ </parameters>
57
+ <!--}}}-->
58
+ <manipulate output="result"> data.x += "a3,"</manipulate>
59
+ </call>
91
60
  </description>
92
61
  </dslx>
93
62
  <status>
@@ -96,74 +65,45 @@ end
96
65
  </status>
97
66
  <description>
98
67
  <description xmlns="http://cpee.org/ns/description/1.0">
99
- <choose mode="exclusive">
100
- <alternative condition="true" language="text/javascript" sim_probability="40.0">
101
- <call id="a6" endpoint="">
102
- <parameters>
103
- <label>"da"</label>
104
- <type>:unknown</type>
105
- <mid>"_5902507A-504A-4F1E-AEE3-8860BEF374B6"</mid>
106
- <parameters/>
107
- </parameters>
108
- </call>
109
- </alternative>
110
- <otherwise sim_probability="60.0">
111
- <call id="a5" endpoint="">
112
- <parameters>
113
- <label>"db"</label>
114
- <type>:unknown</type>
115
- <mid>"_6F6A6FEE-57EB-459D-96FB-1AA736CD6465"</mid>
116
- <parameters/>
117
- </parameters>
118
- </call>
119
- </otherwise>
120
- </choose>
121
- <loop pre_test="true" language="text/javascript" sim_probability="100.0">
122
- <call id="a2" endpoint="ADVENTURE_CORRELATION_push">
68
+ <!--{{{-->
69
+ <call id="a1" endpoint="timeout">
70
+ <parameters>
71
+ <!--{{{-->
72
+ <method>post</method>
123
73
  <parameters>
124
- <label>"Receive"</label>
125
- <type>:smartobject</type>
126
- <sim_min_time>"1m"</sim_min_time>
127
- <sim_max_time>"1m"</sim_max_time>
128
- <sim_avg_time>"1m"</sim_avg_time>
129
- <mid>"_A0C7F27E-5FF6-4443-9966-A370F20E1D6F"</mid>
130
- <parameters>
131
- <SensorID>"14"</SensorID>
132
- </parameters>
74
+ <timeout>2</timeout>
133
75
  </parameters>
134
- <manipulate output="result" language="text/javascript">data.defectid = result.SensorData;</manipulate>
135
- </call>
136
- <call id="a1" endpoint="MailCO_mail">
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>
137
84
  <parameters>
138
- <label>"Deliver Mail"</label>
139
- <type>:externalManufacturingTask</type>
140
- <sim_min_time>"1m"</sim_min_time>
141
- <sim_max_time>"1m"</sim_max_time>
142
- <sim_avg_time>"1m"</sim_avg_time>
143
- <mid>"_5F7422FB-B4A2-49CB-8071-E0FF99F0A834"</mid>
144
- <parameters>
145
- <to>"juergen.mangler@univie.ac.at"</to>
146
- <subject>"Defect Part"</subject>
147
- <body>"data.defectid"</body>
148
- </parameters>
85
+ <timeout>4</timeout>
149
86
  </parameters>
150
- </call>
151
- <call id="a3" endpoint="ADVENTURE_SPAWN">
87
+ </parameters>
88
+ <!--}}}-->
89
+ <manipulate output="result"> data.x += "a2,"</manipulate>
90
+ </call>
91
+ <call id="a3" endpoint="timeout">
92
+ <parameters>
93
+ <!--{{{-->
94
+ <method>post</method>
152
95
  <parameters>
153
- <label>"Spawn self"</label>
154
- <type>:spawn</type>
155
- <mid>"_DEF002B1-0593-4693-8AD7-48B983E5AFAE"</mid>
156
- <parameters>
157
- <instance>"53cd4af1e4b0207100d2266e"</instance>
158
- </parameters>
96
+ <timeout>4</timeout>
159
97
  </parameters>
160
- </call>
161
- </loop>
98
+ </parameters>
99
+ <!--}}}-->
100
+ <manipulate output="result"> data.x += "a3,"</manipulate>
101
+ </call>
162
102
  </description>
163
103
  </description>
164
104
  <transformation>
165
105
  <description type="copy"/>
166
- <dataelements type="xslt"/>
167
- <endpoints type="xslt"/>
106
+ <dataelements type="rest"/>
107
+ <endpoints type="rest"/>
168
108
  </transformation>
169
109
  </properties>
@@ -0,0 +1 @@
1
+ 0e75e4db991d6813d7de681ee6b9fea4