cpee 1.5.15 → 1.5.16

data/cockpit/testsets/Take_5.xml

@@ -15,17 +15,21 @@
             <timeout>5</timeout>
           </arguments>
         </parameters>
-        <finalize output="result">data.a = 17</finalize>
-        <update output="result"/>
-        <_timing>
-          <_timing_min/>
-          <_timing_max/>
-          <_timing_avg/>
-        </_timing>
-        <_notes>
-          <_notes_general/>
-          <_attachments/>
-        </_notes>
+        <code>
+          <finalize output="result">data.a = 17</finalize>
+          <update output="result"/>
+        </code>
+        <annotations>
+          <_timing>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+            <_attachments/>
+          </_notes>
+        </annotations>
       </call>
     </description>
   </description>
@@ -35,10 +39,10 @@
     <endpoints type="none"/>
   </transformation>
   <attributes>
-    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0"></info>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
     <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
-    <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">default</theme>
+    <theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
     <customer xmlns="http://riddl.org/ns/common-patterns/properties/1.0">pilotfabrik</customer>
     <status xmlns="http://riddl.org/ns/common-patterns/properties/1.0">development</status>
   </attributes>
-</testset>
+</testset>

data/cockpit/testsets/Update.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <testset>
   <dataelements/>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
@@ -14,8 +13,10 @@
           <method>:post</method>
           <arguments/>
         </parameters>
-        <finalize>data.a = result.value</finalize>
-        <update>data.b = result.value</update>
+        <code>
+          <finalize>data.a = result.value</finalize>
+          <update>data.b = result.value</update>
+        </code>
       </call>
     </description>
   </description>
@@ -28,4 +29,4 @@
     <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Enter info here</info>
     <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
   </attributes>
-</testset>
+</testset>

data/cockpit/testsets/Worklist Parallel.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <testset>
   <dataelements>
     <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
@@ -29,7 +28,9 @@
                 <text>"sehr gut"</text>
               </arguments>
             </parameters>
-            <finalize>data.a = result</finalize>
+            <code>
+              <finalize>data.a = result</finalize>
+            </code>
           </call>
         </parallel_branch>
         <parallel_branch>
@@ -46,7 +47,9 @@
                 <text>"totalo kaputto"</text>
               </arguments>
             </parameters>
-            <finalize>data.b = result</finalize>
+            <code>
+              <finalize>data.b = result</finalize>
+            </code>
           </call>
         </parallel_branch>
         <parallel_branch>
@@ -63,7 +66,9 @@
                 <text>"ein Totalschaden"</text>
               </arguments>
             </parameters>
-            <finalize>data.c = result</finalize>
+            <code>
+              <finalize>data.c = result</finalize>
+            </code>
           </call>
         </parallel_branch>
       </parallel>
@@ -80,7 +85,9 @@
             <text>"fetzen hin"</text>
           </arguments>
         </parameters>
-        <finalize>data.bla = result</finalize>
+        <code>
+          <finalize>data.bla = result</finalize>
+        </code>
       </call>
     </description>
   </description>
@@ -94,4 +101,4 @@
     <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>
-</testset>
+</testset>

data/cockpit/testsets/Worklist Test CPEE.xml

@@ -1,6 +1,7 @@
-<?xml version="1.0"?>
 <testset>
-  <dataelements><bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/></dataelements>
+  <dataelements>
+    <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
+  </dataelements>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
@@ -36,4 +37,4 @@
     <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>
-</testset>
+</testset>

data/cockpit/testsets/Worklist Test.xml

@@ -1,6 +1,7 @@
-<?xml version="1.0"?>
 <testset>
-  <dataelements><bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/></dataelements>
+  <dataelements>
+    <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
+  </dataelements>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
@@ -22,7 +23,9 @@
             <text>"fetzen hin"</text>
           </arguments>
         </parameters>
-        <finalize>data.bla = result</finalize>
+        <code>
+          <finalize>data.bla = result</finalize>
+        </code>
       </call>
     </description>
   </description>
