cpee 1.5.16 → 1.5.21

data/cockpit/themes/preset/symbols/end.svg

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

data/cockpit/themes/preset/symbols/escape.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="stand cline"/>
+  <circle cx="15" cy="15" r="11" class="stand cline hfill"/>
+  <polygon points="10.5,20.5 15,8.5 20.5,20.5 15,15.5 10.5,20.5" class="black"/>
+</svg>

data/cockpit/themes/preset/symbols/event_end.svg

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

data/cockpit/themes/preset/symbols/loop.svg

@@ -0,0 +1,5 @@
+<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"/>
+  <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+  <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/manipulate.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill hfill cline stand"/>
+  <text transform="translate(15,21)" class="normal">s</text>
+</svg>

data/cockpit/themes/preset/symbols/otherwise.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="11" class="hfill standtrans"/>
+  <line x1="9" y1="21" x2="21" y2="9" class="stand cline hline"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
+</svg>

data/cockpit/themes/preset/symbols/parallel.svg

@@ -0,0 +1,5 @@
+<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"/>
+  <text transform="translate(15,25)" class="normallarge">+</text>
+</svg>
+

data/cockpit/themes/preset/symbols/parallel_branch.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="11" y="6" width="9" height="18" rx="0" class="hline white"/>
+  <path class="cline hfill stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
+</svg>

data/cockpit/themes/preset/symbols/parallel_branch_compact.svg

@@ -0,0 +1,4 @@
+<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"/>
+  <text transform="translate(15,20)" class="small">|||</text>
+</svg>

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

@@ -0,0 +1,14 @@
+<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"/>
+  <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"/>
+
+  <circle cx="55.5" cy="15" r="14" class="cline hfill rfill stand"/>
+  <line x1="55.5" y1="11" x2="51.5" y2="18" class="stand"/>
+  <line x1="51.5" y1="18" x2="59.5" y2="18" class="stand"/>
+  <line x1="59.5" y1="18" x2="55.5" y2="11" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/parallel_branch_normal.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="11" y="6" width="9" height="18" rx="0" class="hline white"/>
+  <path class="cline hfill stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
+</svg>

data/cockpit/themes/preset/symbols/scripts.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="1" width="28" height="28" rx="4" class="hfill rfill cline stand"/>
+  <text transform="translate(15,21)" class="normal">s</text>
+</svg>

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

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

data/cockpit/themes/preset/symbols/stop.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="hfill rfill cline stand"/>
+  <line x1="12.5" y1="22.5" x2="12.5" y2="8.5" class="stand"/>
+  <line x1="17.5" y1="22.5" x2="17.5" y2="8.5" class="stand"/>
+</svg>

data/cockpit/themes/preset/symbols/terminate.svg

@@ -0,0 +1,4 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="standfat"/>
+  <circle cx="15" cy="15" r="9" class="black"/>
+</svg>

data/cockpit/themes/preset/theme.js

@@ -132,6 +132,13 @@ function WFAdaptorManifestation(adaptor) {
           menu['Insert into'] = group;
           copyOrMove(menu['Insert into'],group,xml_node,self.adaptor.description.insert_first_into);
         }
+        if (self.elements[xml_node.get(0).tagName].permissible_children_expert) {
+          group = self.elements[xml_node.get(0).tagName].permissible_children_expert(xml_node,'into');
+          if(group.length > 0) {
+            menu['Insert into (Experts Only!)'] = group;
+            copyOrMove(menu['Insert into (Experts Only!)'],group,xml_node,self.adaptor.description.insert_first_into);
+          }
+        }
       }
       if (sibling) {
         group = self.elements[xml_node.parent().get(0).tagName].permissible_children(xml_node,'after');
@@ -139,6 +146,13 @@ function WFAdaptorManifestation(adaptor) {
           menu['Insert after'] = group;
           copyOrMove(menu['Insert after'],group,xml_node,self.adaptor.description.insert_after);
         }
+        if (self.elements[xml_node.parent().get(0).tagName].permissible_children_expert) {
+          group = self.elements[xml_node.parent().get(0).tagName].permissible_children_expert(xml_node,'after');
+          if(group.length > 0) {
+            menu['Insert after (Experts Only!)'] = group;
+            copyOrMove(menu['Insert after (Experts Only!)'],group,xml_node,self.adaptor.description.insert_after);
+          }
+        }
       }
 
       if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
@@ -146,13 +160,13 @@ function WFAdaptorManifestation(adaptor) {
         icon.children('.rfill').addClass('menu');
         menu['Delete'] = [{
           'label': 'Remove Element',
-          'function_call': self.adaptor.description.remove,
+          'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
           'menu_icon': icon,
           'type': undefined,
-          'params': [null, xml_node]
+          'params': [null, xml_node, self.selected()]
         }];
       }
