RubyGems - cpee - Versions diffs - 1.5.24 → 2.0.1 - Mend

cpee 1.5.24 → 2.0.1

Files changed (360) hide show

checksums.yaml +4 -4
data/{FEATURES → FEATURES.md} +7 -6
data/INSTALL.md +1 -0
data/{README → README.md} +3 -3
data/Rakefile +1 -0
data/cockpit/index.html +8 -8
data/cockpit/js/details.js +13 -14
data/cockpit/js/instance.js +192 -290
data/cockpit/js/parameters.js +13 -3
data/cockpit/js/ui.js +2 -2
data/cockpit/rngs/attributes.rng +3 -3
data/cockpit/rngs/dataelements.rng +3 -3
data/cockpit/rngs/endpoints.rng +3 -3
data/cockpit/{testsets → templates.legacy}/Async.xml +7 -7
data/cockpit/{testsets → templates.legacy}/BCO.xml +7 -10
data/cockpit/{testsets → templates.legacy}/BCS.xml +7 -10
data/cockpit/{testsets → templates.legacy}/Centurio.xml +6 -6
data/cockpit/{testsets → templates.legacy}/Concurrent.xml +6 -6
data/cockpit/{testsets → templates.legacy}/Coopis Testset.xml +6 -6
data/cockpit/{testsets → templates.legacy}/Endpoints and Data Manipulation.xml +6 -6
data/cockpit/{testsets → templates.legacy}/ICSOC Testset.xml +6 -6
data/cockpit/{testsets → templates.legacy}/Infinity.xml +3 -3
data/cockpit/{testsets → templates.legacy}/Lego Boxer.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Lego Conveyor.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Lego Crane.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Lego Ejector.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Lego Full.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Lego Liddy.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Lego Plate.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Lego Transporter.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Lego_Part_1.xml +7 -7
data/cockpit/{testsets → templates.legacy}/LgLinear.xml +6 -10
data/cockpit/{testsets → templates.legacy}/Linear.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Log.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Mangler 1.xml +6 -6
data/cockpit/{testsets → templates.legacy}/Mangler 2.xml +6 -6
data/cockpit/{testsets → templates.legacy}/Manuel Labels.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Promise.xml +7 -7
data/cockpit/{testsets → templates.legacy}/SOPROMO Test Sonification.xml +6 -6
data/cockpit/{testsets → templates.legacy}/Subprocess.xml +7 -7
data/cockpit/templates.legacy/Syncing P34 1.xml +77 -0
data/cockpit/templates.legacy/Syncing P34 2.xml +77 -0
data/cockpit/templates.legacy/Syncing P34 3.xml +77 -0
data/cockpit/{testsets → templates.legacy}/Syncing P34.xml +8 -11
data/cockpit/{testsets → templates.legacy}/TEST - Bad Loop.xml +6 -6
data/cockpit/{testsets → templates.legacy}/TEST - Wrong Positions.xml +6 -6
data/cockpit/{testsets → templates.legacy}/Take_5.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Update.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Worklist Parallel.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Worklist Test CPEE.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Worklist Test.xml +7 -7
data/cockpit/{testsets → templates.legacy}/Worklist Test2.xml +7 -7
data/cockpit/templates.legacy/convert_cpee2.rb +15 -0
data/cockpit/{testsets → templates.legacy}/convert_preset.rb +0 -0
data/cockpit/{testsets → templates.legacy}/testsets.xml +1 -1
data/cockpit/{testsets → templates.legacy}/transformations.xml +0 -0
data/cockpit/templates/BPM 2020 Manual Adjust.xml +182 -0
data/cockpit/templates/BPM 2020 Solution Baseline.xml +196 -0
data/cockpit/templates/BPM 2020 Solution NN.xml +197 -0
data/cockpit/templates/BPM 2020 Solution View.xml +144 -0
data/cockpit/templates/BPM 2020.xml +26 -0
data/cockpit/templates/Coopis 2010.xml +76 -0
data/cockpit/{testsets/Syncing P34 1.xml → templates/IUPC arXiv:1104.3609 P34 1.xml } +7 -10
data/cockpit/{testsets/Syncing P34 2.xml → templates/IUPC arXiv:1104.3609 P34 2.xml } +7 -10
data/cockpit/{testsets/Syncing P34 3.xml → templates/IUPC arXiv:1104.3609 P34 3.xml } +7 -10
data/cockpit/templates/Worklist.xml +42 -0
data/cockpit/templates/convert_cpee2.rb +15 -0
data/cockpit/themes/compact/rngs/alternative.rng +25 -0
data/cockpit/themes/compact/rngs/call.rng +19 -13
data/cockpit/themes/compact/rngs/callmanipulate.rng +28 -22
data/cockpit/themes/compact/rngs/choose.rng +14 -0
data/cockpit/themes/compact/rngs/critical.rng +5 -0
data/cockpit/themes/compact/rngs/escape.rng +1 -0
data/cockpit/themes/compact/rngs/group.rng +3 -0
data/cockpit/themes/compact/rngs/loop.rng +22 -0
data/cockpit/themes/compact/rngs/manipulate.rng +9 -0
data/cockpit/themes/compact/rngs/otherwise.rng +22 -0
data/cockpit/themes/compact/rngs/parallel.rng +21 -0
data/cockpit/themes/compact/rngs/parallel_branch.rng +8 -0
data/cockpit/themes/compact/rngs/scripts.rng +10 -11
data/cockpit/themes/compact/rngs/stop.rng +5 -0
data/cockpit/themes/compact/rngs/terminate.rng +1 -0
data/cockpit/themes/compact/theme.js +1 -1
data/cockpit/themes/convert_cpee2.rb +8 -0
data/cockpit/themes/default/rngs/alternative.rng +8 -8
data/cockpit/themes/default/rngs/call.rng +84 -48
data/cockpit/themes/default/rngs/callmanipulate.rng +103 -64
data/cockpit/themes/default/rngs/choose.rng +5 -3
data/cockpit/themes/default/rngs/critical.rng +2 -2
data/cockpit/themes/default/rngs/escape.rng +1 -1
data/cockpit/themes/default/rngs/group.rng +3 -3
data/cockpit/themes/default/rngs/loop.rng +8 -8
data/cockpit/themes/default/rngs/manipulate.rng +3 -3
data/cockpit/themes/default/rngs/otherwise.rng +8 -8
data/cockpit/themes/default/rngs/parallel.rng +14 -6
data/cockpit/themes/default/rngs/parallel_branch.rng +2 -2
data/cockpit/themes/default/rngs/scripts.rng +23 -0
data/cockpit/themes/default/rngs/stop.rng +2 -2
data/cockpit/themes/default/rngs/terminate.rng +1 -1
data/cockpit/themes/extended/rngs/alternative.rng +25 -0
data/cockpit/themes/extended/rngs/call.rng +19 -13
data/cockpit/themes/extended/rngs/callmanipulate.rng +28 -22
data/cockpit/themes/extended/rngs/choose.rng +14 -0
data/cockpit/themes/extended/rngs/critical.rng +5 -0
data/cockpit/themes/extended/rngs/escape.rng +1 -0
data/cockpit/themes/extended/rngs/group.rng +3 -0
data/cockpit/themes/extended/rngs/loop.rng +22 -0
data/cockpit/themes/extended/rngs/manipulate.rng +9 -0
data/cockpit/themes/extended/rngs/otherwise.rng +22 -0
data/cockpit/themes/extended/rngs/parallel.rng +21 -0
data/cockpit/themes/extended/rngs/parallel_branch.rng +8 -0
data/cockpit/themes/extended/rngs/scripts.rng +10 -11
data/cockpit/themes/extended/rngs/stop.rng +5 -0
data/cockpit/themes/extended/rngs/terminate.rng +1 -0
data/cockpit/themes/extended/theme.js +14 -28
data/cockpit/themes/model/rngs/alternative.rng +1 -1
data/cockpit/themes/model/rngs/call.rng +16 -16
data/cockpit/themes/model/rngs/callmanipulate.rng +17 -17
data/cockpit/themes/model/rngs/choose.rng +1 -1
data/cockpit/themes/model/rngs/critical.rng +1 -1
data/cockpit/themes/model/rngs/escape.rng +1 -1
data/cockpit/themes/model/rngs/group.rng +1 -1
data/cockpit/themes/model/rngs/loop.rng +1 -1
data/cockpit/themes/model/rngs/manipulate.rng +1 -1
data/cockpit/themes/model/rngs/otherwise.rng +1 -1
data/cockpit/themes/model/rngs/parallel.rng +1 -1
data/cockpit/themes/model/rngs/parallel_branch.rng +1 -1
data/cockpit/themes/model/rngs/scripts.rng +3 -4
data/cockpit/themes/model/rngs/stop.rng +1 -1
data/cockpit/themes/model/rngs/terminate.rng +1 -1
data/cockpit/themes/model/theme.js +8 -7
data/cockpit/themes/packed/rngs/alternative.rng +25 -0
data/cockpit/themes/packed/rngs/call.rng +19 -13
data/cockpit/themes/packed/rngs/callmanipulate.rng +28 -22
data/cockpit/themes/packed/rngs/choose.rng +14 -0
data/cockpit/themes/packed/rngs/critical.rng +5 -0
data/cockpit/themes/packed/rngs/escape.rng +1 -0
data/cockpit/themes/packed/rngs/group.rng +3 -0
data/cockpit/themes/packed/rngs/loop.rng +22 -0
data/cockpit/themes/packed/rngs/manipulate.rng +9 -0
data/cockpit/themes/packed/rngs/otherwise.rng +22 -0
data/cockpit/themes/packed/rngs/parallel.rng +21 -0
data/cockpit/themes/packed/rngs/parallel_branch.rng +8 -0
data/cockpit/themes/packed/rngs/scripts.rng +10 -11
data/cockpit/themes/packed/rngs/stop.rng +5 -0
data/cockpit/themes/packed/rngs/terminate.rng +1 -0
data/cockpit/themes/packed/theme.js +8 -7
data/cockpit/themes/preset/rngs/alternative.rng +25 -0
data/cockpit/themes/preset/rngs/call.rng +19 -13
data/cockpit/themes/preset/rngs/callmanipulate.rng +28 -22
data/cockpit/themes/preset/rngs/choose.rng +14 -0
data/cockpit/themes/preset/rngs/critical.rng +5 -0
data/cockpit/themes/preset/rngs/escape.rng +1 -0
data/cockpit/themes/preset/rngs/group.rng +3 -0
data/cockpit/themes/preset/rngs/loop.rng +22 -0
data/cockpit/themes/preset/rngs/manipulate.rng +9 -0
data/cockpit/themes/preset/rngs/otherwise.rng +22 -0
data/cockpit/themes/preset/rngs/parallel.rng +21 -0
data/cockpit/themes/preset/rngs/parallel_branch.rng +8 -0
data/cockpit/themes/preset/rngs/scripts.rng +10 -11
data/cockpit/themes/preset/rngs/stop.rng +5 -0
data/cockpit/themes/preset/rngs/terminate.rng +1 -0
data/cockpit/themes/preset/theme.js +8 -7
data/cpee.gemspec +10 -11
data/{log/topics.xml → lib/callbacks.xml} +16 -6
data/lib/{engine → callbacks}/callbacks.rng +2 -8
data/lib/cpee.xml +10 -4
data/lib/cpee/attributes_helper.rb +27 -0
data/lib/cpee/controller.rb +113 -596
data/lib/cpee/implementation.rb +166 -191
data/lib/cpee/implementation_callbacks.rb +77 -0
data/lib/cpee/implementation_notifications.rb +189 -0
data/lib/cpee/implementation_properties.rb +711 -0
data/lib/cpee/{callback.rb → message.rb} +20 -18
data/lib/cpee/persistence.rb +135 -0
data/lib/cpee/statemachine.rb +20 -0
data/lib/cpee/transform.rb +95 -0
data/lib/engine.xml +1 -59
data/lib/properties.xml +236 -0
data/lib/properties/arbitrary.rng +26 -0
data/lib/properties/attributes.rng +10 -0
data/lib/properties/dataelements.rng +10 -0
data/lib/properties/description.rng +8 -0
data/lib/properties/dsl.rng +7 -0
data/lib/properties/dslx.rng +8 -0
data/lib/properties/endpoints.rng +10 -0
data/lib/properties/handlerwrapper.rng +9 -0
data/lib/properties/position.rng +15 -0
data/lib/properties/positions.rng +10 -0
data/lib/properties/properties.rng +29 -0
data/lib/properties/set-properties.rng +25 -0
data/lib/properties/set-some-properties.rng +45 -0
data/lib/properties/simple.rng +8 -0
data/lib/properties/state.rng +33 -0
data/lib/properties/status.rng +12 -0
data/lib/properties/t_attributes.rng +7 -0
data/lib/properties/t_dataelements.rng +7 -0
data/lib/properties/t_endpoints.rng +7 -0
data/lib/properties/t_position.rng +7 -0
data/lib/properties/t_positions.rng +7 -0
data/lib/properties/t_simple.rng +7 -0
data/lib/properties/t_status.rng +7 -0
data/lib/properties/t_transformation.rng +7 -0
data/lib/properties/transformation.rng +40 -0
data/server/dev.rb +1 -0
data/server/handlerwrappers/default.rb +40 -38
data/server/resources/backend/README.md +17 -0
data/server/resources/backend/instance.rb +23 -0
data/server/resources/backend/instance.template +19 -0
data/server/resources/backend/opts.yaml +6 -0
data/server/resources/backend/run +33 -0
data/server/resources/notifications/logging/subscription.xml +1 -1
data/server/resources/properties.empty +38 -0
data/server/resources/properties.init +11 -11
data/server/resources/states.dot +19 -0
data/server/resources/states.xml +49 -0
data/server/resources/transformation_dslx.xsl +12 -3
data/server/routing/end.rb +44 -0
data/server/routing/forward-events.rb +59 -0
data/server/routing/forward-votes.rb +108 -0
data/server/routing/persist.rb +155 -0
data/server/server.rb +1 -0
data/tools/cpee +19 -15
metadata +127 -177
data/INSTALL +0 -23
data/cockpit/test.html +0 -40
data/cockpit/themes/compact/rngs/alternative.rng +0 -1
data/cockpit/themes/compact/rngs/choose.rng +0 -1
data/cockpit/themes/compact/rngs/critical.rng +0 -1
data/cockpit/themes/compact/rngs/escape.rng +0 -1
data/cockpit/themes/compact/rngs/group.rng +0 -1
data/cockpit/themes/compact/rngs/loop.rng +0 -1
data/cockpit/themes/compact/rngs/manipulate.rng +0 -1
data/cockpit/themes/compact/rngs/otherwise.rng +0 -1
data/cockpit/themes/compact/rngs/parallel.rng +0 -1
data/cockpit/themes/compact/rngs/parallel_branch.rng +0 -1
data/cockpit/themes/compact/rngs/stop.rng +0 -1
data/cockpit/themes/compact/rngs/terminate.rng +0 -1
data/cockpit/themes/default/rngs/finalize.rng +0 -6
data/cockpit/themes/default/rngs/update.rng +0 -6
data/cockpit/themes/default/theme.js +0 -1286
data/cockpit/themes/extended/rngs/alternative.rng +0 -1
data/cockpit/themes/extended/rngs/choose.rng +0 -1
data/cockpit/themes/extended/rngs/critical.rng +0 -1
data/cockpit/themes/extended/rngs/escape.rng +0 -1
data/cockpit/themes/extended/rngs/group.rng +0 -1
data/cockpit/themes/extended/rngs/loop.rng +0 -1
data/cockpit/themes/extended/rngs/manipulate.rng +0 -1
data/cockpit/themes/extended/rngs/otherwise.rng +0 -1
data/cockpit/themes/extended/rngs/parallel.rng +0 -1
data/cockpit/themes/extended/rngs/parallel_branch.rng +0 -1
data/cockpit/themes/extended/rngs/stop.rng +0 -1
data/cockpit/themes/extended/rngs/terminate.rng +0 -1
data/cockpit/themes/labels/rngs/alternative.rng +0 -25
data/cockpit/themes/labels/rngs/call.rng +0 -81
data/cockpit/themes/labels/rngs/callmanipulate.rng +0 -101
data/cockpit/themes/labels/rngs/choose.rng +0 -12
data/cockpit/themes/labels/rngs/critical.rng +0 -5
data/cockpit/themes/labels/rngs/escape.rng +0 -1
data/cockpit/themes/labels/rngs/finalize.rng +0 -6
data/cockpit/themes/labels/rngs/group.rng +0 -3
data/cockpit/themes/labels/rngs/loop.rng +0 -22
data/cockpit/themes/labels/rngs/manipulate.rng +0 -9
data/cockpit/themes/labels/rngs/otherwise.rng +0 -22
data/cockpit/themes/labels/rngs/parallel.rng +0 -13
data/cockpit/themes/labels/rngs/parallel_branch.rng +0 -8
data/cockpit/themes/labels/rngs/stop.rng +0 -5
data/cockpit/themes/labels/rngs/terminate.rng +0 -1
data/cockpit/themes/labels/rngs/update.rng +0 -6
data/cockpit/themes/labels/symbols/alternative.svg +0 -5
data/cockpit/themes/labels/symbols/arrow.svg +0 -3
data/cockpit/themes/labels/symbols/call.svg +0 -6
data/cockpit/themes/labels/symbols/callmanipulate.svg +0 -8
data/cockpit/themes/labels/symbols/choose.svg +0 -5
data/cockpit/themes/labels/symbols/choose_exclusive.svg +0 -5
data/cockpit/themes/labels/symbols/choose_inclusive.svg +0 -4
data/cockpit/themes/labels/symbols/complex.svg +0 -8
data/cockpit/themes/labels/symbols/critical.svg +0 -4
data/cockpit/themes/labels/symbols/end.svg +0 -3
data/cockpit/themes/labels/symbols/escape.svg +0 -5
data/cockpit/themes/labels/symbols/event_end.svg +0 -3
data/cockpit/themes/labels/symbols/loop.svg +0 -5
data/cockpit/themes/labels/symbols/manipulate.svg +0 -4
data/cockpit/themes/labels/symbols/otherwise.svg +0 -5
data/cockpit/themes/labels/symbols/parallel.svg +0 -5
data/cockpit/themes/labels/symbols/parallel_branch.svg +0 -5
data/cockpit/themes/labels/symbols/parallel_branch_compact.svg +0 -4
data/cockpit/themes/labels/symbols/parallel_branch_event.svg +0 -14
data/cockpit/themes/labels/symbols/parallel_branch_normal.svg +0 -5
data/cockpit/themes/labels/symbols/scripts.svg +0 -4
data/cockpit/themes/labels/symbols/start.svg +0 -3
data/cockpit/themes/labels/symbols/stop.svg +0 -5
data/cockpit/themes/labels/symbols/terminate.svg +0 -4
data/cockpit/themes/packed/rngs/alternative.rng +0 -1
data/cockpit/themes/packed/rngs/choose.rng +0 -1
data/cockpit/themes/packed/rngs/critical.rng +0 -1
data/cockpit/themes/packed/rngs/escape.rng +0 -1
data/cockpit/themes/packed/rngs/group.rng +0 -1
data/cockpit/themes/packed/rngs/loop.rng +0 -1
data/cockpit/themes/packed/rngs/manipulate.rng +0 -1
data/cockpit/themes/packed/rngs/otherwise.rng +0 -1
data/cockpit/themes/packed/rngs/parallel.rng +0 -1
data/cockpit/themes/packed/rngs/parallel_branch.rng +0 -1
data/cockpit/themes/packed/rngs/stop.rng +0 -1
data/cockpit/themes/packed/rngs/terminate.rng +0 -1
data/cockpit/themes/preset/rngs/alternative.rng +0 -1
data/cockpit/themes/preset/rngs/choose.rng +0 -1
data/cockpit/themes/preset/rngs/critical.rng +0 -1
data/cockpit/themes/preset/rngs/escape.rng +0 -1
data/cockpit/themes/preset/rngs/group.rng +0 -1
data/cockpit/themes/preset/rngs/loop.rng +0 -1
data/cockpit/themes/preset/rngs/manipulate.rng +0 -1
data/cockpit/themes/preset/rngs/otherwise.rng +0 -1
data/cockpit/themes/preset/rngs/parallel.rng +0 -1
data/cockpit/themes/preset/rngs/parallel_branch.rng +0 -1
data/cockpit/themes/preset/rngs/stop.rng +0 -1
data/cockpit/themes/preset/rngs/terminate.rng +0 -1
data/lib/cpee/empty_workflow.rb +0 -28
data/lib/cpee/handler_notifications.rb +0 -47
data/lib/cpee/handler_properties.rb +0 -50
data/lib/cpee/instantiation.rb +0 -369
data/lib/cpee/processtransformation/bpel/Repository/booking.bpel +0 -125
data/lib/cpee/processtransformation/bpel/Repository/booking.wsdl +0 -72
data/lib/cpee/processtransformation/bpel/Repository/booking/airline.wsdl +0 -71
data/lib/cpee/processtransformation/bpel/Repository/booking/hotel.wsdl +0 -64
data/lib/cpee/processtransformation/bpel/Repository/booking/report.wsdl +0 -71
data/lib/cpee/processtransformation/bpel/bpel2wee.rb +0 -34
data/lib/cpee/processtransformation/bpel/bpelserver.ru +0 -64
data/lib/cpee/processtransformation/bpel/bpelserver.xml +0 -70
data/lib/cpee/processtransformation/bpel/lib/BPEL_Transform.rb +0 -367
data/lib/cpee/processtransformation/bpmn2.rb +0 -297
data/lib/cpee/processtransformation/cpee.rb +0 -119
data/lib/cpee/processtransformation/structures.rb +0 -465
data/lib/cpee/processtransformation/target.rb +0 -50
data/log/azure.rb +0 -10
data/log/azure_logger.rb +0 -136
data/log/chain.xml +0 -27
data/log/elasticsearch.rb +0 -15
data/log/elasticsearch_logging.rb +0 -377
data/log/legacy/test_es.rb +0 -26
data/log/legacy/test_split.rb +0 -211
data/log/log.xml +0 -13
data/log/non_tamp.rb +0 -156
data/log/sic.rb +0 -63
data/log/template.xes_xml +0 -23
data/log/template.xes_yaml +0 -28
data/log/trace.yaml +0 -17717
data/log/trace_sic.yaml +0 -18343
data/log/xes_xml.rb +0 -121
data/log/xes_yaml.rb +0 -96
data/server/handlerwrappers/soap.rb +0 -146
data/server/resources/notifications/logging/consumer-secret +0 -1
data/server/resources/notifications/logging/producer-secret +0 -1
data/server/resources/properties.schema.active +0 -139
data/server/resources/properties.schema.finished +0 -139
data/server/resources/properties.schema.inactive +0 -136
data/server/resources/test1.xml +0 -58
data/server/resources/test2.xml +0 -60
data/server/resources/test3.xml +0 -217
data/test/callback.rb +0 -9

