cpee 2.0.30 → 2.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (351) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/config.json +1 -1
  3. data/cockpit/config.json.example +7 -0
  4. data/cockpit/js/instance.js +96 -26
  5. data/cockpit/js/wfadaptor.js +2 -0
  6. data/cockpit/templates.legacy/Async.xml +12 -12
  7. data/cockpit/templates.legacy/BCO.xml +9 -11
  8. data/cockpit/templates.legacy/BCS.xml +9 -11
  9. data/cockpit/templates.legacy/Centurio.xml +7 -7
  10. data/cockpit/templates.legacy/Concurrent.xml +7 -7
  11. data/cockpit/templates.legacy/Coopis Testset.xml +7 -7
  12. data/cockpit/templates.legacy/Endpoints and Data Manipulation.xml +6 -7
  13. data/cockpit/templates.legacy/ICSOC Testset.xml +7 -7
  14. data/cockpit/templates.legacy/Infinity.xml +7 -7
  15. data/cockpit/templates.legacy/Lego Boxer.xml +13 -13
  16. data/cockpit/templates.legacy/Lego Conveyor.xml +13 -13
  17. data/cockpit/templates.legacy/Lego Crane.xml +16 -16
  18. data/cockpit/templates.legacy/Lego Ejector.xml +16 -16
  19. data/cockpit/templates.legacy/Lego Full.xml +12 -12
  20. data/cockpit/templates.legacy/Lego Liddy.xml +13 -13
  21. data/cockpit/templates.legacy/Lego Plate.xml +13 -13
  22. data/cockpit/templates.legacy/Lego Transporter.xml +14 -14
  23. data/cockpit/templates.legacy/Lego_Part_1.xml +12 -12
  24. data/cockpit/templates.legacy/LgLinear.xml +7 -10
  25. data/cockpit/templates.legacy/Linear.xml +11 -14
  26. data/cockpit/templates.legacy/Log.xml +11 -12
  27. data/cockpit/templates.legacy/Mangler 1.xml +7 -7
  28. data/cockpit/templates.legacy/Mangler 2.xml +7 -7
  29. data/cockpit/templates.legacy/Manuel Labels.xml +11 -11
  30. data/cockpit/templates.legacy/Promise.xml +30 -30
  31. data/cockpit/templates.legacy/SOPROMO Test Sonification.xml +7 -7
  32. data/cockpit/templates.legacy/Subprocess.xml +15 -15
  33. data/cockpit/templates.legacy/Syncing P34 1.xml +8 -11
  34. data/cockpit/templates.legacy/Syncing P34 2.xml +8 -11
  35. data/cockpit/templates.legacy/Syncing P34 3.xml +8 -11
  36. data/cockpit/templates.legacy/Syncing P34.xml +8 -11
  37. data/cockpit/templates.legacy/TEST - Bad Loop.xml +7 -7
  38. data/cockpit/templates.legacy/TEST - Wrong Positions.xml +7 -7
  39. data/cockpit/templates.legacy/Take_5.xml +14 -14
  40. data/cockpit/templates.legacy/Update.xml +11 -11
  41. data/cockpit/templates.legacy/Worklist Parallel.xml +17 -17
  42. data/cockpit/templates.legacy/Worklist Test CPEE.xml +14 -14
  43. data/cockpit/templates.legacy/Worklist Test.xml +14 -14
  44. data/cockpit/templates.legacy/Worklist Test2.xml +14 -14
  45. data/cockpit/templates/Coopis 2010.xml +19 -11
  46. data/cockpit/templates/Coopis 2010.xml.active +1 -0
  47. data/cockpit/templates/Coopis 2010.xml.active-uuid +1 -0
  48. data/cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml +13 -12
  49. data/cockpit/templates/IUPC arXiv:1104.3609 P34 2.xml +13 -12
  50. data/cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml +13 -12
  51. data/cockpit/templates/Track Test Local.xml +3 -3
  52. data/cockpit/templates/Track Test.xml +2 -2
  53. data/cockpit/templates/UR-VUE 2020 Manual Adjust.xml +2 -2
  54. data/cockpit/templates/UR-VUE 2020 Solution Baseline.xml +2 -2
  55. data/cockpit/templates/UR-VUE 2020 Solution NN.xml +2 -2
  56. data/cockpit/templates/UR-VUE 2020 Solution View.xml +2 -2
  57. data/cockpit/templates/UR-VUE 2020.xml +4 -2
  58. data/cockpit/templates/Worklist.xml +19 -14
  59. data/cockpit/templates/instantiate.local/Take_Sub.xml +2 -2
  60. data/cockpit/templates/instantiate/Take_Perf.xml +1 -1
  61. data/cockpit/templates/instantiate/Take_Sub.xml +2 -2
  62. data/cockpit/templates/instantiate/Take_X.xml +2 -2
  63. data/cockpit/themes/compact/rngs/call.rng +17 -8
  64. data/cockpit/themes/compact/rngs/callmanipulate.rng +18 -9
  65. data/cockpit/themes/compact/rngs/start.rng +83 -0
  66. data/cockpit/themes/compact/symbols/start.svg +1 -1
  67. data/cockpit/themes/compact/theme.js +1 -1
  68. data/cockpit/themes/control/rngs/call.rng +17 -8
  69. data/cockpit/themes/control/rngs/callmanipulate.rng +18 -9
  70. data/cockpit/themes/control/rngs/start.rng +83 -0
  71. data/cockpit/themes/control/symbols/start.svg +1 -1
  72. data/cockpit/themes/default/rngs/call.rng +17 -8
  73. data/cockpit/themes/default/rngs/callmanipulate.rng +18 -9
  74. data/cockpit/themes/default/rngs/start.rng +83 -0
  75. data/cockpit/themes/default/symbols/start.svg +1 -1
  76. data/cockpit/themes/default/theme.js +1 -1
  77. data/cockpit/themes/extended/rngs/call.rng +17 -8
  78. data/cockpit/themes/extended/rngs/callmanipulate.rng +18 -9
  79. data/cockpit/themes/extended/rngs/start.rng +83 -0
  80. data/cockpit/themes/extended/symbols/start.svg +1 -1
  81. data/cockpit/themes/extended/theme.js +1 -1
  82. data/cockpit/themes/model/symbols/start.svg +1 -1
  83. data/cockpit/themes/packed/rngs/call.rng +17 -8
  84. data/cockpit/themes/packed/rngs/callmanipulate.rng +18 -9
  85. data/cockpit/themes/packed/rngs/start.rng +83 -0
  86. data/cockpit/themes/packed/symbols/start.svg +1 -1
  87. data/cockpit/themes/packed/theme.js +1 -1
  88. data/cockpit/themes/preset/rngs/call.rng +17 -8
  89. data/cockpit/themes/preset/rngs/callmanipulate.rng +18 -9
  90. data/cockpit/themes/preset/rngs/start.rng +83 -0
  91. data/cockpit/themes/preset/symbols/start.svg +1 -1
  92. data/cockpit/themes/preset/theme.js +1 -1
  93. data/cpee.gemspec +3 -3
  94. data/lib/cpee/attributes_helper.rb +14 -0
  95. data/lib/cpee/implementation.rb +10 -8
  96. data/lib/cpee/implementation_callbacks.rb +14 -0
  97. data/lib/cpee/implementation_notifications.rb +19 -5
  98. data/lib/cpee/implementation_properties.rb +128 -24
  99. data/lib/cpee/persistence.rb +0 -27
  100. data/lib/cpee/statemachine.rb +14 -0
  101. data/lib/cpee/value_helper.rb +14 -0
  102. data/lib/properties.xml +4 -4
  103. data/lib/properties/{handlerwrapper.rng → executionhandler.rng} +3 -3
  104. data/lib/properties/properties.rng +2 -2
  105. data/lib/properties/set-properties.rng +2 -2
  106. data/lib/properties/set-some-properties.rng +2 -2
  107. data/server/{resources → executionhandlers/ruby}/backend/README.md +0 -0
  108. data/server/{resources → executionhandlers/ruby}/backend/instance.template +2 -4
  109. data/server/{resources → executionhandlers/ruby}/backend/opts.yaml +2 -2
  110. data/server/executionhandlers/ruby/backend/run +37 -0
  111. data/server/{handlerwrappers/default.rb → executionhandlers/ruby/connection.rb} +3 -3
  112. data/server/executionhandlers/ruby/controller.rb +195 -0
  113. data/server/{resources/transformation_dslx.xsl → executionhandlers/ruby/dsl_to_dslx.xsl} +53 -8
  114. data/server/executionhandlers/ruby/execution.rb +81 -0
  115. data/server/resources/properties.empty +1 -1
  116. data/server/resources/properties.init +1 -1
  117. data/server/resources/topics.xml +2 -2
  118. data/server/routing/end.pid +1 -1
  119. data/server/routing/forward-events.pid +1 -1
  120. data/server/routing/forward-votes.pid +1 -1
  121. data/server/routing/persist.pid +1 -1
  122. data/server/routing/persist.rb +3 -3
  123. data/tools/cpee +16 -10
  124. data/tools/server/cpee +1 -1
  125. data/tools/server/resources/properties.init +1 -1
  126. metadata +25 -238
  127. data/cockpit/js_libs.zip +0 -0
  128. data/cockpit/templates.legacy/convert_cpee2.rb +0 -15
  129. data/lib/cpee/controller.rb +0 -199
  130. data/lib/cpee/transform.rb +0 -95
  131. data/lib/instantiation.xml +0 -125
  132. data/server/resources/backend/instance.rb +0 -23
  133. data/server/resources/backend/run +0 -33
  134. data/server/server.pid +0 -1
  135. data/tools/test/README +0 -4
  136. data/tools/test/config.json +0 -3
  137. data/tools/test/contrib/graph_example.svg +0 -1166
  138. data/tools/test/contrib/legend.svg +0 -817
  139. data/tools/test/contrib/symbols.svg +0 -224
  140. data/tools/test/contrib/transformation1.xsl +0 -264
  141. data/tools/test/contrib/transformation2.xsl +0 -10
  142. data/tools/test/contrib/tree_example.svg +0 -788
  143. data/tools/test/css/model.css +0 -24
  144. data/tools/test/css/track.css +0 -60
  145. data/tools/test/css/ui.css +0 -214
  146. data/tools/test/css/wfadaptor.css +0 -422
  147. data/tools/test/edit.html +0 -258
  148. data/tools/test/graph.html +0 -69
  149. data/tools/test/index.html +0 -258
  150. data/tools/test/js/details.js +0 -109
  151. data/tools/test/js/instance.js +0 -1344
  152. data/tools/test/js/model.js +0 -41
  153. data/tools/test/js/parameters.js +0 -82
  154. data/tools/test/js/track.js +0 -18
  155. data/tools/test/js/ui.js +0 -104
  156. data/tools/test/js/wfadaptor.js +0 -763
  157. data/tools/test/js_libs.zip +0 -0
  158. data/tools/test/js_libs/Makefile +0 -2
  159. data/tools/test/js_libs/ansi_up.js +0 -333
  160. data/tools/test/js_libs/console.js +0 -80
  161. data/tools/test/js_libs/custommenu.css +0 -84
  162. data/tools/test/js_libs/custommenu.js +0 -104
  163. data/tools/test/js_libs/experiments1/relaxngui.css +0 -185
  164. data/tools/test/js_libs/experiments1/relaxngui.js +0 -488
  165. data/tools/test/js_libs/experiments1/rngtest9.html +0 -60
  166. data/tools/test/js_libs/experiments1/rngtest9.rng +0 -35
  167. data/tools/test/js_libs/experiments1/rngtest9.xml +0 -8
  168. data/tools/test/js_libs/jquery-2.2.4.min.js +0 -4
  169. data/tools/test/js_libs/jquery-3.2.1.min.js +0 -4
  170. data/tools/test/js_libs/jquery-3.3.1.min.js +0 -2
  171. data/tools/test/js_libs/jquery.browser.js +0 -40
  172. data/tools/test/js_libs/jquery.caret.min.js +0 -10
  173. data/tools/test/js_libs/jquery.cookie.js +0 -117
  174. data/tools/test/js_libs/jquery.min.js +0 -1
  175. data/tools/test/js_libs/jquery.svg.min.js +0 -6
  176. data/tools/test/js_libs/jquery.svgdom.min.js +0 -6
  177. data/tools/test/js_libs/markdown.min.js +0 -1
  178. data/tools/test/js_libs/parsequery.js +0 -21
  179. data/tools/test/js_libs/printf.js +0 -368
  180. data/tools/test/js_libs/relaxngui.css +0 -213
  181. data/tools/test/js_libs/relaxngui.js +0 -543
  182. data/tools/test/js_libs/strftime.min.js +0 -1
  183. data/tools/test/js_libs/tests/dataelements.html +0 -59
  184. data/tools/test/js_libs/tests/dataelements.rng +0 -8
  185. data/tools/test/js_libs/tests/dataelements.xml +0 -3
  186. data/tools/test/js_libs/tests/relaxngui.css +0 -203
  187. data/tools/test/js_libs/tests/relaxngui.js +0 -502
  188. data/tools/test/js_libs/tests/rngtest1.html +0 -66
  189. data/tools/test/js_libs/tests/rngtest1.rng +0 -147
  190. data/tools/test/js_libs/tests/rngtest1.xml +0 -13
  191. data/tools/test/js_libs/tests/rngtest2.html +0 -60
  192. data/tools/test/js_libs/tests/rngtest2.rng +0 -6
  193. data/tools/test/js_libs/tests/rngtest2.xml +0 -3
  194. data/tools/test/js_libs/tests/rngtest3.html +0 -60
  195. data/tools/test/js_libs/tests/rngtest3.rng +0 -23
  196. data/tools/test/js_libs/tests/rngtest3.xml +0 -9
  197. data/tools/test/js_libs/tests/rngtest4.html +0 -60
  198. data/tools/test/js_libs/tests/rngtest4.rng +0 -19
  199. data/tools/test/js_libs/tests/rngtest4.xml +0 -12
  200. data/tools/test/js_libs/tests/rngtest5.html +0 -60
  201. data/tools/test/js_libs/tests/rngtest5.rng +0 -75
  202. data/tools/test/js_libs/tests/rngtest5.xml +0 -40
  203. data/tools/test/js_libs/tests/rngtest6.html +0 -60
  204. data/tools/test/js_libs/tests/rngtest6.rng +0 -24
  205. data/tools/test/js_libs/tests/rngtest6.xml +0 -6
  206. data/tools/test/js_libs/tests/rngtest8.html +0 -60
  207. data/tools/test/js_libs/tests/rngtest8.rng +0 -13
  208. data/tools/test/js_libs/tests/rngtest8.xml +0 -2
  209. data/tools/test/js_libs/tests/rngtest9.html +0 -60
  210. data/tools/test/js_libs/tests/rngtest9.rng +0 -31
  211. data/tools/test/js_libs/tests/rngtest9.xml +0 -8
  212. data/tools/test/js_libs/ui.css +0 -333
  213. data/tools/test/js_libs/ui.html +0 -168
  214. data/tools/test/js_libs/ui.js +0 -177
  215. data/tools/test/js_libs/underscore.min.js +0 -27
  216. data/tools/test/js_libs/util.js +0 -81
  217. data/tools/test/js_libs/vkbeautify.0.99.00.beta.js +0 -358
  218. data/tools/test/js_libs/vkbeautify.js +0 -1
  219. data/tools/test/js_libs/webcomponents.min.js +0 -196
  220. data/tools/test/model.html +0 -192
  221. data/tools/test/rngs/attributes.rng +0 -8
  222. data/tools/test/rngs/dataelements.rng +0 -8
  223. data/tools/test/rngs/endpoints.rng +0 -8
  224. data/tools/test/templates.legacy/Async.xml +0 -46
  225. data/tools/test/templates.legacy/BCO.xml +0 -70
  226. data/tools/test/templates.legacy/BCS.xml +0 -70
  227. data/tools/test/templates.legacy/Centurio.xml +0 -75
  228. data/tools/test/templates.legacy/Concurrent.xml +0 -40
  229. data/tools/test/templates.legacy/Coopis Testset.xml +0 -76
  230. data/tools/test/templates.legacy/Endpoints and Data Manipulation.xml +0 -30
  231. data/tools/test/templates.legacy/ICSOC Testset.xml +0 -95
  232. data/tools/test/templates.legacy/Infinity.xml +0 -28
  233. data/tools/test/templates.legacy/Lego Boxer.xml +0 -31
  234. data/tools/test/templates.legacy/Lego Conveyor.xml +0 -31
  235. data/tools/test/templates.legacy/Lego Crane.xml +0 -87
  236. data/tools/test/templates.legacy/Lego Ejector.xml +0 -55
  237. data/tools/test/templates.legacy/Lego Full.xml +0 -142
  238. data/tools/test/templates.legacy/Lego Liddy.xml +0 -40
  239. data/tools/test/templates.legacy/Lego Plate.xml +0 -31
  240. data/tools/test/templates.legacy/Lego Transporter.xml +0 -43
  241. data/tools/test/templates.legacy/Lego_Part_1.xml +0 -85
  242. data/tools/test/templates.legacy/LgLinear.xml +0 -65
  243. data/tools/test/templates.legacy/Linear.xml +0 -77
  244. data/tools/test/templates.legacy/Log.xml +0 -117
  245. data/tools/test/templates.legacy/Mangler 1.xml +0 -87
  246. data/tools/test/templates.legacy/Mangler 2.xml +0 -103
  247. data/tools/test/templates.legacy/Manuel Labels.xml +0 -55
  248. data/tools/test/templates.legacy/Promise.xml +0 -275
  249. data/tools/test/templates.legacy/SOPROMO Test Sonification.xml +0 -83
  250. data/tools/test/templates.legacy/Subprocess.xml +0 -56
  251. data/tools/test/templates.legacy/Syncing P34 1.xml +0 -77
  252. data/tools/test/templates.legacy/Syncing P34 2.xml +0 -77
  253. data/tools/test/templates.legacy/Syncing P34 3.xml +0 -77
  254. data/tools/test/templates.legacy/Syncing P34.xml +0 -77
  255. data/tools/test/templates.legacy/TEST - Bad Loop.xml +0 -173
  256. data/tools/test/templates.legacy/TEST - Wrong Positions.xml +0 -174
  257. data/tools/test/templates.legacy/Take_5.xml +0 -48
  258. data/tools/test/templates.legacy/Update.xml +0 -32
  259. data/tools/test/templates.legacy/Worklist Parallel.xml +0 -104
  260. data/tools/test/templates.legacy/Worklist Test CPEE.xml +0 -40
  261. data/tools/test/templates.legacy/Worklist Test.xml +0 -42
  262. data/tools/test/templates.legacy/Worklist Test2.xml +0 -43
  263. data/tools/test/templates.legacy/convert_cpee2.rb +0 -15
  264. data/tools/test/templates.legacy/convert_preset.rb +0 -32
  265. data/tools/test/templates.legacy/testsets.xml +0 -37
  266. data/tools/test/templates.legacy/transformations.xml +0 -4
  267. data/tools/test/templates/Coopis 2010.xml +0 -76
  268. data/tools/test/templates/IUPC arXiv:1104.3609 P34 1.xml +0 -77
  269. data/tools/test/templates/IUPC arXiv:1104.3609 P34 2.xml +0 -77
  270. data/tools/test/templates/IUPC arXiv:1104.3609 P34 3.xml +0 -77
  271. data/tools/test/templates/Track Test Local.xml +0 -82
  272. data/tools/test/templates/Track Test.xml +0 -82
  273. data/tools/test/templates/UR-VUE 2020 Manual Adjust.xml +0 -182
  274. data/tools/test/templates/UR-VUE 2020 Solution Baseline.xml +0 -203
  275. data/tools/test/templates/UR-VUE 2020 Solution NN.xml +0 -197
  276. data/tools/test/templates/UR-VUE 2020 Solution View.xml +0 -151
  277. data/tools/test/templates/UR-VUE 2020.xml +0 -26
  278. data/tools/test/templates/Worklist.xml +0 -42
  279. data/tools/test/templates/instantiate.local/Take_Sub.xml +0 -59
  280. data/tools/test/templates/instantiate/Take_Perf.xml +0 -46
  281. data/tools/test/templates/instantiate/Take_Sub.xml +0 -58
  282. data/tools/test/templates/instantiate/Take_X.xml +0 -48
  283. data/tools/test/themes/compact/theme.js +0 -1285
  284. data/tools/test/themes/diana/theme.js +0 -1650
  285. data/tools/test/themes/extended/theme.js +0 -1325
  286. data/tools/test/themes/model/rngs/alternative.rng +0 -1
  287. data/tools/test/themes/model/rngs/call.rng +0 -67
  288. data/tools/test/themes/model/rngs/callmanipulate.rng +0 -72
  289. data/tools/test/themes/model/rngs/choose.rng +0 -1
  290. data/tools/test/themes/model/rngs/critical.rng +0 -1
  291. data/tools/test/themes/model/rngs/escape.rng +0 -1
  292. data/tools/test/themes/model/rngs/group.rng +0 -1
  293. data/tools/test/themes/model/rngs/loop.rng +0 -1
  294. data/tools/test/themes/model/rngs/manipulate.rng +0 -1
  295. data/tools/test/themes/model/rngs/otherwise.rng +0 -1
  296. data/tools/test/themes/model/rngs/parallel.rng +0 -1
  297. data/tools/test/themes/model/rngs/parallel_branch.rng +0 -1
  298. data/tools/test/themes/model/rngs/scripts.rng +0 -7
  299. data/tools/test/themes/model/rngs/stop.rng +0 -1
  300. data/tools/test/themes/model/rngs/terminate.rng +0 -1
  301. data/tools/test/themes/model/theme.js +0 -1268
  302. data/tools/test/themes/packed/theme.js +0 -1286
  303. data/tools/test/themes/preset/rngs/alternative.rng +0 -25
  304. data/tools/test/themes/preset/rngs/call.rng +0 -122
  305. data/tools/test/themes/preset/rngs/callmanipulate.rng +0 -145
  306. data/tools/test/themes/preset/rngs/choose.rng +0 -14
  307. data/tools/test/themes/preset/rngs/closed_loop.rng +0 -62
  308. data/tools/test/themes/preset/rngs/closed_loop_cancel.rng +0 -5
  309. data/tools/test/themes/preset/rngs/closed_loop_control.rng +0 -31
  310. data/tools/test/themes/preset/rngs/closed_loop_measuring.rng +0 -12
  311. data/tools/test/themes/preset/rngs/critical.rng +0 -5
  312. data/tools/test/themes/preset/rngs/escape.rng +0 -1
  313. data/tools/test/themes/preset/rngs/group.rng +0 -3
  314. data/tools/test/themes/preset/rngs/loop.rng +0 -22
  315. data/tools/test/themes/preset/rngs/manipulate.rng +0 -9
  316. data/tools/test/themes/preset/rngs/otherwise.rng +0 -22
  317. data/tools/test/themes/preset/rngs/parallel.rng +0 -21
  318. data/tools/test/themes/preset/rngs/parallel_branch.rng +0 -8
  319. data/tools/test/themes/preset/rngs/scripts.rng +0 -23
  320. data/tools/test/themes/preset/rngs/stop.rng +0 -5
  321. data/tools/test/themes/preset/rngs/terminate.rng +0 -1
  322. data/tools/test/themes/preset/symbols/alternative.svg +0 -5
  323. data/tools/test/themes/preset/symbols/arrow.svg +0 -3
  324. data/tools/test/themes/preset/symbols/call.svg +0 -6
  325. data/tools/test/themes/preset/symbols/callmanipulate.svg +0 -8
  326. data/tools/test/themes/preset/symbols/choose.svg +0 -5
  327. data/tools/test/themes/preset/symbols/choose_exclusive.svg +0 -5
  328. data/tools/test/themes/preset/symbols/choose_inclusive.svg +0 -4
  329. data/tools/test/themes/preset/symbols/closed_loop.svg +0 -5
  330. data/tools/test/themes/preset/symbols/closed_loop_cancel.svg +0 -5
  331. data/tools/test/themes/preset/symbols/closed_loop_control.svg +0 -5
  332. data/tools/test/themes/preset/symbols/closed_loop_measuring.svg +0 -6
  333. data/tools/test/themes/preset/symbols/complex.svg +0 -8
  334. data/tools/test/themes/preset/symbols/critical.svg +0 -4
  335. data/tools/test/themes/preset/symbols/end.svg +0 -3
  336. data/tools/test/themes/preset/symbols/escape.svg +0 -5
  337. data/tools/test/themes/preset/symbols/event_end.svg +0 -3
  338. data/tools/test/themes/preset/symbols/loop.svg +0 -5
  339. data/tools/test/themes/preset/symbols/manipulate.svg +0 -4
  340. data/tools/test/themes/preset/symbols/otherwise.svg +0 -5
  341. data/tools/test/themes/preset/symbols/parallel.svg +0 -5
  342. data/tools/test/themes/preset/symbols/parallel_branch.svg +0 -5
  343. data/tools/test/themes/preset/symbols/parallel_branch_compact.svg +0 -4
  344. data/tools/test/themes/preset/symbols/parallel_branch_event.svg +0 -14
  345. data/tools/test/themes/preset/symbols/parallel_branch_normal.svg +0 -5
  346. data/tools/test/themes/preset/symbols/scripts.svg +0 -4
  347. data/tools/test/themes/preset/symbols/start.svg +0 -3
  348. data/tools/test/themes/preset/symbols/stop.svg +0 -5
  349. data/tools/test/themes/preset/symbols/terminate.svg +0 -4
  350. data/tools/test/themes/preset/theme.js +0 -1287
  351. data/tools/test/track.html +0 -142
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 276ee2c99e9c250bbeb3ebab71df773fde372df10b0fd09a898755c57e479fc0
4
- data.tar.gz: 4db83c7f5dbe7f146536e9e58ec9107e9646a7f092d69f4d459ea11b70b44cef
3
+ metadata.gz: c55f39b3a28510aa125fab8be30c6abefcda2ecea411b37193c85659ce87ad60
4
+ data.tar.gz: 28efcb5ebe9c46f4b1c0e107f557b7ac4ccc295d254c9a5515812f94420d8e1b
5
5
  SHA512:
