cpee 2.0.26 → 2.1.1

data/cockpit/templates/IUPC arXiv:1104.3609 P34 3.xml

@@ -1,28 +1,29 @@
-<testset>
-  <attributes xmlns="http://cpee.org/ns/properties/2.0">
-    <info>Syncing Instance 3</info>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <attributes>
+    <info>IUPC arXiv:1104.3609 P34 3</info>
     <modeltype>CPEE</modeltype>
     <theme>preset</theme>
+    <creator>Christine Ashcreek</creator>
+    <author>Christine Ashcreek</author>
+    <design_stage>development</design_stage>
+    <design_dir>Templates.dir</design_dir>
   </attributes>
-  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
-  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
-  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
+  <positions/>
+  <dataelements>
     <x/>
   </dataelements>
-  <!--}}}-->
   <handlers>
     <!--{{{-->
     <handler url="http://localhost:9399/1/events">
       <votes topic="activity">syncing_before,syncing_after</votes>
     </handler>
   </handlers>
-  <!--}}}-->
-  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
+  <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
     <timeouts>http://gruppe.wst.univie.ac.at/~mangler/services/timeout-sync.php</timeouts>
   </endpoints>
-  <!--}}}-->
-  <description xmlns="http://cpee.org/ns/properties/2.0">
+  <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <!--{{{-->
       <call id="a1" endpoint="timeout">
@@ -69,7 +70,7 @@
       </call>
     </description>
   </description>
-  <transformation xmlns="http://cpee.org/ns/properties/2.0">
+  <transformation>
     <description type="copy"/>
     <dataelements type="rest"/>
     <endpoints type="rest"/>

data/cockpit/templates/Track Test Local.xml

@@ -1,10 +1,10 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements>
     <i>0</i>
   </dataelements>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
-    <start_url>http://localhost:9296/url/</start_url>
+    <start_url>https://cpee.org/flow/start/url/</start_url>
   </endpoints>
   <positions/>
   <description>
@@ -81,6 +81,6 @@
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <design_stage>development</design_stage>
-    <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
+    <design_dir>Templates.dir</design_dir>
   </attributes>
 </testset>

data/cockpit/templates/Track Test.xml

@@ -1,8 +1,8 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements>
     <i>0</i>
   </dataelements>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <start_url>https://cpee.org/flow/start/url/</start_url>
   </endpoints>
@@ -81,6 +81,6 @@
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <design_stage>development</design_stage>
-    <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
+    <design_dir>Templates.dir</design_dir>
   </attributes>
 </testset>

data/cockpit/templates/UR-VUE 2020 Manual Adjust.xml

@@ -1,6 +1,6 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <overview>http-put://ryloth.wst.univie.ac.at:9329/move/overview</overview>
     <move_tool>http-put://ryloth.wst.univie.ac.at:9329/move/position/point</move_tool>
@@ -181,6 +181,6 @@ data.item['adjust_y'] = (data.direction_first['y'] + data.direction_second['y'])
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <design_stage>development</design_stage>
-    <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
+    <design_dir>Templates.dir</design_dir>
   </attributes>
 </testset>

data/cockpit/templates/UR-VUE 2020 Solution Baseline.xml

@@ -1,8 +1,8 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements>
     <places>[[0,0],[1,0],[0,1],[1,1],[0,2],[1,2],[0,3],[1,3],[0,4],[1,4],[0,5],[1,5]]</places>
   </dataelements>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <handlers>
     <handler url="http://tango.wst.univie.ac.at:9332">
       <votes topic="state">change</votes>
@@ -202,6 +202,6 @@ data.item['y'] = data.items.first['y'] + data.item['adjust_y']</finalize>
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <design_stage>development</design_stage>
-    <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
+    <design_dir>Templates.dir</design_dir>
   </attributes>
 </testset>

data/cockpit/templates/UR-VUE 2020 Solution NN.xml

@@ -1,8 +1,8 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements>
     <places>[[0,0],[1,0],[0,1],[1,1],[0,2],[1,2],[0,3],[1,3],[0,4],[1,4],[0,5],[1,5]]</places>
   </dataelements>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <handlers>
     <handler url="http://tango.wst.univie.ac.at:9332">
       <votes topic="state">change</votes>
@@ -196,6 +196,6 @@ data.item = result[0]</finalize>
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <design_stage>development</design_stage>
-    <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
+    <design_dir>Templates.dir</design_dir>
   </attributes>
 </testset>

data/cockpit/templates/UR-VUE 2020 Solution View.xml

@@ -1,6 +1,6 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <handlers>
     <handler url="http://tango.wst.univie.ac.at:9332">
       <votes topic="state">change</votes>
@@ -150,6 +150,6 @@ data.item = result[0]</finalize>
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <design_stage>development</design_stage>
-    <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
+    <design_dir>Templates.dir</design_dir>
   </attributes>
 </testset>

data/cockpit/templates/UR-VUE 2020.xml

@@ -1,5 +1,5 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <executionhandler>ruby</executionhandler>
   <handlers>
     <handler url="http://tango.wst.univie.ac.at:9332">
       <votes topic="state">change</votes>
@@ -25,6 +25,8 @@
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <design_stage>development</design_stage>
-    <design_dir>/home/demo/Projects/cpee/cockpit/templates</design_dir>
+    <design_dir>Templates.dir</design_dir>
+    <theme>extended</theme>
+    <info>UR-VUE 2020</info>
   </attributes>
 </testset>

data/cockpit/templates/Worklist.xml

@@ -1,14 +1,14 @@
-<testset>
-  <dataelements xmlns="http://cpee.org/ns/properties/2.0">
-    <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <dataelements>
+    <bla/>
   </dataelements>
-  <handlerwrapper xmlns="http://cpee.org/ns/properties/2.0">DefaultHandlerWrapper</handlerwrapper>
-  <endpoints xmlns="http://cpee.org/ns/properties/2.0">
-    <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <worklist xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org:9398</worklist>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <worklist>http://cpee.org:9398</worklist>
   </endpoints>
-  <positions xmlns="http://cpee.org/ns/properties/2.0"/>
-  <description xmlns="http://cpee.org/ns/properties/2.0">
+  <positions/>
+  <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="worklist">
         <parameters>
@@ -29,14 +29,19 @@
       </call>
     </description>
   </description>
-  <transformation xmlns="http://cpee.org/ns/properties/2.0">
+  <transformation>
     <description type="copy"/>
     <dataelements type="none"/>
     <endpoints type="none"/>
   </transformation>
-  <attributes xmlns="http://cpee.org/ns/properties/2.0">
-    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
-    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
-    <organisation1 xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
+  <attributes>
+    <info>Worklist</info>
+    <modeltype>CPEE</modeltype>
+    <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
+    <theme>extended</theme>
+    <creator>Christine Ashcreek</creator>
+    <author>Christine Ashcreek</author>
+    <design_stage>development</design_stage>
+    <design_dir>Templates.dir</design_dir>
   </attributes>
 </testset>

data/cockpit/templates/instantiate.local/Take_Sub.xml

@@ -1,10 +1,10 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements>
     <time>5</time>
   </dataelements>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
-    <start_url>http://localhost:9296/url/</start_url>
+    <start_url>https://localhost/flow/start/url/</start_url>
   </endpoints>
   <positions/>
   <description>

data/cockpit/templates/instantiate/Take_Perf.xml

@@ -1,8 +1,8 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements>
     <time>5</time>
   </dataelements>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <fetch>https://cpee.org/perf</fetch>
   </endpoints>

data/cockpit/templates/instantiate/Take_Sub.xml

@@ -1,6 +1,6 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <start_url>https://cpee.org/flow/start/url/</start_url>
     <timeout>https://cpee.org/services/timeout.php</timeout>
@@ -55,4 +55,4 @@
     <customer>pilotfabrik</customer>
     <status>development</status>
   </attributes>
-</testset>
+</testset>

data/cockpit/templates/instantiate/Take_X.xml

@@ -1,8 +1,8 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
   <dataelements>
     <time>15</time>
   </dataelements>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <timeout>https://cpee.org/services/timeout.php</timeout>
   </endpoints>
@@ -45,4 +45,4 @@
     <customer>pilotfabrik</customer>
     <status>development</status>
   </attributes>
-</testset>
+</testset>

data/cockpit/themes/compact/rngs/parallel.rng

@@ -2,6 +2,12 @@
   <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
     <data type="integer"/>
   </attribute>
+  <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
+    <choice>
+      <value id='last'>After Last Task in Branch</value>
+      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+    </choice>
+  </attribute>
   <element rngui:ignore="true" name="parallel_branch">
     <attribute name="pass">
       <data type="string"/>

data/cockpit/themes/compact/rngs/start.rng

@@ -0,0 +1,83 @@
+<element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="description" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
+  <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data elements (internal context) in the process can be used as input for context data probes. All probes can be the basis for impact factors. Please go to individual tasks to define deal with data that is  ">
+
+    <element name="probes" rngui:header="Context Data Extraction" rngui:fold="closed">
+      <zeroOrMore rngui:label="Add Probe">
+        <element name="probe">
+          <element name="name" rngui:label="Label">
+            <data type="string" rngui:label="Label"/>
+          </element>
+          <element name="extractor_type" rngui:label="Extractor Type">
+            <choice>
+              <value id='code'>Extractor Code</value>
+              <value id='service'>Extractor Service</value>
+            </choice>
+          </element>
+          <element name="extractor_code" rngui:label="Extractor Code">
+            <text rngui:label="Service Url"/>
+          </element>
+          <element name="extractor_url" rngui:label="Extractor Service">
+            <data type="string" rngui:label="Service Url"/>
+          </element>
+          <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+            <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+              <element rngui:label="Name">
+                <anyName/>
+                <data type="string" rngui:label="Value / Json"/>
+              </element>
+            </zeroOrMore>
+          </element>
+          <element name="visualizer_url" rngui:label="Visualizer Url">
+            <data type="string" rngui:label="Service Url"/>
+          </element>
+          <element name="visualizer_params" rngui:label="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>
+      </zeroOrMore>
+    </element>
+
+    <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+      <zeroOrMore rngui:label="Add Impact Profile">
+        <element name="ip">
+          <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="ifs" rngui:header="Impact Factors">
+            <zeroOrMore rngui:label="Add Impact Factor">
+              <element name="if">
+                <element name="ivs" rngui:header="Impact Values">
+                  <zeroOrMore rngui:label="Add Impact Value ">
+                    <element name="iv">
+                      <element name="extractor_url" rngui:label="Extractor Url">
+                        <data type="string" rngui:label="Service Url + Parameters"/>
+                      </element>
+                      <element name="aggregator_url" rngui:label="Aggregator Url">
+                        <data type="string" rngui:label="Service Url + Parameters"/>
+                      </element>
+                    </element>
+                  </zeroOrMore>
+                </element>
+                <element name="aggregator_url" rngui:label="Impact Function Url">
+                  <data type="string" rngui:label="Service Url + Parameters"/>
+                </element>
+              </element>
+            </zeroOrMore>
+          </element>
+          <element name="vfunc_url" rngui:label="Violation Function Url">
+            <data type="string" rngui:label="Service Url + Parameters"/>
+          </element>
+        </element>
+      </zeroOrMore>
+    </element>
+
+  </element>
+</element>

data/cockpit/themes/compact/symbols/parallel_branch_event.svg

@@ -1,8 +1,8 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
 
-  <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
-  <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
+  <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
+  <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
   <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
   <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
   <line x1="28" y1="18" x2="24" y2="11" class="stand"/>

data/cockpit/themes/compact/symbols/parallel_eventbased_exclusive.svg

@@ -0,0 +1,9 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <path
+    d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
+    class="stand"/>
+</svg>
+

data/cockpit/themes/compact/symbols/parallel_eventbased_parallel.svg

@@ -0,0 +1,8 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
+  <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
+</svg>
+

data/cockpit/themes/compact/symbols/start.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="stand"/>
+  <circle cx="15" cy="15" r="14" class="cline hfill rfill stand"/>
 </svg>

data/cockpit/themes/compact/theme.js

@@ -481,8 +481,12 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('wait') == '-1') {
+        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
+          return 'parallel_event_all';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
+          return 'parallel_event_one';
         } else {
           return 'parallel_complex';
         }
@@ -848,7 +852,16 @@ function WFAdaptorManifestation(adaptor) {
       'col_shift': function(node) {
         return true;
       },
-      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('cancel') == 'last') {
+          return 'parallel_start';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
+          return 'parallel_eventbased_exclusive';
+        } else {
+          return 'parallel_eventbased_parallel';
+        }
+      },
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
     'permissible_children': function(node,mode) { //{{{
@@ -1275,6 +1288,24 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_start = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_eventbased_exclusive = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_eventbased_parallel = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
@@ -1287,6 +1318,18 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_event_all = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_event_one = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/
     'parent': 'parallel_branch',
     'illustrator': {//{{{