data/cockpit/themes/compact/rngs/parallel_branch.rng ADDED

@@ -0,0 +1,8 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="parallel_branch" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="pass" rngui:label="Pass to branch">
+    <data type="string" rngui:label="Data element passed to the local scope, thus not affected by global changes ..."/>
+  </attribute>
+  <attribute name="local" rngui:label="Local scope">
+    <data type="string" rngui:label="Name of the passed data element in the local scope ..."/>
+  </attribute>
+</element>

data/cockpit/themes/compact/rngs/scripts.rng CHANGED

@@ -1,24 +1,23 @@
-<element rngui:version="1.2" name="code" rngui:header="Implementation" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
-  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold='closed_conditional'>
-    <text rngui:label='Script that is executed, before a service call'/>
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="code" rngui:header="Implementation" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
+    <text rngui:label="Script that is executed, before a service call"/>
   </element>
-  <element name="finalize" rngui:header="Finalize" rngui:label="Code" rngui:fold='closed_conditional'>
+  <element name="finalize" rngui:header="Finalize" rngui:label="Code" rngui:fold="closed_conditional">
     <attribute name="output" rngui:label="Access Variable" rngui:default="result">
       <data type="string" rngui:readonly="true"/>
     </attribute>
-    <text rngui:label='Script that is executed, when a service returns data'/>
+    <text rngui:label="Script that is executed, when a service returns data"/>
   </element>