6
- metadata.gz: 1bcb337d06fb1acd06b14e0225d8151844cc8cfcd7331ece1f55a23491d532d8ba3a86b9b56d864005580fb8c35a0df4a65d8bb0814ba43417fd8a6b550791d7
7
- data.tar.gz: c341d05b1845e20a8abbdebc5d7fd49a5e9736a71b135c602836168881434568d2cc153c7c9b56397ae443a24c842955af75699c403275d47260b7963f816073
6
+ metadata.gz: 80afb6a0631c42f8ce45f90b545067f85384c32da9964f61857a07314ae1252dbfb19f833581de426c788f2cf2fe52d409451e44b71f63aa1bf286c922f6c80f
7
+ data.tar.gz: b15f56166f86bd72b791d8ef23ccb41d0eec8d840073777a2315e18993a2e88db071472e956c3b5f43afce5189461111b3326bdc7e9f48c3c7cd7d37ae0eb4fa
data/cockpit/config.json CHANGED
@@ -1,3 +1,3 @@
1
1
  {
2
- "res-url": "https://cpee.org/flow/resources/"
2
+ "res-url": "https://tango.wst.univie.ac.at/flow/resources/"
3
3
  }
@@ -0,0 +1,7 @@
1
+ {
2
+ "log-url": "https://cpee.org/logs/",
3
+ "templates-url": "https://cpee.org/design/server/Templates.dir/?stage=developm
4
+ "res-url": "https://cpee.org/flow/resources/",
5
+ "base-url": "https://cpee.org/flow/engine/",
6
+ "save-url": "https://cpee.org/design/server/"
7
+ }
@@ -53,7 +53,7 @@ var sub_more = 'topic' + '=' + 'activity' + '&' +// {{{
53
53
  'events' + '=' + 'instantiation' + '&' +