@@ -36,4 +39,4 @@
     <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>
-</testset>
+</testset>

data/cockpit/testsets/Worklist Test2.xml

@@ -1,6 +1,7 @@
-<?xml version="1.0"?>
 <testset>
-  <dataelements><bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/></dataelements>
+  <dataelements>
+    <bla xmlns="http://riddl.org/ns/common-patterns/properties/1.0"/>
+  </dataelements>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
@@ -23,7 +24,9 @@
             <text>"fetzen hin"</text>
           </parameters>
         </parameters>
-        <finalize>data.bla = result</finalize>
+        <code>
+          <finalize>data.bla = result</finalize>
+        </code>
       </call>
     </description>
   </description>
@@ -37,4 +40,4 @@
     <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>
-</testset>
+</testset>

data/cockpit/testsets/convert_preset.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/ruby
+require 'xml/smart'
+
+Dir['*.xml'].each do |f|
+  XML::Smart.modify(f) do |doc|
+    p f
+    doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+    doc.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
+    if doc.root.qname.name == 'testset'
+      doc.find('//d:call').each do |e|
+        x = e.find('d:finalize')
+        if x.length > 0
+          code = x.first.add_before 'code'
+          code.add x
+          code.add e.find('d:update')
+        end
+        x = e.find('d:_timing')
+        if x.length > 0
+          code = x.first.add_before 'annotations'
+          code.add x
+          code.add e.find('d:_notes')
+        end
+      end
+      begin
+        if doc.find('//attributes/p:theme').any?
+          doc.find('//attributes/p:theme').first.text = 'preset'
+        end
+      rescue
+      end
+    end
+  end
+end

data/cockpit/testsets/testsets.xml

@@ -32,4 +32,4 @@
   <testset>Lego Crane</testset>
   <testset>Lego Plate</testset>
   <!--testset>Manuel Labels</testset-->
-</testsets>
+</testsets>

data/cockpit/testsets/transformations.xml

@@ -1,4 +1,4 @@
 <transformations>
   <transformation>CPEE</transformation>
   <transformation>Signavio</transformation>
-</transformations>
+</transformations>

data/cockpit/themes/compact/theme.js

@@ -1240,6 +1240,6 @@ function WFAdaptorManifestation(adaptor) {
     }//}}}
   };  /*}}}*/
   this.elements.scripts = { /*{{{*/
-    'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
+    'description': [self.adaptor.theme_dir + 'rngs/scripts.rng']
   }; /*}}}*/
 }

data/cockpit/themes/extended/theme.js

@@ -250,7 +250,7 @@ function WFAdaptorManifestation(adaptor) {
       'label': function(node){
         var rep = $('body').attr('current-resources');
         var ep = self.endpoints[$(node).attr('endpoint')];
-        var avg = $('> _timing_avg',$(node).children('_timing')).text();
+        var avg = $('_timing_avg',$(node).children('annotations')).text();
         var lab = $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'');
         var ret = [ { column: 'ID', value: $(node).attr('id') } ];
         if (lab != '') {

data/cockpit/themes/packed/theme.js

@@ -1240,6 +1240,6 @@ function WFAdaptorManifestation(adaptor) {
     }//}}}
   };  /*}}}*/
   this.elements.scripts = { /*{{{*/
-    'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
+    'description': [self.adaptor.theme_dir + 'rngs/scripts.rng']
   }; /*}}}*/
 }

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.15"
+  s.version          = "1.5.16"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.15
+  version: 1.5.16
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -175,6 +175,7 @@ files:
 - cockpit/testsets/Worklist Test CPEE.xml
 - cockpit/testsets/Worklist Test.xml
 - cockpit/testsets/Worklist Test2.xml
+- cockpit/testsets/convert_preset.rb
 - cockpit/testsets/testsets.xml
 - cockpit/testsets/transformations.xml
 - cockpit/themes/compact/theme.js