cpee 1.4.1 → 1.4.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (114) hide show
  1. checksums.yaml +5 -5
  2. data/cpee.gemspec +1 -1
  3. data/lib/cpee/controller.rb +7 -16
  4. data/lib/cpee/implementation.rb +1 -1
  5. data/server/handlerwrappers/default.rb +12 -1
  6. data/server/instances/1/properties.xml +122 -34
  7. data/server/instances/10/properties.xml +127 -141
  8. data/server/instances/11/properties.xml +179 -162
  9. data/server/instances/12/properties.xml +87 -163
  10. data/server/instances/13/properties.xml +2002 -131
  11. data/server/instances/14/properties.xml +2044 -9
  12. data/server/instances/15/properties.xml +2039 -8
  13. data/server/instances/16/properties.xml +2069 -8
  14. data/server/instances/17/properties.xml +2065 -11
  15. data/server/instances/18/properties.xml +2109 -10
  16. data/server/instances/19/properties.xml +90 -5
  17. data/server/instances/2/properties.xml +135 -10
  18. data/server/instances/20/properties.xml +9 -169
  19. data/server/instances/21/properties.xml +82 -122
  20. data/server/instances/22/properties.xml +2042 -53
  21. data/server/instances/23/properties.xml +68 -75
  22. data/server/instances/24/properties.xml +2033 -82
  23. data/server/instances/25/properties.xml +37 -121
  24. data/server/instances/26/properties.xml +9 -9
  25. data/server/instances/27/properties.xml +2044 -48
  26. data/server/instances/28/properties.xml +2058 -83
  27. data/server/instances/29/properties.xml +2072 -83
  28. data/server/instances/3/properties.xml +211 -76
  29. data/server/instances/30/properties.xml +112 -293
  30. data/server/instances/31/properties.xml +9 -332
  31. data/server/instances/32/properties.xml +65 -582
  32. data/server/instances/33/properties.xml +99 -113
  33. data/server/instances/34/properties.xml +183 -0
  34. data/server/instances/35/properties.xml +183 -0
  35. data/server/instances/36/properties.xml +185 -0
  36. data/server/instances/37/properties.xml +183 -0
  37. data/server/instances/38/properties.xml +183 -0
  38. data/server/instances/39/properties.xml +183 -0
  39. data/server/instances/4/properties.xml +9 -92
  40. data/server/instances/40/properties.xml +183 -0
  41. data/server/instances/41/properties.xml +183 -0
  42. data/server/instances/42/properties.xml +183 -0
  43. data/server/instances/43/properties.xml +183 -0
  44. data/server/instances/44/properties.xml +183 -0
  45. data/server/instances/45/properties.xml +185 -0
  46. data/server/instances/{670 → 46}/properties.xml +1 -1
  47. data/server/instances/47/properties.xml +185 -0
  48. data/server/instances/48/properties.xml +185 -0
  49. data/server/instances/49/properties.xml +185 -0
  50. data/server/instances/5/properties.xml +1505 -49
  51. data/server/instances/50/properties.xml +183 -0
  52. data/server/instances/51/properties.xml +183 -0
  53. data/server/instances/52/properties.xml +2129 -0
  54. data/server/instances/53/properties.xml +2129 -0
  55. data/server/instances/54/properties.xml +319 -0
  56. data/server/instances/55/properties.xml +2114 -0
  57. data/server/instances/56/properties.xml +2114 -0
  58. data/server/instances/57/properties.xml +2119 -0
  59. data/server/instances/58/properties.xml +2119 -0
  60. data/server/instances/59/properties.xml +2119 -0
  61. data/server/instances/6/properties.xml +11 -186
  62. data/server/instances/60/properties.xml +2119 -0
  63. data/server/instances/61/properties.xml +2114 -0
  64. data/server/instances/62/properties.xml +2116 -0
  65. data/server/instances/63/properties.xml +2116 -0
  66. data/server/instances/64/properties.xml +2116 -0
  67. data/server/instances/65/properties.xml +76 -0
  68. data/server/instances/66/properties.xml +97 -0
  69. data/server/instances/7/properties.xml +1691 -82
  70. data/server/instances/8/properties.xml +1738 -53
  71. data/server/instances/9/properties.xml +680 -95
  72. data/server/resources/base.xml +78 -0
  73. data/server/resources/test.rb +19 -0
  74. data/server/resources/test.xml +33 -0
  75. data/server/server.pid +1 -0
  76. data/server/test.rb +3 -0
  77. metadata +41 -41
  78. data/log/logs/1/test +0 -1
  79. data/server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/consumer-secret +0 -1
  80. data/server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/producer-secret +0 -1
  81. data/server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/subscription.xml +0 -23
  82. data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/consumer-secret +0 -1
  83. data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/producer-secret +0 -1
  84. data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/subscription.xml +0 -6
  85. data/server/instances/313/notifications/crisp/consumer-secret +0 -1
  86. data/server/instances/313/notifications/crisp/producer-secret +0 -1
  87. data/server/instances/313/notifications/crisp/subscription.xml +0 -7
  88. data/server/instances/313/notifications/logging/consumer-secret +0 -1
  89. data/server/instances/313/notifications/logging/producer-secret +0 -1
  90. data/server/instances/313/notifications/logging/subscription.xml +0 -7
  91. data/server/instances/313/notifications/logging_yaml/consumer-secret +0 -1
  92. data/server/instances/313/notifications/logging_yaml/producer-secret +0 -1
  93. data/server/instances/313/notifications/logging_yaml/subscription.xml +0 -7
  94. data/server/instances/313/properties.xml +0 -524
  95. data/server/instances/662/notifications/crisp/consumer-secret +0 -1
  96. data/server/instances/662/notifications/crisp/producer-secret +0 -1
  97. data/server/instances/662/notifications/crisp/subscription.xml +0 -7
  98. data/server/instances/662/notifications/logging/consumer-secret +0 -1
  99. data/server/instances/662/notifications/logging/producer-secret +0 -1
  100. data/server/instances/662/notifications/logging/subscription.xml +0 -7
  101. data/server/instances/662/notifications/logging_yaml/consumer-secret +0 -1
  102. data/server/instances/662/notifications/logging_yaml/producer-secret +0 -1
  103. data/server/instances/662/notifications/logging_yaml/subscription.xml +0 -7
  104. data/server/instances/662/properties.xml +0 -427
  105. data/server/instances/663/properties.xml +0 -31
  106. data/server/instances/664/properties.xml +0 -425
  107. data/server/instances/665/properties.xml +0 -425
  108. data/server/instances/666/properties.xml +0 -427
  109. data/server/instances/667/properties.xml +0 -427
  110. data/server/instances/668/properties.xml +0 -425
  111. data/server/instances/669/properties.xml +0 -425
  112. data/server/instances/671/properties.xml +0 -158
  113. data/server/instances/672/properties.xml +0 -199
  114. data/server/instances/673/properties.xml +0 -52
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: b642cdcb1a57cb3d1ab2757db1c2b7fd1f831145
4
- data.tar.gz: bed1651acfbdc200dea5079a8d05257869467fa7
2
+ SHA256:
3
+ metadata.gz: a91017eb7a40edbc1bc48386cd03f5f0b989ceba49603f248496bc703003bbe9
4
+ data.tar.gz: d3bc8b2aebe596644afc060573b32ac4c36fe89fb0ac45f17273e36d6c69fd0e
5
5
  SHA512:
6
- metadata.gz: '033608dc634b8d0c533223f4d6c155ab5f0e864ebb2c53d82dd37070d1f89fd39fa874948b5364a3f3d8186f800e71f4bd291cef7ebd5d26e19bd95784479240'
7
- data.tar.gz: 998bb6a75f269f39920abc7552a7bd9d8e1abc199c3e58b87e8b68eb5e99810357fe6dad32932321d3773f82f35cba340b7afc7ac7c4df9d439e134f3a27313f
6
+ metadata.gz: 706b3dd00d2ba10e952192a151cb37e06732a53d72bb83d6e7754aa75e7f4ae433c14179d2b8ba8f667cdc2939edbd786195e919f5c9dc06c5edd470bc48adb3
7
+ data.tar.gz: bafae5c649751de161fd5680feade247e5ad7b6bf2ecb44a2f46ed6c1956037dd082e8fe60817d7951d87078723a0d600686f2a9524fa7d06c0b7a074ff24dc4
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "1.4.1"
3
+ s.version = "1.4.2"
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). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"
@@ -116,23 +116,14 @@ module CPEE
116
116
  def base_url
117
117
  @opts[:url]
118
118
  end
119
- def base_jid
120
- @opts[:jid]
121
- end
122
119
  def instance_url
123
120
  "#{@opts[:url]}/#{@id}"