-  <element name="update" rngui:header="Update" rngui:label="Code" rngui:fold='closed_conditional'>
+  <element name="update" rngui:header="Update" rngui:label="Code" rngui:fold="closed_conditional">
     <attribute name="output" rngui:label="Access Variable" rngui:default="result">
       <data type="string" rngui:readonly="true"/>
     </attribute>
-    <text rngui:label='Script that is executed, when a service sends intermediate data'/>
+    <text rngui:label="Script that is executed, when a service sends intermediate data"/>
   </element>
-  <element name="rescue" rngui:header="Rescue" rngui:label="Code" rngui:fold='closed_conditional'>
+  <element name="rescue" rngui:header="Rescue" rngui:label="Code" rngui:fold="closed_conditional">
     <attribute name="output" rngui:label="Access Variable" rngui:default="result">
       <data type="string" rngui:readonly="true"/>
     </attribute>
-    <text rngui:label='Script that is executed, if a service call fails'/>
+    <text rngui:label="Script that is executed, if a service call fails"/>
   </element>
-</element>
+</element>

data/cockpit/themes/compact/rngs/stop.rng ADDED

@@ -0,0 +1,5 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="stop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
+    <data type="string" rngui:readonly="true"/>
+  </attribute>
+</element>

data/cockpit/themes/compact/rngs/terminate.rng ADDED

	@@ -0,0 +1 @@