-      if($('> finalize, > update', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
+      if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
         var icon =  self.elements.callmanipulate.illustrator.svg.clone();
         icon.children('.rfill:last').addClass('menu');
         menu['Delete'].push({
@@ -160,7 +174,7 @@ function WFAdaptorManifestation(adaptor) {
           'function_call': self.adaptor.description.remove,
           'menu_icon': icon,
           'type': undefined,
-          'params': ['> finalize, > update', xml_node]
+          'params': ['> code', xml_node]
         });
       }
       if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
@@ -253,7 +267,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('finalize,update', node).length > 0) {
+        if($('code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';
@@ -263,7 +277,7 @@ function WFAdaptorManifestation(adaptor) {
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/call.rng',
     'permissible_children': function(node,mode) { //{{{
-      if(node.children('finalize,update').length < 1)
+      if(node.children('code').length < 1)
         return [
          {'label': 'Scripts',
           'function_call': self.adaptor.description.insert_last_into,
@@ -538,7 +552,7 @@ function WFAdaptorManifestation(adaptor) {
       var childs = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -578,13 +592,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
@@ -625,7 +644,7 @@ function WFAdaptorManifestation(adaptor) {
          'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}];
       }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -665,13 +684,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
@@ -717,7 +741,7 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
-        {'label': 'Manipulate',
+        {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
@@ -741,13 +765,17 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
       if(node.parent('parallel').length > node.parent('parallel_branch').length) {
         childs.push({'label': 'Parallel Branch',
                      'function_call': func,
@@ -796,6 +824,19 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
+      var childs =  [
+        {'label': 'Parallel Branch',
+         'function_call': func,
+         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'type': 'parallel_branch',
+         'params': [self.adaptor.description.elements.parallel_branch, node]},
+      ];
+      return childs;
+    }, //}}}
+    'permissible_children_expert': function(node,mode) { //{{{
+      var func = null;
+      if (mode.match(/into/)) { func = self.adaptor.description.insert_first_into }
+      else { func = self.adaptor.description.insert_after }
       var childs =  [
         {'label': 'Service Call with Scripts',
          'function_call': func,
@@ -807,7 +848,7 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
-        {'label': 'Manipulate',
+        {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
@@ -822,11 +863,11 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'label': 'Parallel Branch',
+        {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
-         'type': 'parallel_branch',
-         'params': [self.adaptor.description.elements.parallel_branch, node]}
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
       if(node.get(0).tagName != 'parallel')
         childs.push({'label': 'Parallel',
@@ -872,10 +913,9 @@ function WFAdaptorManifestation(adaptor) {
     'description': self.adaptor.theme_dir + 'rngs/parallel_branch.rng',
     'permissible_children': function(node,mode) { //{{{
       var func = null;
-      var childs = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      childs =  [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -920,7 +960,7 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
          'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]},
+         'params': [self.adaptor.description.elements.critical, node]}
       ];
       if(node.parents('choose').length > node.parents('alternative, otherwise').length && node.get(0).tagName == 'parallel_branch') {
         return [{'label': 'Alternative',
@@ -933,12 +973,7 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
-        var xml_node = self.adaptor.description.get_node_by_svg_id(node);
-        if(xml_node.get(0).parentNode.tagName == 'parallel') {
-          self.events.mousedown(node,e,true,false);
-        } else {
-          self.events.mousedown(node,e,true,true);
-        }
+        self.events.mousedown(node,e,true,true);
       },
       'click': self.events.click,
       'dblclick': self.events.dblclick,
@@ -965,7 +1000,7 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1005,13 +1040,18 @@ function WFAdaptorManifestation(adaptor) {
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]},
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
@@ -1075,7 +1115,7 @@ function WFAdaptorManifestation(adaptor) {
       var func = null;
       if (mode == 'into') { func = self.adaptor.description.insert_first_into }
       else { func = self.adaptor.description.insert_after }
-      return [
+      var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
@@ -1086,7 +1126,7 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
-        {'label': 'Script Task',
+        {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
@@ -1106,22 +1146,22 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'label': 'Terminate',
-         'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
-         'type': 'terminate',
-         'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),
          'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]}
+         'params': [self.adaptor.description.elements.stop, node]}
       ];
+      if(node.parent('parallel_branch').length > 0) {
+        childs.push({
+           'label': 'Critical',
+           'function_call': func,
+           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'type': 'critical',
+           'params': [self.adaptor.description.elements.critical, node]
+        });
+      }
+      return childs;
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.16"
+  s.version          = "1.5.21"
   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"
 
   s.description      = "see http://cpee.org"
 
-  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,lib/**/*,cockpit/**/*,contrib/logo*,contrib/Screen*,log/**/*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*,log/logs/**/*}'] + %w(COPYING FEATURES INSTALL Rakefile cpee.gemspec README AUTHORS)
+  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*,log/**/*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*,log/logs/**/*}'] + %w(COPYING FEATURES INSTALL Rakefile cpee.gemspec README AUTHORS)
   s.require_path     = 'lib'
   s.extra_rdoc_files = ['README']
   s.bindir           = 'tools'
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'riddl', '~> 0.99'
   s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.80'
   s.add_runtime_dependency 'savon', '~> 2'
+  s.add_runtime_dependency 'xml-smart', '>=0.4.3', '~>0'
   s.add_runtime_dependency 'highline', '~> 1.6'
   s.add_runtime_dependency 'json', '~>2.1'
   s.add_runtime_dependency 'rubyzip', '~>1.2'