cpee 1.3.134 → 1.3.136

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.134"
+  s.version          = "1.3.136"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   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"

data/lib/cpee/implementation.rb

@@ -25,7 +25,8 @@ module CPEE
 
   def self::implementation(opts)
     opts[:instances]                  ||= File.expand_path(File.dirname(__FILE__) + '/../../server/instances')
-    opts[:handlerwrappers]            ||= File.expand_path(File.dirname(__FILE__) + '/../../server/handlerwrappers')
+    opts[:global_handlerwrappers]     ||= File.expand_path(File.dirname(__FILE__) + '/../../server/handlerwrappers')
+    opts[:handlerwrappers]            ||= ''
     opts[:topics]                     ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/topics.xml')
     opts[:properties_init]            ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/properties.init')
     opts[:properties_schema_active]   ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/properties.schema.active')
@@ -36,9 +37,12 @@ module CPEE
     opts[:empty_dslx]                 ||= File.expand_path(File.dirname(__FILE__) + '/../../server/resources/empty_dslx.xml')
 
     Proc.new do
+      Dir[opts[:global_handlerwrappers] + "/*.rb"].each do |h|
+        require h
+      end unless opts[:global_handlerwrappers].strip == ''
       Dir[opts[:handlerwrappers] + "/*.rb"].each do |h|
         require h
-      end
+      end unless opts[:handlerwrappers].strip == ''
 
       controller = {}
       Dir[opts[:instances] + '/*/properties.xml'].map{|e|::File::basename(::File::dirname(e))}.each do |id|

data/lib/cpee/processtransformation/bpmn2.rb

@@ -185,7 +185,7 @@ module CPEE
               if branch.condition?
                 li = @graph.link(branch.id,traces.first_node.id)
                 unless li.nil?
-                  branch.condition << li.condition 
+                  branch.condition << li.condition unless li.condition.nil?
                   branch.condition_type = "text/javascript"
                 end  
               end
@@ -199,14 +199,18 @@ module CPEE
                 end
               else
                 loops = traces.loops
-                if node.type == :exclusiveGateway
+                if node.type == :exclusiveGateway || traces.length == 1
                   ### as the first is a decision node, just remove and continue
                   if node.incoming == 2
                     node.incoming = 1
                     branch << Loop.new(node.id)
                     ### remove the gateway itself, as for a single loop it is no longer used.
                     ### the condition will the loop condition
-                    traces.shift_all
+                    if traces.length == 1
+                      loops.first.pop
+                    else
+                      traces.shift_all
+                    end
                     loops.remove_empty
                     build_ttree branch.last, loops, nil, debug
                   else  

data/lib/cpee/processtransformation/cpee.rb

@@ -38,8 +38,8 @@ module CPEE
         def generate_for_list(list,res)
           list.each do |e|
             nam = e.class.name.gsub(/\w+:+/,'')
-          send("print_#{nam}".to_sym,e,res)
-        end
+            send("print_#{nam}".to_sym,e,res)
+          end
         end
         private :generate_for_list
 
@@ -51,11 +51,15 @@ module CPEE
           s1 = res.add('loop', 'pre_test' => 'true')
           generate_for_list(node,s1)
         end
-        def print_Loop(node,res)
-          s1 = res.add('loop', 'pre_test' => node.condition.join(' && '))
+        def print_Loop_default(node,res)
+          s1 = res.add('loop', 'pre_test' => node.condition.empty? ? 'true' : node.condition.join(' && '))
           s1.attributes['language'] = node.condition_type unless node.condition_type.nil?
           generate_for_list(node,s1)
+          s1
         end
+        private :print_Loop_default
+        def print_Loop(node,res); print_Loop_default(node,res); end
+        private :print_Loop
 
         def print_Node(node,res)
           if node.endpoints.empty? && !node.script.nil? && node.script.strip != ''
@@ -83,16 +87,19 @@ module CPEE
         end
         private :print_Node
 
-        def print_Parallel(node,res)
+        def print_Parallel_default(node,res)
           s1 = res.add('parallel','wait' => node.wait)
           node.sub.each do |branch|
             s2 = s1.add('parallel_branch')
             generate_for_list(branch,s2)
           end
+          s1
         end
+        private :print_Parallel_default
+        def print_Parallel(node,res); print_Parallel_default(node,res); end
         private :print_Parallel
 
-        def print_Conditional(node,res)
+        def print_Conditional_default(node,res)
           s1 = res.add('d:choose', 'mode' => node.mode)
           node.sub.each do |branch|
             s2 = if branch.condition.any?
@@ -107,8 +114,12 @@ module CPEE
           if (x = s1.find('d:otherwise')).any?
             s1.add x
           end
+          s1
         end
+        private :print_Conditional_default
+        def print_Conditional(node,res); print_Conditional_default(node,res); end
         private :print_Conditional
+
       end
 
     end

data/lib/cpee/processtransformation/structures.rb

@@ -24,11 +24,12 @@ module CPEE
 
     class Link #{{{
       attr_accessor :from, :to
-      attr_reader :condition
+      attr_reader :condition, :attributes
       def initialize(from,to,cond=nil)
         @from  = from
         @to = to
         @condition = cond
+        @attributes = {}
       end
     end #}}}
 
@@ -296,6 +297,11 @@ module CPEE
           num == self.length
         end
 
+        def infinite_loop_fix
+          self << self.first.dup
+          self.last.pop
+        end
+
         def add_breaks
           trueloops = self.find_all{ |t| t.last == t.first }.length
           if trueloops == self.length

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.134
+  version: 1.3.136
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -99,9 +99,6 @@ files:
 - server/instances/1/properties.xml
 - server/instances/3/properties.xml
 - server/instances/9/properties.xml
-- server/instances/10/notifications/357012173866e5c3e592444c274e5eda/consumer-secret
-- server/instances/10/notifications/357012173866e5c3e592444c274e5eda/producer-secret
-- server/instances/10/notifications/357012173866e5c3e592444c274e5eda/subscription.xml
 - server/instances/10/properties.xml
 - server/instances/4/properties.xml
 - server/instances/7/properties.xml

data/server/instances/10/notifications/357012173866e5c3e592444c274e5eda/consumer-secret

@@ -1 +0,0 @@
-a2b3fecfeb290b16e456360752d9311f

data/server/instances/10/notifications/357012173866e5c3e592444c274e5eda/producer-secret

@@ -1 +0,0 @@
-dda3c195855aab42bc7845764181bab7

data/server/instances/10/notifications/357012173866e5c3e592444c274e5eda/subscription.xml

@@ -1,28 +0,0 @@
-<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
-  <topic id="running">
-    <event>activity_calling</event>
-    <event>activity_manipulating</event>
-    <event>activity_failed</event>
-    <event>activity_done</event>
-    <vote>syncing_after</vote>
-  </topic>
-  <topic id="properties/description">
-    <event>change</event>
-    <event>error</event>
-  </topic>
-  <topic id="properties/position">
-    <event>change</event>
-  </topic>
-  <topic id="properties/state">
-    <event>change</event>
-  </topic>
-  <topic id="properties/dataelements">
-    <event>change</event>
-  </topic>
-  <topic id="properties/endpoints">
-    <event>change</event>
-  </topic>
-  <topic id="properties/handlers">
-    <event>change</event>
-  </topic>
-</subscription>