1	+ <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="terminate" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0"/>

data/cockpit/themes/compact/theme.js CHANGED

@@ -65,7 +65,7 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
-      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+      if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);

data/cockpit/themes/convert_cpee2.rb ADDED

@@ -0,0 +1,8 @@
+#!/usr/bin/ruby
+require 'xml/smart'
+Dir['*.rng'].each do |f|
+  XML::Smart.modify(f) do |doc|
+    doc.root.attributes['ns'] = 'http://cpee.org/ns/description/1.0'
+  end
+end

data/cockpit/themes/default/rngs/alternative.rng CHANGED

@@ -1,25 +1,25 @@
-<element rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="alternative" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
   <attribute name="condition" rngui:label="Condition">
     <data type="string" rngui:label="Condition"/>
   </attribute>
   <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
-    <element name="_probability_min" rngui:label='Min in %'>
-      <data type='integer' rngui:label='Percent 0-100'>
+    <element name="_probability_min" rngui:label="Min in %">
+      <data type="integer" rngui:label="Percent 0-100">
         <param name="minInclusive">1</param>
         <param name="maxInclusive">100</param>
       </data>
     </element>
-    <element name="_probability_max" rngui:label='Max in %'>
-      <data type='integer' rngui:label='Percent 0-100'>
+    <element name="_probability_max" rngui:label="Max in %">
+      <data type="integer" rngui:label="Percent 0-100">
         <param name="minInclusive">1</param>
         <param name="maxInclusive">100</param>
       </data>
     </element>