124
121
  end
125
- def instance_jid
126
- "#{@opts[:jid]}/#{@id}"
127
- end
128
- def xmpp
129
- @opts[:xmpp]
130
- end
131
122
  def base
132
- @opts[:jid] ? base_url + "," + base_jid : base_url
123
+ base_url
133
124
  end
134
125
  def instance
135
- @opts[:jid] ? instance_url + "," + instance_jid : instance_url
126
+ instance_url
136
127
  end
137
128
 
138
129
  def sim # {{{
@@ -379,7 +370,7 @@ module CPEE
379
370
  addit = if tdesctype == 'copy' || tdesc.empty?
380
371
  desc.children.first.to_doc.root
381
372
  elsif tdesctype == 'rest' && !tdesc.empty?
382
- srv = Riddl::Client.interface(tdesc.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
373
+ srv = Riddl::Client.interface(tdesc.text,@opts[:transformation_service])
383
374
  status, res = srv.post [
384
375
  Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
385
376
  Riddl::Parameter::Simple.new("type","description")
@@ -407,7 +398,7 @@ module CPEE
407
398
 
408
399
  ### dataelements extraction
409
400
  addit = if tdatatype == 'rest' && !tdata.empty?
410
- srv = Riddl::Client.interface(tdata.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
401
+ srv = Riddl::Client.interface(tdata.text,@opts[:transformation_service])
411
402
  status, res = srv.post [
412
403
  Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
413
404
  Riddl::Parameter::Simple.new("type","dataelements")
@@ -438,7 +429,7 @@ module CPEE
438
429
 
439
430
  ### endpoints extraction
440
431
  addit = if tendptype == 'rest' && !tdata.empty?
441
- srv = Riddl::Client.interface(tendp.text,@opts[:transformation_service],:xmpp => @opts[:xmpp])
432
+ srv = Riddl::Client.interface(tendp.text,@opts[:transformation_service])
442
433
  status, res = srv.post [
443
434
  Riddl::Parameter::Complex.new("description","text/xml",desc.children.first.dump),
444
435
  Riddl::Parameter::Simple.new("type","endpoints")
@@ -492,7 +483,7 @@ module CPEE
492
483
  Thread.new(ke,ur) do |key,url|
493
484
  notf = build_notification(key,what,content,'event')
494
485
  if url.class == String
495
- client = Riddl::Client.new(url,'http://riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml',:xmpp => @opts[:xmpp])
486
+ client = Riddl::Client.new(url,'http://riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml')
496
487
  params = notf.map{|ke,va|Riddl::Parameter::Simple.new(ke,va)}
497
488
  params << Riddl::Header.new("CPEE-BASE",self.base)
498
489
  params << Riddl::Header.new("CPEE-INSTANCE",self.instance)
@@ -531,7 +522,7 @@ module CPEE
531
522
  c['callback'] = callback
532
523
  notf = build_notification(k,what,c,'vote',callback)
533
524
  if u.class == String
534
- client = Riddl::Client.new(u,'http://riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml',:xmpp => @opts[:xmpp])
525
+ client = Riddl::Client.new(u,'http://riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml')
535
526
  params = notf.map{|ke,va|Riddl::Parameter::Simple.new(ke,va)}
536
527
  params << Riddl::Header.new("CPEE-BASE",self.base_url)
537
528
  params << Riddl::Header.new("CPEE-INSTANCE",self.instance_url)
@@ -141,7 +141,7 @@ module CPEE
141
141
  controller.each do |k,v|
142
142
  name = v.properties.data.find("string(/p:properties/p:attributes/p:info)")
143
143
  state = v.properties.data.find("string(/p:properties/p:state)")
144
- ins.root.add('instance',name, 'id' => k, 'state' => state)
144
+ ins.root.add('instance',name, 'uuid' => v.uuid, 'id' => k, 'state' => state)
145
145
  end
146
146
  ins.to_s
147
147
  end
@@ -167,15 +167,26 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
167
167
  result
168
168
  end
169
169
 
170
+
170
171
  def structurize_result(result)
171
172
  result.map do |r|
172
173
  if r.is_a? Riddl::Parameter::Simple
173
174
  { r.name => r.value }
174
175
  elsif r.is_a? Riddl::Parameter::Complex
176
+ res = if r.mimetype == 'application/json'
177
+ JSON::parse(r.value.read) rescue nil
178
+ elsif r.mimetype == 'text/plain' || r.mimetype == 'text/html'
179
+ ttt = r.value.read
180
+ ttt = ttt.to_f if ttt == ttt.to_f.to_s
181
+ ttt = ttt.to_i if ttt == ttt.to_i.to_s
182
+ ttt
183
+ else
184
+ r.value.read
185
+ end
175
186
  tmp = {
176
187
  r.name == '' ? 'result' : r.name => {
177
188
  'mimetype' => r.mimetype,
178
- 'content' => r.value.read
189
+ 'content' => res
179
190
  }
180
191
  }
181
192
  r.value.rewind
@@ -1,38 +1,95 @@
1
1
  <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
2
  <attributes>
3
- <uuid/>
4
- <info>Lego Plate</info>
3
+ <uuid>44cfec5e-ae21-4948-8a84-bffc76209842</uuid>
4
+ <info>Other Test</info>
5
5
  <modeltype>CPEE</modeltype>
6
+ <theme>default</theme>
6
7
  </attributes>
7
- <state>stopped</state>
8
+ <state>ready</state>
8
9
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
9
10
  <positions/>
10
11
  <dataelements>
11
- <i>0</i>
12
+ <persons>3</persons>
13
+ <card>Visa_12345</card>
14
+ <airline>null</airline>
15
+ <hotels>[]</hotels>
16
+ <from>Vienna</from>
17
+ <to>Prague</to>
18
+ <costs>0</costs>
12
19
  </dataelements>
13
20
  <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>
21
+ <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
22
+ <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
23
+ <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
16
24
  </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
25
+ <dsl>call :a1, :bookAir, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :from, :value =&gt; data.from), ⭐(:name =&gt; :to, :value =&gt; data.to), ⭐(:name =&gt; :persons, :value =&gt; data.persons)] }, finalize: &lt;&lt;-END
26
+ data.airline = result.value('id')
27
+ data.costs += result.value('costs').to_f
28
+ status.update 1, 'Hotel'
29
+ END
30
+ parallel do
31
+ loop pre_test{data.persons &gt; 0} do
32
+ parallel_branch data.persons do |p|
33
+ call :a2, :bookHotel, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :to, :value =&gt; data.to)] }, finalize: &lt;&lt;-END
34
+ data.hotels &lt;&lt; result.value('id')
35
+ data.costs += result.value('costs').to_f
36
+ END
37
+ end
38
+ manipulate :a3, &lt;&lt;-END
39
+ data.persons -= 1
40
+ END
41
+ end
42
+ end
43
+ choose :inclusive do
44
+ alternative "data.costs &gt; 700" do
45
+ call :a4, :approve, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :costs, :value =&gt; data.costs)] }
46
+ end
21
47
  end