54
54
  'topic' + '=' + 'transformation' + '&' +
55
55
  'events' + '=' + 'change' + '&' +
56
- 'topic' + '=' + 'handlerwrapper' + '&' +
56
+ 'topic' + '=' + 'connectionwrapper' + '&' +
57
57
  'events' + '=' + 'error,change' + '&' +
58
58
  'topic' + '=' + 'handlers' + '&' +
59
59
  'events' + '=' + 'change';// }}}
@@ -75,7 +75,7 @@ var sub_less = 'topic' + '=' + 'activity' + '&' +// {{{
75
75
  'events' + '=' + 'instantiation' + '&' +
76
76
  'topic' + '=' + 'transformation' + '&' +
77
77
  'events' + '=' + 'change' + '&' +
78
- 'topic' + '=' + 'handlerwrapper' + '&' +
78
+ 'topic' + '=' + 'connectionwrapper' + '&' +
79
79
  'events' + '=' + 'error,change' + '&' +
80
80
  'topic' + '=' + 'handlers' + '&' +
81
81
  'events' + '=' + 'change';// }}}
@@ -406,12 +406,12 @@ function monitor_instance_values(val) {// {{{
406
406
  $(res).find(" > endpoints > *").each(function(k,v) {
407
407
  save['endpoints_list'][v.localName] = v.lastChild.nodeValue;
408
408
  $.ajax({
409
- url: rep + encodeURIComponent($(v).text()),
409
+ url: rep + 'endpoints/' + encodeURIComponent($(v).text()),
410
410
  success: function() {
411
411
  tmp[v.tagName] = {};
412
412
  var deferreds = [new $.Deferred(), new $.Deferred(), new $.Deferred()];
413
413
  $.ajax({
414
- url: rep + encodeURIComponent($(v).text()) + "/symbol.svg",
414
+ url: rep + 'endpoints/' + encodeURIComponent($(v).text()) + "/symbol.svg",
415
415
  success: function(res) {
416
416
  tmp[v.tagName]['symbol'] = res;
417
417
  deferreds[0].resolve(true);
@@ -419,7 +419,7 @@ function monitor_instance_values(val) {// {{{
419
419
  error: deferreds[0].resolve
420
420
  })
421
421
  $.ajax({
422
- url: rep + encodeURIComponent($(v).text()) + "/schema.rng",
422
+ url: rep + 'endpoints/' + encodeURIComponent($(v).text()) + "/schema.rng",
423
423
  success: function(res) {
424
424
  tmp[v.tagName]['schema'] = res;
425
425
  deferreds[1].resolve(true);
@@ -427,7 +427,7 @@ function monitor_instance_values(val) {// {{{
427
427
  error: deferreds[1].resolve
428
428
  })
429
429
  $.ajax({
430
- url: rep + encodeURIComponent($(v).text()) + "/properties.json",
430
+ url: rep + 'endpoints/' + encodeURIComponent($(v).text()) + "/properties.json",
431
431
  success: function(res) {
432
432
  tmp[v.tagName]['properties'] = res;
433
433
  deferreds[2].resolve(true);
@@ -731,7 +731,6 @@ function monitor_instance_state_change(notification) { //{{{
731
731
  }
732
732
 
733
733
  if (notification != "ready" && notification != "stopped" && notification != "running") {
734
- console.log('rrr');
735
734
  $('#parameters ui-content ui-area > button').attr('disabled','disabled');
736
735
  $('#state_any').hide();
737
736
  } else {
@@ -845,7 +844,36 @@ function get_testset(deferred) {// {{{
845
844
  ele.removeAttribute('xmlns');
846
845
  }
847
846
  });
848
- deferred.resolve(name,testset);
847
+ $.ajax({
848
+ type: "GET",
849
+ url: url + "/notifications/subscriptions/",
850
+ success: async function(res){
851
+ let values = $("subscriptions > subscription[url]",res);
852
+ let subs = $X('<subscriptions xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0"/>');
853
+ let promises = [];
854
+ let scount = 0;
855
+ values.each(function(){
856
+ let sid = $(this).attr('id');
857
+ if (sid.match(/^_/)) {
858
+ scount += 1;
859
+ promises.push(
860
+ $.ajax({
861
+ type: "GET",
862
+ url: url + "/notifications/subscriptions/" + sid,
863
+ error: report_failure
864
+ }).then(function(a) {
865
+ subs.append($(a.documentElement));
866
+ })
867
+ );
868
+ };
869
+ });
870
+ await Promise.all(promises);
871
+ if (scount > 0) { testset.append(subs); }
872
+ deferred.resolve(name,testset);
873
+ },
874
+ error: function() { deferred.reject(); report_failure(); }
875
+ });
876
+
849
877
  },
850
878
  error: function() { deferred.reject(); report_failure(); }
851
879
  });
@@ -904,7 +932,7 @@ async function set_testset(testset,exec) {// {{{
904
932
  var promises = [];
905
933
 
906
934
  var tset = $X('<properties xmlns="http://cpee.org/ns/properties/2.0"/>');
907
- tset.append($("testset > handlerwrapper",testset));
935
+ tset.append($("testset > executionwrapper",testset));
908
936
  tset.append($("testset > positions",testset));
909
937
  tset.append($("testset > dataelements",testset));
910
938
  tset.append($("testset > endpoints",testset));
@@ -919,11 +947,10 @@ async function set_testset(testset,exec) {// {{{
919
947
  url: url + "/notifications/subscriptions/",
920
948
  error: report_failure
921
949
  }).then(async function(res) {
922
- var rcount = 0;
923
950
  var values = $("subscriptions > subscription[url]",res);
924
- var vals = [];
951
+ var vals = {};
925
952
  values.each(function(){
926
- vals.push($(this).attr('url'));
953
+ vals[$(this).attr('url')] = $(this).attr('id');
927
954
  });
928
955
  await load_testset_handlers(url,testset,vals);
929
956
  })
@@ -1083,24 +1110,67 @@ async function load_des(url,model) { //{{{
1083
1110
  error: report_failure
1084
1111
  });
1085
1112
  } //}}}
1113
+
1114
+ function load_testset_extract_handlers(inp,han,suburl) { //{{{
1115
+ inp.push("url="+encodeURIComponent(suburl).replace(/~/,'%7E'));
1116
+ $(">*",han).each(function(_,top){
1117
+ let events = [];
1118
+ let votes = [];
1119
+ $(">*",top).each(function(_,it){
1120
+ if (it.nodeName == 'event') {
1121
+ events.push($(it).text());
1122
+ }
1123
+ if (it.nodeName == 'vote') {
1124
+ votes.push($(it).text());
1125
+ }
1126
+ });
1127
+ if (events.length > 0) {
1128
+ inp.push("topic=" + $(top).attr('id'));
1129
+ inp.push("events=" + events.join(','));
1130
+ }
1131
+ if (votes.length > 0) {
1132
+ inp.push("topic=" + $(top).attr('id'));
1133
+ inp.push("votes=" + votes.join(','));
1134
+ }
1135
+ });
1136
+ return inp;
1137
+ } //}}}
1138
+
1086
1139
  async function load_testset_handlers(url,testset,vals) {// {{{
1087
1140
  var promises = [];
1088
- $("testset > handlers > *",testset).each(async function(){
1089
- var han = this;
1090
- var suburl = $(han).attr('url');
1091
- if ($.inArray(suburl,vals) == -1) {
1092
- var inp = "url="+encodeURIComponent(suburl).replace(/~/,'%7E');
1093
- $("*",han).each(function(){
1094
- inp += "&topic=" + $(this).attr('topic');
1095
- inp += "&" + this.nodeName + "=" + $(this).text();
1096
- });
1097
- promises.push(
1141
+ $("testset > subscriptions > *",testset).each(async function(){
1142
+ let han = this;
1143
+ let sid = $(han).attr('id');
1144
+ let suburl = $(han).attr('url');
1145
+ if (typeof(vals[suburl]) == 'undefined') {
1146
+ if ($("*",han).length > 0) {
1147
+ let inp = [];
1148
+ if (sid) { inp.push("id="+encodeURIComponent(sid)); }
1149
+ inp = load_testset_extract_handlers(inp,han,suburl);
1150
+ promises.push(
1151
+ $.ajax({
1152
+ type: "POST",
1153
+ url: url + "/notifications/subscriptions/",
1154
+ data: inp.join('&')
1155
+ })
1156
+ )
1157
+ }
1158
+ } else {
1159
+ if ($("*",han).length == 0) {
1098
1160
  $.ajax({
1099
- type: "POST",
1100
- url: url + "/notifications/subscriptions/",
1101
- data: inp
1161
+ type: "DELETE",
1162
+ url: url + "/notifications/subscriptions/" + vals[suburl],
1102
1163
  })
1103
- )
1164
+ } else {
1165
+ let inp = load_testset_extract_handlers([],han,suburl);
1166
+ promises.push(
1167
+ $.ajax({
1168
+ type: "PUT",
1169
+ url: url + "/notifications/subscriptions/" + vals[suburl],
1170
+ data: inp.join('&')
1171
+ })
1172
+ )
1173
+ }
1104
1174
  }
1105
1175
  });
1106
1176
  return Promise.all(promises);
@@ -559,6 +559,8 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
559
559
  if(root.tagName == 'description') { // First parsing {{{
560
560
  pos.row++;
561
561
  $(root).attr('svg-id','description');
562
+ $(root).attr('svg-type','description');
563
+ $(root).attr('svg-subtype','description');
562
564
  group.attr('element-id','group-description');
563
565
  if (illustrator.elements[sname].label) {
564
566
  labels.push({row: pos.row, element_id: 'start', tname: 'start', label: illustrator.elements[sname].label(root)});
@@ -1,12 +1,12 @@
1
- <testset>
2
- <dataelements xmlns="http://cpee.org/ns/properties/2.0"/>
3
- <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
4
- <endpoints xmlns="http://cpee.org/ns/properties/2.0">
5
- <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
6
- <test xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://localhost:9301/</test>
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <executionhandler>ruby</executionhandler>
3
+ <dataelements/>
4
+ <endpoints>
5
+ <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
6
+ <test>http://localhost:9301/</test>
7
7
  </endpoints>
8
- <positions xmlns="http://cpee.org/ns/properties/2.0"/>
9
- <description xmlns="http://cpee.org/ns/properties/2.0">
8
+ <positions/>
9
+ <description>
10
10
  <description xmlns="http://cpee.org/ns/description/1.0">
11
11
  <call id="a1" endpoint="test">
12
12
  <parameters>
@@ -34,13 +34,13 @@
34
34
  </call>
35
35
  </description>
36
36
  </description>
37
- <transformation xmlns="http://cpee.org/ns/properties/2.0">
37
+ <transformation>
38
38
  <description type="copy"/>
39
39
  <dataelements type="none"/>
40
40
  <endpoints type="none"/>
41
41
  </transformation>
42
- <attributes xmlns="http://cpee.org/ns/properties/2.0">
43
- <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Async</info>
44
- <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
42
+ <attributes>
43
+ <info>Async</info>
44
+ <modeltype>CPEE</modeltype>
45
45
  </attributes>
46
46
  </testset>
@@ -1,21 +1,19 @@
1
- <testset>
2
- <attributes xmlns="http://cpee.org/ns/properties/2.0">
3
- <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
4
- <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <executionhandler>ruby</executionhandler>
3
+ <attributes>
4
+ <info>Linear</info>
5
+ <modeltype>CPEE</modeltype>
5
6
  <theme>preset</theme>
6
7
  <bc>operate</bc>
7
8
  </attributes>
8
- <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
9
- <dataelements xmlns="http://cpee.org/ns/properties/2.0">
9
+ <dataelements>
10
10
  <x/>
11
11
  </dataelements>
12
- <!--}}}-->
13
12
  <handlers/>
14
- <endpoints xmlns="http://cpee.org/ns/properties/2.0">
13
+ <endpoints>
15
14
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
16
15
  </endpoints>
17
- <!--}}}-->
18
- <description xmlns="http://cpee.org/ns/properties/2.0">
16
+ <description>
19
17
  <description xmlns="http://cpee.org/ns/description/1.0">
20
18
  <!--{{{-->
21
19
  <call id="a1" endpoint="timeout">
@@ -62,7 +60,7 @@
62
60
  </call>
63
61
  </description>
64
62
  </description>
65
- <transformation xmlns="http://cpee.org/ns/properties/2.0">
63
+ <transformation>
66
64
  <description type="copy"/>
67
65
  <dataelements type="rest"/>
68
66
  <endpoints type="rest"/>
@@ -1,21 +1,19 @@
1
- <testset>
2
- <attributes xmlns="http://cpee.org/ns/properties/2.0">
3
- <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
4
- <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <executionhandler>ruby</executionhandler>
3
+ <attributes>
4
+ <info>Linear</info>
5
+ <modeltype>CPEE</modeltype>
5
6
  <theme>preset</theme>
6
7
  <bc>start</bc>
7
8
  </attributes>
8
- <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
9
- <dataelements xmlns="http://cpee.org/ns/properties/2.0">
9
+ <dataelements>
10
10
  <x/>
11
11
  </dataelements>
12
- <!--}}}-->
13
12
  <handlers/>
14
- <endpoints xmlns="http://cpee.org/ns/properties/2.0">
13
+ <endpoints>
15
14
  <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
16
15
  </endpoints>
17
- <!--}}}-->
18
- <description xmlns="http://cpee.org/ns/properties/2.0">
16
+ <description>
19
17
  <description xmlns="http://cpee.org/ns/description/1.0">
20
18
  <!--{{{-->
21
19
  <call id="a1" endpoint="timeout">
@@ -62,7 +60,7 @@
62
60
  </call>
63
61
  </description>
64
62
  </description>
65
- <transformation xmlns="http://cpee.org/ns/properties/2.0">
63
+ <transformation>
66
64
  <description type="copy"/>
67
65
  <dataelements type="rest"/>
68
66
  <endpoints type="rest"/>
@@ -1,7 +1,7 @@
1
- <testset>
2
- <positions xmlns="http://cpee.org/ns/properties/2.0"/>
3
- <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
4
- <dataelements xmlns="http://cpee.org/ns/properties/2.0">
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <executionhandler>ruby</executionhandler>
3
+ <positions/>
4
+ <dataelements>
5
5
  <losgroesse>3</losgroesse>
6
6
  <spec>12345</spec>
7
7
  <qualitaet>null</qualitaet>
@@ -9,12 +9,12 @@
9
9
  <typ>Typ A</typ>
10
10
  <score>0</score>
11
11
  </dataelements>
12
- <endpoints xmlns="http://cpee.org/ns/properties/2.0">
12
+ <endpoints>
13
13
  <cut>http://gruppe.wst.univie.ac.at/~mangler/services/cut.php</cut>
14
14
  <drill>http://gruppe.wst.univie.ac.at/~mangler/services/drill.php</drill>
15
15
  <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
16
16
  </endpoints>
17
- <description xmlns="http://cpee.org/ns/properties/2.0">
17
+ <description>
18
18
  <description xmlns="http://cpee.org/ns/description/1.0">
19
19
  <call id="a1" endpoint="cut">
20
20
  <parameters>
@@ -67,7 +67,7 @@ data.score += result.value('score').to_f</finalize>
67
67
  </choose>
68
68
  </description>
69
69
  </description>
70
- <transformation xmlns="http://cpee.org/ns/properties/2.0">
70
+ <transformation>
71
71
  <description type="copy"/>
72
72
  <dataelements type="rest"/>
73
73
  <endpoints type="rest"/>
@@ -1,15 +1,15 @@
1
- <testset>
2
- <positions xmlns="http://cpee.org/ns/properties/2.0"/>
3
- <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
4
- <dataelements xmlns="http://cpee.org/ns/properties/2.0">
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <executionhandler>ruby</executionhandler>
3
+ <positions/>
4
+ <dataelements>
5
5
  <persons>3</persons>
6
6
  <hotels>[]</hotels>
7
7
  <costs>0</costs>
8
8
  </dataelements>
9
- <endpoints xmlns="http://cpee.org/ns/properties/2.0">
9
+ <endpoints>
10
10
  <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
11
11
  </endpoints>
12
- <description xmlns="http://cpee.org/ns/properties/2.0">
12
+ <description>
13
13
  <description xmlns="http://cpee.org/ns/description/1.0">
14
14
  <parallel>
15
15
  <loop mode="pre_test" condition="data.persons &gt; 0">
@@ -32,7 +32,7 @@ data.costs += result.value('costs').to_f</finalize>
32
32
  </parallel>
33
33
  </description>
34
34
  </description>
35
- <transformation xmlns="http://cpee.org/ns/properties/2.0">
35
+ <transformation>
36
36
  <description type="copy"/>
37
37
  <dataelements type="rest"/>
38
38
  <endpoints type="rest"/>
@@ -1,7 +1,7 @@
1
- <testset>
2
- <positions xmlns="http://cpee.org/ns/properties/2.0"/>
3
- <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
4
- <dataelements xmlns="http://cpee.org/ns/properties/2.0">
1
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
2
+ <executionhandler>ruby</executionhandler>
3
+ <positions/>
4
+ <dataelements>
5
5
  <persons>3</persons>
6
6
  <card>Visa_12345</card>
7
7
  <airline>null</airline>
@@ -10,12 +10,12 @@
10
10
  <to>Prague</to>
11
11
  <costs>0</costs>
12
12
  </dataelements>
13
- <endpoints xmlns="http://cpee.org/ns/properties/2.0">
13
+ <endpoints>
14
14
  <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
15
15
  <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
16
16
  <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
17
17
  </endpoints>
18
- <description xmlns="http://cpee.org/ns/properties/2.0">
18
+ <description>
19
19
  <description xmlns="http://cpee.org/ns/description/1.0">
20
20
  <call id="a1" endpoint="bookAir">
21
21
  <parameters>
@@ -68,7 +68,7 @@ data.costs += result.value('costs').to_f</finalize>
68
68
  </choose>
69
69
  </description>
70
70
  </description>
71
- <transformation xmlns="http://cpee.org/ns/properties/2.0">
71
+ <transformation>
72
72
  <description type="copy"/>
73
73
  <dataelements type="rest"/>
74
74
  <endpoints type="rest"/>