-    <element name="_probability_avg" rngui:label='Avg in %'>
-      <data type='integer' rngui:label='Percent 0-100'>
+    <element name="_probability_avg" rngui:label="Avg in %">
+      <data type="integer" rngui:label="Percent 0-100">
         <param name="minInclusive">1</param>
         <param name="maxInclusive">100</param>
       </data>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/default/rngs/call.rng CHANGED

@@ -1,11 +1,11 @@
-<element rngui:version="1.2" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
     <data type="string"/>
   </attribute>
-  <element name='parameters' rngui:header="Parameters">
+  <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
       <data type="string" rngui:label="Short description of the task"/>
     </element>
@@ -19,63 +19,99 @@
     </element>
     <element name="arguments" rngui:header="Arguments">
       <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label='Name' rngui:labeltype='xml'>
+        <element rngui:label="Name" rngui:labeltype="xml">
           <anyName/>
           <data type="string" rngui:label="Value"/>
         </element>
       </zeroOrMore>
     </element>
-    <element name="sensors" rngui:header="Sensors">
-      <zeroOrMore rngui:label="Add Sensor">
-        <element name="sensor">
-          <element name="name" rngui:label="Label">
-            <data type="string" rngui:label="Label"/>
+    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Sensor">
+          <element name="sensor">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="extractor_arg" rngui:label="Extractor Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+            <element name="visualizer_url" rngui:label="Visualizer Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="visualizer_params" rngui:header="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
           </element>