22
48
  </dsl>
23
49
  <dslx>
24
50
  <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>
51
+ <call id="a1" endpoint="bookAir">
52
+ <parameters>
53
+ <method>:post</method>
54
+ <arguments>
55
+ <from>data.from</from>
56
+ <to>data.to</to>
57
+ <persons>data.persons</persons>
58
+ </arguments>
59
+ </parameters>
60
+ <finalize output="result">data.airline = result.value('id')
61
+ data.costs += result.value('costs').to_f
62
+ status.update 1, 'Hotel'</finalize>
63
+ </call>
64
+ <parallel>
65
+ <loop mode="pre_test" condition="data.persons &gt; 0">
66
+ <parallel_branch pass="data.persons" local="p">
67
+ <call id="a2" endpoint="bookHotel">
68
+ <parameters>
69
+ <method>:post</method>
70
+ <arguments>
71
+ <to>data.to</to>
72
+ </arguments>
73
+ </parameters>
74
+ <finalize output="result">data.hotels &lt;&lt; result.value('id')
75
+ data.costs += result.value('costs').to_f</finalize>
76
+ </call>
77
+ </parallel_branch>
78
+ <manipulate id="a3">data.persons -= 1</manipulate>
79
+ </loop>
80
+ </parallel>
81
+ <choose>
82
+ <alternative condition="data.costs &gt; 700">
83
+ <call id="a4" endpoint="approve">
84
+ <parameters>
85
+ <method>:post</method>
86
+ <arguments>
87
+ <costs>data.costs</costs>
88
+ </arguments>
89
+ </parameters>
90
+ </call>
91
+ </alternative>
92
+ </choose>
36
93
  </description>
37
94
  </dslx>
38
95
  <status>
@@ -41,22 +98,53 @@ end
41
98
  </status>
42
99
  <description>
43
100
  <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>
101
+ <call id="a1" endpoint="bookAir">
102
+ <parameters>
103
+ <method>:post</method>
104
+ <arguments>
105
+ <from>data.from</from>
106
+ <to>data.to</to>
107
+ <persons>data.persons</persons>
108
+ </arguments>
109
+ </parameters>
110
+ <finalize output="result">data.airline = result.value('id')
111
+ data.costs += result.value('costs').to_f
112
+ status.update 1, 'Hotel'</finalize>
113
+ </call>
114
+ <parallel>
115
+ <loop mode="pre_test" condition="data.persons &gt; 0">
116
+ <parallel_branch pass="data.persons" local="p">
117
+ <call id="a2" endpoint="bookHotel">
118
+ <parameters>
119
+ <method>:post</method>
120
+ <arguments>
121
+ <to>data.to</to>
122
+ </arguments>
123
+ </parameters>
124
+ <finalize output="result">data.hotels &lt;&lt; result.value('id')
125
+ data.costs += result.value('costs').to_f</finalize>
126
+ </call>
127
+ </parallel_branch>
128
+ <manipulate id="a3">data.persons -= 1</manipulate>
129
+ </loop>
130
+ </parallel>
131
+ <choose>
132
+ <alternative condition="data.costs &gt; 700">
133
+ <call id="a4" endpoint="approve">
134
+ <parameters>
135
+ <method>:post</method>
136
+ <arguments>
137
+ <costs>data.costs</costs>
138
+ </arguments>
139
+ </parameters>
140
+ </call>
141
+ </alternative>
142
+ </choose>
55
143
  </description>
56
144
  </description>
57
145
  <transformation>
58
146
  <description type="copy"/>
59
- <dataelements type="none"/>
60
- <endpoints type="none"/>
147
+ <dataelements type="rest"/>
148
+ <endpoints type="rest"/>
61
149
  </transformation>
62
150
  </properties>
@@ -1,108 +1,102 @@
1
1
  <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
2
2
  <attributes>
3
- <uuid>cb9f41ef-e119-43a5-b8fa-5851ec3faef1</uuid>
4
- <info>s</info>
5
- <modeltype>Signavio</modeltype>
3
+ <uuid>0e4f3926-7e59-4d64-84aa-a8aef708eb75</uuid>
4
+ <info>Eigenspannungsmessung 140</info>
5
+ <modeltype>CPEE</modeltype>
6
+ <theme>labels</theme>
6
7
  </attributes>