-          <element name="extractor_url" rngui:label="Extractor Url">
-            <data type="string" rngui:label="Url"/>
+        </zeroOrMore>
+      </element>
+      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Aggregator">
+          <element name="aggregator">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="aggregator_url" rngui:label="Aggregator Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="aggregator_arg" rngui:label="Aggregator Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
           </element>
-          <element name="extractor_arg" rngui:label="Extractor Argument">
-            <data type="string" rngui:label="Path"/>
+        </zeroOrMore>
+      </element>
+      <element name="costs" rngui:header="Costs" rngui:fold="closed">
+        <zeroOrMore rngui:label="Create Cost Factor">
+          <element name="cost_factor">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="target" rngui:label="Target Value">
+              <data type="string" rngui:label="Value"/>
+            </element>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vfunc_arg" rngui:label="Violation Function Argument">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vcost" rngui:label="Violation Cost">
+              <data type="string" rngui:label="Value"/>
+            </element>
           </element>
-          <element name="visualizer_url" rngui:label="Visualizer Url">
-            <data type="string" rngui:label="Url"/>
-          </element>
-          <element name="visualizer_params" rngui:header="Visualizer Arguments">
-            <zeroOrMore rngui:label="Create Argument Pair">
-              <element rngui:label='Name'>
-                <anyName/>
-                <data type="string" rngui:label="Value"/>
-              </element>
-            </zeroOrMore>
-          </element>
-        </element>
-      </zeroOrMore>
-    </element>
-  </element>
-  <element name="_timing" rngui:header="Timing">
-    <element name="_timing_min" rngui:label='Min in min'>
-      <data type='float' rngui:label='Minutes'/>
-    </element>
-    <element name="_timing_max" rngui:label='Max in min'>
-      <data type='float' rngui:label='Minutes'/>
-    </element>
-    <element name="_timing_avg" rngui:label='Avg in min'>
-      <data type='float' rngui:label='Minutes'/>
+        </zeroOrMore>
+      </element>
     </element>
   </element>