7
8
  <state>ready</state>
8
9
  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
9
10
  <positions/>
10
- <dataelements>
11
- <x>_begin</x>
12
- <nasty>What a nasty bug</nasty>
13
- </dataelements>
11
+ <dataelements/>
14
12
  <endpoints>
15
13
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
16
14
  </endpoints>
17
- <dsl>call :a1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4), ⭐(:name =&gt; :bug, :value =&gt; data.nasty)] }, finalize: &lt;&lt;-END
18
- data.x += "done"
15
+ <dsl>call :a1, nil, parameters: { :label =&gt; "Grunddaten erfassen UI", :method =&gt; :post, :arguments =&gt; nil }, update: &lt;&lt;-END
16
+ data.scheibenmaterial = result.scheibenmaterial
17
+ data.scheibenbauform = result.scheibenbauform
18
+ data.eigenspannungswert = result.eigenspannungswert
19
+ data.taetigkeiten = []
19
20
  END
20
- parallel :wait =&gt; 2 do
21
- parallel_branch do
22
- call :a2_1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 6)] }
23
- end
24
- parallel_branch do
25
- call :a2_2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }
26
- end
27
- end
28
- manipulate :a3, &lt;&lt;-END
29
- data.x += '_end'
21
+ call :a2, nil, parameters: { :label =&gt; "max Eigenspannungswert festellen", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :scheibenbauform, :value =&gt; "data.scheibenbauform"), ⭐(:name =&gt; :scheibenmaterial, :value =&gt; "data.scheibenmaterial")] }, finalize: &lt;&lt;-END
22
+ data.maxeigenspannungswert = result.maxeigenspannungswert
23
+ data.mineigenspannungswert = result.mineigenspannungswert
30
24
  END
31
- choose :inclusive do
32
- alternative "data.x != nil" do
33
- call :a4_1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }
34
- end
35
- otherwise do
36
- call :a4_2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 10)] }
25
+ choose :exclusive do
26
+ alternative test{data.eigenspannungswert &lt; data.mineigenspannungswert || data.eigenspannungswert &gt; data.maxeigenspannunswert} do
27
+ choose :exclusive do
28
+ alternative test{data.tauschgruppe["regenerieren"]} do
29
+ manipulate :a4, &lt;&lt;-END
30
+ data.taetigkeiten &lt;&lt; "Radsatz regenerieren"
31
+ END
32
+ end
33
+ otherwise do
34
+ manipulate :a3, &lt;&lt;-END
35
+ data.taetigkeiten &lt;&lt; "Abpressen"
36
+ END
37
+ end
38
+ end
37
39
  end
38
40
  end
39
41
  </dsl>
40
42
  <dslx>
41
43
  <description xmlns="http://cpee.org/ns/description/1.0">
42
- <call id="a1" endpoint="timeout">
44
+ <call id="a1" endpoint="">
45
+ <parameters>
46
+ <label>Grunddaten erfassen UI</label>
47
+ <method>:post</method>
48
+ <arguments/>
49
+ </parameters>
50
+ <finalize output="result"/>
51
+ <update output="result">data.scheibenmaterial = result.scheibenmaterial
52
+ data.scheibenbauform = result.scheibenbauform
53
+ data.eigenspannungswert = result.eigenspannungswert
54
+ data.taetigkeiten = []</update>
55
+ <_timing>
56
+ <_timing_min/>
57
+ <_timing_max/>
58
+ <_timing_avg/>
59
+ </_timing>
60
+ <_notes>
61
+ <_notes_general/>
62
+ <_notes_output/>
63
+ <_attachments/>
64
+ </_notes>
65
+ </call>
66
+ <call id="a2" endpoint="">
43
67
  <parameters>