-  <element name="_notes" rngui:header="Notes">
-    <element name="_notes_general" rngui:label='General'>
-      <text rngui:wrap='true' rngui:label='Notes'/>
+  <element name="annotations" rngui:header="Annotations">
+    <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
+        <data type="float" rngui:label="[0,1]" rngui:default="0.5"/>
+      </element>
+      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
+        <data type="float" rngui:label="[0,3,n]" rngui:default="3"/>
+      </element>
+      <element name="_timing_min" rngui:label="Min in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+      <element name="_timing_max" rngui:label="Max in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+      <element name="_timing_avg" rngui:label="Avg in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
     </element>
-    <element name="_attachments">
-      <zeroOrMore rngui:label="Create Attachment">
-        <element name='_attachment' rngui:label='Attachment'>
-          <attribute name="label" rngui:label="Note">
-            <data type="string"/>
-          </attribute>
-          <data type="string" rngui:label="Url"/>
-        </element>
-      </zeroOrMore>
+    <element name="_notes" rngui:header="Notes" rngui:fold="closed">
+      <element name="_notes_general" rngui:label="General">
+        <text rngui:wrap="true" rngui:label="Notes"/>
+      </element>
     </element>
   </element>
 </element>

data/cockpit/themes/default/rngs/callmanipulate.rng CHANGED

@@ -1,11 +1,11 @@
-<element rngui:version="1.2" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
     <data type="string"/>
   </attribute>
-  <element name='parameters' rngui:header="Parameters">
+  <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">
       <data type="string" rngui:label="Short description of the task"/>
     </element>
@@ -19,83 +19,122 @@
     </element>
     <element name="arguments" rngui:header="Arguments">
       <zeroOrMore rngui:label="Create Argument Pair">
-        <element rngui:label='Name' rngui:labeltype='xml'>
+        <element rngui:label="Name" rngui:labeltype="xml">
           <anyName/>
           <data type="string" rngui:label="Value"/>
         </element>
       </zeroOrMore>
     </element>
-    <element name="sensors" rngui:header="Sensors">
-      <zeroOrMore rngui:label="Add Sensor">
-        <element name="sensor">
-          <element name="name" rngui:label="Label">
-            <data type="string" rngui:label="Label"/>
+    <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
+      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Sensor">
+          <element name="sensor">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="extractor_arg" rngui:label="Extractor Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
+            <element name="visualizer_url" rngui:label="Visualizer Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="visualizer_params" rngui:header="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
           </element>
-          <element name="extractor_url" rngui:label="Extractor Url">
-            <data type="string" rngui:label="Url"/>
-          </element>
-          <element name="extractor_arg" rngui:label="Extractor Argument">
-            <data type="string" rngui:label="Path"/>
-          </element>
-          <element name="visualizer_url" rngui:label="Visualizer Url">
-            <data type="string" rngui:label="Url"/>
+        </zeroOrMore>
+      </element>
+      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Aggregator">
+          <element name="aggregator">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="aggregator_url" rngui:label="Aggregator Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="aggregator_arg" rngui:label="Aggregator Argument">
+              <data type="string" rngui:label="Value / Json"/>
+            </element>
           </element>