44
- <!--{{{-->
68
+ <label>max Eigenspannungswert festellen</label>
45
69
  <method>:post</method>
46
70
  <arguments>
47
- <timeout>4</timeout>
48
- <bug>data.nasty</bug>
71
+ <scheibenbauform>data.scheibenbauform</scheibenbauform>
72
+ <scheibenmaterial>data.scheibenmaterial</scheibenmaterial>
49
73
  </arguments>
50
74
  </parameters>
51
- <!--}}}-->
52
- <finalize output="result">data.x += "done"</finalize>
75
+ <finalize output="result">data.maxeigenspannungswert = result.maxeigenspannungswert
76
+ data.mineigenspannungswert = result.mineigenspannungswert</finalize>
77
+ <update output="result"/>
78
+ <_timing>
79
+ <_timing_min/>
80
+ <_timing_max/>
81
+ <_timing_avg/>
82
+ </_timing>
83
+ <_notes>
84
+ <_notes_general/>
85
+ <_notes_output/>
86
+ <_attachments/>
87
+ </_notes>
53
88
  </call>
54
- <parallel wait="2">
55
- <parallel_branch>
56
- <call id="a2_1" endpoint="timeout">
57
- <parameters>
58
- <!--{{{-->
59
- <method>:post</method>
60
- <arguments>
61
- <timeout>6</timeout>
62
- </arguments>
63
- </parameters>
64
- <!--}}}-->
65
- </call>
66
- </parallel_branch>
67
- <parallel_branch>
68
- <call id="a2_2" endpoint="timeout">
69
- <parameters>
70
- <!--{{{-->
71
- <method>:post</method>
72
- <arguments>
73
- <timeout>2</timeout>
74
- </arguments>
75
- </parameters>
76
- <!--}}}-->
77
- </call>
78
- </parallel_branch>
79
- </parallel>
80
- <manipulate id="a3">data.x += '_end'</manipulate>
81
- <choose>
82
- <alternative condition="data.x != nil">
83
- <call id="a4_1" endpoint="timeout">
84
- <parameters>
85
- <!--{{{-->
86
- <method>:post</method>
87
- <arguments>
88
- <timeout>4</timeout>
89
- </arguments>
90
- </parameters>
91
- <!--}}}-->
92
- </call>
89
+ <choose mode="exclusive">
90
+ <alternative condition="data.eigenspannungswert &lt; data.mineigenspannungswert || data.eigenspannungswert &gt; data.maxeigenspannunswert">
91
+ <choose mode="exclusive">
92
+ <alternative condition="data.tauschgruppe[&quot;regenerieren&quot;]">
93
+ <manipulate id="a4" label="Regenerieren hinzuf&#xFC;gen">data.taetigkeiten &lt;&lt; "Radsatz regenerieren"</manipulate>
94
+ </alternative>
95
+ <otherwise>
96
+ <manipulate id="a3" label="Abpressen hinzuf&#xFC;gen">data.taetigkeiten &lt;&lt; "Abpressen"</manipulate>
97
+ </otherwise>
98
+ </choose>
93
99
  </alternative>
94
- <otherwise>
95
- <call id="a4_2" endpoint="timeout">
96
- <parameters>
97
- <!--{{{-->
98
- <method>:post</method>
99
- <arguments>
100
- <timeout>10</timeout>
101
- </arguments>
102
- </parameters>
103
- <!--}}}-->
104
- </call>
105
- </otherwise>
106
100
  </choose>
107
101
  </description>
108
102
  </dslx>
@@ -112,76 +106,68 @@ end
112
106
  </status>
113
107
  <description>
114
108
  <description xmlns="http://cpee.org/ns/description/1.0">
115
- <call id="a1" endpoint="timeout">
109
+ <call id="a1" endpoint="">
110
+ <parameters>
111
+ <label>Grunddaten erfassen UI</label>
112
+ <method>:post</method>
113
+ <arguments/>
114
+ </parameters>
115
+ <finalize output="result"/>
116
+ <update output="result">data.scheibenmaterial = result.scheibenmaterial
117
+ data.scheibenbauform = result.scheibenbauform
118
+ data.eigenspannungswert = result.eigenspannungswert
119
+ data.taetigkeiten = []</update>
120
+ <_timing>
121
+ <_timing_min/>
122
+ <_timing_max/>
123
+ <_timing_avg/>
124
+ </_timing>
125
+ <_notes>
126
+ <_notes_general/>
127
+ <_notes_output/>
128
+ <_attachments/>
129
+ </_notes>
130
+ </call>
131
+ <call id="a2" endpoint="">
116
132
  <parameters>
117
- <!--{{{-->
133
+ <label>max Eigenspannungswert festellen</label>
118
134
  <method>:post</method>
119
135
  <arguments>
120
- <timeout>4</timeout>
121
- <bug>data.nasty</bug>
136
+ <scheibenbauform>data.scheibenbauform</scheibenbauform>
137
+ <scheibenmaterial>data.scheibenmaterial</scheibenmaterial>
122
138
  </arguments>
123
139
  </parameters>
124
- <!--}}}-->
125
- <finalize output="result">data.x += "done"</finalize>
140
+ <finalize output="result">data.maxeigenspannungswert = result.maxeigenspannungswert
141
+ data.mineigenspannungswert = result.mineigenspannungswert</finalize>
142
+ <update output="result"/>
143
+ <_timing>
144
+ <_timing_min/>
145
+ <_timing_max/>
146
+ <_timing_avg/>
147
+ </_timing>
148
+ <_notes>
149
+ <_notes_general/>
150
+ <_notes_output/>
151
+ <_attachments/>
152
+ </_notes>
126
153
  </call>
127
- <parallel wait="2">
128
- <parallel_branch>
129
- <call id="a2_1" endpoint="timeout">
130
- <parameters>
131
- <!--{{{-->
132
- <method>:post</method>
133
- <arguments>
134
- <timeout>6</timeout>
135
- </arguments>
136
- </parameters>
137
- <!--}}}-->
138
- </call>
139
- </parallel_branch>
140
- <parallel_branch>
141
- <call id="a2_2" endpoint="timeout">
142
- <parameters>
143
- <!--{{{-->
144
- <method>:post</method>
145
- <arguments>
146
- <timeout>2</timeout>
147
- </arguments>
148
- </parameters>
149
- <!--}}}-->
150
- </call>
151
- </parallel_branch>
152
- </parallel>
153
- <manipulate id="a3">data.x += '_end'</manipulate>
154
- <choose>
155
- <alternative condition="data.x != nil">
156
- <call id="a4_1" endpoint="timeout">
157
- <parameters>
158
- <!--{{{-->
159
- <method>:post</method>
160
- <arguments>
161
- <timeout>4</timeout>
162
- </arguments>
163
- </parameters>
164
- <!--}}}-->
165
- </call>
154
+ <choose mode="exclusive">
155
+ <alternative condition="data.eigenspannungswert &lt; data.mineigenspannungswert || data.eigenspannungswert &gt; data.maxeigenspannunswert">
156
+ <choose mode="exclusive">
157
+ <alternative condition="data.tauschgruppe[&quot;regenerieren&quot;]">
158
+ <manipulate id="a4" label="Regenerieren hinzuf&#xFC;gen">data.taetigkeiten &lt;&lt; "Radsatz regenerieren"</manipulate>
159
+ </alternative>
160
+ <otherwise>
161
+ <manipulate id="a3" label="Abpressen hinzuf&#xFC;gen">data.taetigkeiten &lt;&lt; "Abpressen"</manipulate>
162
+ </otherwise>
163
+ </choose>
166
164
  </alternative>
167
- <otherwise>
168
- <call id="a4_2" endpoint="timeout">
169
- <parameters>
170
- <!--{{{-->
171
- <method>:post</method>
172
- <arguments>
173
- <timeout>10</timeout>
174
- </arguments>
175
- </parameters>
176
- <!--}}}-->
177
- </call>
178
- </otherwise>
179
165
  </choose>
180
166
  </description>
181
167
  </description>
182
168
  <transformation>
183
169
  <description type="copy"/>
184
- <dataelements type="rest"/>
185
- <endpoints type="rest"/>
170
+ <dataelements type="none"/>
171
+ <endpoints type="none"/>
186
172
  </transformation>
187
173
  </properties>