-          <element name="visualizer_params" rngui:header="Visualizer Arguments">
-            <zeroOrMore rngui:label="Create Argument Pair">
-              <element rngui:label='Name'>
-                <anyName/>
-                <data type="string" rngui:label="Value"/>
-              </element>
-            </zeroOrMore>
+        </zeroOrMore>
+      </element>
+      <element name="costs" rngui:header="Costs" rngui:fold="closed">
+        <zeroOrMore rngui:label="Create Cost Factor">
+          <element name="cost_factor">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="target" rngui:label="Target Value">
+              <data type="string" rngui:label="Value"/>
+            </element>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vfunc_arg" rngui:label="Violation Function Argument">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="vcost" rngui:label="Violation Cost">
+              <data type="string" rngui:label="Value"/>
+            </element>
           </element>
-        </element>
-      </zeroOrMore>
-    </element>
-    <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
-      <element name="url" rngui:label='HTML Snippet'>
-        <data type="string" rngui:label="url to report snippet"/>
+        </zeroOrMore>
       </element>
     </element>
   </element>
-  <element name="finalize" rngui:header="Finalize" rngui:label="Code">
-    <attribute name="output" rngui:label="Access Variable" rngui:default="result">
-      <data type="string" rngui:readonly="true"/>
-    </attribute>
-    <text rngui:label='Script that is executed, when a service returns data'/>
-  </element>
-  <element name="update" rngui:header="Update" rngui:label="Code">
-    <attribute name="output" rngui:label="Access Variable" rngui:default="result">
-      <data type="string" rngui:readonly="true"/>
-    </attribute>
-    <text rngui:label='Script that is executed, when a service sends intermediate data'/>
-  </element>
-  <element name="_timing" rngui:header="Timing">
-    <element name="_timing_min" rngui:label='Min in min'>
-      <data type='float' rngui:label='Minutes'/>
+  <element name="code" rngui:header="Implementation">
+    <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
+      <text rngui:label="Script that is executed, before a service call"/>
     </element>
-    <element name="_timing_max" rngui:label='Max in min'>
-      <data type='float' rngui:label='Minutes'/>
+    <element name="finalize" rngui:header="Finalize" rngui:label="Code" rngui:fold="closed_conditional">
+      <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+        <data type="string" rngui:readonly="true"/>
+      </attribute>
+      <text rngui:label="Script that is executed, when a service returns data"/>
     </element>
-    <element name="_timing_avg" rngui:label='Avg in min'>
-      <data type='float' rngui:label='Minutes'/>
+    <element name="update" rngui:header="Update" rngui:label="Code" rngui:fold="closed_conditional">
+      <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+        <data type="string" rngui:readonly="true"/>
+      </attribute>
+      <text rngui:label="Script that is executed, when a service sends intermediate data"/>
     </element>
-  </element>
-  <element name="_notes" rngui:header="Notes">
-    <element name="_notes_general" rngui:label='General'>
-      <text rngui:wrap='true' rngui:label='Notes'/>
+    <element name="rescue" rngui:header="Rescue" rngui:label="Code" rngui:fold="closed_conditional">
+      <attribute name="output" rngui:label="Access Variable" rngui:default="result">
+        <data type="string" rngui:readonly="true"/>
+      </attribute>
+      <text rngui:label="Script that is executed, if a service call fails"/>
     </element>
-    <element name="_notes_output" rngui:label='Output'>
-      <text rngui:wrap='true' rngui:label='Notes'/>
+  </element>
+  <element name="annotations" rngui:header="Annotations">
+    <element name="_timing" rngui:header="Timing" rngui:fold="closed">
+      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
+        <data type="float" rngui:label="[0,1]"/>
+      </element>
+      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
+        <data type="float" rngui:label="[0,3,n]"/>
+      </element>
+      <element name="_timing_min" rngui:label="Min in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+      <element name="_timing_max" rngui:label="Max in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
+      <element name="_timing_avg" rngui:label="Avg in min">
+        <data type="float" rngui:label="Minutes"/>
+      </element>
     </element>
-    <element name="_attachments">
-      <zeroOrMore rngui:label="Create Attachment">
-        <element name='_attachment' rngui:label='Attachment'>
-          <attribute name="label" rngui:label="Note">
-            <data type="string"/>
-          </attribute>
-          <data type="string" rngui:label="Url"/>
-        </element>
-      </zeroOrMore>
+    <element name="_notes" rngui:header="Notes" rngui:fold="closed">
+      <element name="_notes_general" rngui:label="General">
+        <text rngui:wrap="true" rngui:label="Notes"/>
+      </element>
     </element>
   </element>
-</element>
+</element>