cpee 1.3.204 → 1.3.205

data/cockpit/themes/default/symbols/callcorrelationreceive.svg

@@ -0,0 +1,6 @@
+<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="11" class="stand"/>
+  <rect x="9" y="11" width="12" height="8" class="black" style="fill: none"/>
+  <path d="m 9,11 6,4 6,-4" class="black" style="fill: none"/>
+</svg>

data/cockpit/themes/default/symbols/callcorrelationsend.svg

@@ -0,0 +1,6 @@
+<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="11" class="stand"/>
+  <rect x="9" y="11" width="12" height="8" class="black"/>
+  <path d="m 9,11 6,3 6,-3" class="white" style="fill: none;"/>
+</svg>

data/cockpit/themes/default/symbols/callinstantiation.svg

@@ -0,0 +1,3 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand" style="stroke-dasharray: 1, 3;"/>
+</svg>

data/cockpit/themes/default/symbols/callmanipulateworklist.svg

@@ -0,0 +1,6 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="1" width="28" height="28" rx="4" class="rfill stand"/>
+  <path transform="translate(-2,-2)" class="normal" style="fill:#000000;" d="m 15,6.5 a 3.9999995,4 0 0 0 -4,4 3.9999995,4 0 0 0 4,4 3.9999995,4 0 0 0 4,-4 3.9999995,4 0 0 0 -4,-4 z m 0,8 -3.5,0 c -1.108,0 -2,0.892 -2,2 l 0,5 c 0,1.108 0.892,2 2,2 l 7,0 c 1.108,0 2,-0.892 2,-2 l 0,-5 c 0,-1.108 -0.892,-2 -2,-2 l -3.5,0 z"/>
+  <circle cx="28" cy="27" r="9" class="rfill stand"/>
+  <text transform="translate(28,31)" class="small">s</text>
+</svg>

data/cockpit/themes/default/symbols/callworklist.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 stand"/>
+  <path class="normal" style="fill:#000000;" d="m 15,6.5 a 3.9999995,4 0 0 0 -4,4 3.9999995,4 0 0 0 4,4 3.9999995,4 0 0 0 4,-4 3.9999995,4 0 0 0 -4,-4 z m 0,8 -3.5,0 c -1.108,0 -2,0.892 -2,2 l 0,5 c 0,1.108 0.892,2 2,2 l 7,0 c 1.108,0 2,-0.892 2,-2 l 0,-5 c 0,-1.108 -0.892,-2 -2,-2 l -3.5,0 z"/>
+</svg>

data/cockpit/themes/default/theme.js

@@ -111,10 +111,16 @@ function WFAdaptorManifestation(adaptor) {
     'illustrator': {//{{{
       'endnodes' : 'this',
       'resolve_symbol' : function(node) {
-        if($(node).attr('endpoint') == 'instantiation') {
+        if($(node).attr('endpoint').match(/^instantiation/)) {
           return 'callinstantiation';
-        } else if($(node).attr('endpoint') == 'correlation') {
-          return 'callcorrelation';
+        } else if($(node).attr('endpoint').match(/^correlation_send/)) {
+          return 'callcorrelationsend';
+        } else if($(node).attr('endpoint').match(/^correlation_receive/)) {
+          return 'callcorrelationreceive';
+        } else if($(node).attr('endpoint').match(/^worklist/) && $('finalize,update', node).length > 0) {
+          return 'callmanipulateworklist';
+        } else if($(node).attr('endpoint').match(/^worklist/)) {
+          return 'callworklist';
         } else if($('parameters > service', node).length > 0) {
           return 'callinjection';
         } else if($('finalize,update', node).length > 0) {
@@ -740,4 +746,40 @@ function WFAdaptorManifestation(adaptor) {
     'type' : 'abstract',
     'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
   }; /*}}}*/
+  this.elements.callinstantiation = { /*{{{*/
+    'type' : 'abstract',
+    'parent': 'call',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/callinstantiation.svg'
+    },//}}}
+  };  /*}}}*/
+  this.elements.callcorrelationsend = { /*{{{*/
+    'type' : 'abstract',
+    'parent': 'call',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/callcorrelationsend.svg'
+    },//}}}
+  };  /*}}}*/
+  this.elements.callcorrelationreceive = { /*{{{*/
+    'type' : 'abstract',
+    'parent': 'call',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/callcorrelationreceive.svg'
+    },//}}}
+  };  /*}}}*/
+  this.elements.callworklist = { /*{{{*/
+    'type' : 'abstract',
+    'parent': 'call',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/callworklist.svg'
+    },//}}}
+  };  /*}}}*/
+  this.elements.callmanipulateworklist = { /*{{{*/
+    'type' : 'abstract',
+    'parent': 'call',
+    'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/callmanipulateworklist.svg'
+    },//}}}
+  };  /*}}}*/
 }

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.204"
+  s.version          = "1.3.205"
   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"

data/lib/cpee/implementation.rb

@@ -20,8 +20,13 @@ require 'riddl/utils/properties'
 require ::File.dirname(__FILE__) + '/controller'
 
 require 'ostruct'
-def →(a); OpenStruct.new(a); end
-def ⭐(a); OpenStruct.new(a); end
+class ParaStruct < OpenStruct
+  def to_json(*a)
+    table.to_json
+  end
+end
+def →(a); ParaStruct.new(a); end
+def ⭐(a); ParaStruct.new(a); end
 
 module CPEE
 

data/log/server.rb

@@ -18,85 +18,91 @@ class Logging < Riddl::Implementation #{{{
       <extension name="Concept" prefix="concept" uri="http://www.xes-standard.org/concept.xesext"/>
       <extension name="Organizational" prefix="org" uri="http://www.xes-standard.org/org.xesext"/>
 	    <extension name="Lifecycle" prefix="lifecycle" uri="http://www.xes-standard.org/lifecycle.xesext"/>
+      <global scope="trace">                                                                                                                                          
+        <string key="concept:name" value="__INVALID__"/>
+      </global>
+      <global scope="event">
+        <string key="concept:name" value="__INVALID__"/>
+        <string key="concept:endpoint" value=""/>
+        <string key="id:id" value=""/>
+        <string key="lifecycle:transition" value="complete" />
+        <date key="time:timestamp" value=""/>
+      </global>
+			<classifier name="Data" keys="data_send data_received"/>
+			<classifier name="Data_Received" keys="data_received"/>
+			<classifier name="Data_Send" keys="data_send"/>
       <trace/>
     </log>
   END
-  def response
-    topic = @p[1].value
-    event_name = @p[2].value
-    if(topic == 'activity' && (event_name=='done' || event_name == 'calling'))
-      log_dir = ::File.dirname(__FILE__) + "/logs"
-      instancenr = @h['CPEE_INSTANCE'].split('/').last
-      notification = JSON.parse(@p[3].value)
-      uuid = notification['instance_uuid']
-      activity = notification["activity"]
-      parameters = notification['parameters']
-      Dir.mkdir(log_dir+'/'+uuid) unless Dir.exist?(log_dir+'/'+uuid)
-      time_added=false
-      XML::Smart.modify(log_dir+'/'+uuid+'/log.xes',LOGTEMPLATE) do |xml|
-        begin
-          trace = xml.find("/xmlns:log/xmlns:trace").first
-          trace.add 'string', :key => "concept:name", :value => "Instance #{instancenr}" if trace.find('xmlns:string').empty?
-          event = trace.add "event"
-          if parameters && parameters.has_key?('label')
-            event.add 'string', :key => "concept:name", :value => parameters["label"] 
-          else
-            event.add 'string', :key => "concept:name", :value => trace.find("string(xmlns:event[xmlns:string[@key='id:id' and @value='#{activity}']]/xmlns:string[@key='concept:name']/@value)")
-          end
-          event.add 'string', :key => "concept:instance", :value => notification["endpoint"] if notification["endpoint"]
-          event.add 'string', :key => "id:id", :value => activity
+  def doc(event_name,log_dir,instancenr,notification)
+    uuid = notification['instance_uuid']
+    activity = notification["activity"]
+    parameters = notification['parameters']
+    receiving = notification['received']
+    pp notification
+    Dir.mkdir(log_dir+'/'+uuid) unless Dir.exist?(log_dir+'/'+uuid)
+    time_added=false
+    XML::Smart.modify(log_dir+'/'+uuid+'/log.xes',LOGTEMPLATE) do |xml|
+      begin
+        trace = xml.find("/xmlns:log/xmlns:trace").first
+        trace.add 'string', :key => "concept:name", :value => "Instance #{instancenr}" if trace.find('xmlns:string').empty?
+        event = trace.add "event"
+        if parameters && parameters.has_key?('label')
+          event.add 'string', :key => "concept:name", :value => parameters["label"]
+        else
+          event.add 'string', :key => "concept:name", :value => trace.find("string(xmlns:event[xmlns:string[@key='id:id' and @value='#{activity}']]/xmlns:string[@key='concept:name']/@value)")
+        end
+        event.add 'string', :key => "concept:endpoint", :value => notification["endpoint"] if notification["endpoint"]
+        event.add 'string', :key => "id:id", :value => activity
+        unless event_name=='receiving'
           event.add 'string', :key => "lifecycle:transition", :value => event_name=='done'?"complete":"start"
-          data_send = ((parameters[:arguments].nil? ? [] : parameters[:arguments]) rescue [])
-          if data_send.any?
-            list = event.add 'list', :key => "data_send"
-            data_send.each do |k,v|
-              list.add 'string', :key => k , :value => v
-            end
+        else
+          event.add 'string', :key => "lifecycle:transition", :value => "unknown"
+        end
+        data_send = ((parameters[:arguments].nil? ? [] : parameters[:arguments]) rescue [])
+        if data_send && data_send.any?
+          list = event.add 'list', :key => "data_send"
+          data_send.each do |k,v|
+            list.add 'string', :key => k , :value => v
           end
-          event.add 'date', :key => "time:timestamp", :value => Time.now.iso8601 unless time_added
-        rescue => e
-          puts e.message
-          puts e.backtrace
         end
-      end
-    elsif(event_name=='receiving')
-      log_dir = ::File.dirname(__FILE__) + "/logs"
-      instancenr = @h['CPEE_INSTANCE'].split('/').last
-      notification = JSON.parse(@p[3].value)
-      uuid = notification['instance_uuid']
-      activity = notification["activity"]
-      receiving = notification['received']
-      Dir.mkdir(log_dir+'/'+uuid) unless Dir.exist?(log_dir+'/'+uuid)
-      time_added=false
-      XML::Smart.modify(log_dir+'/'+uuid+'/log.xes',LOGTEMPLATE) do |xml|
-        begin
-          trace = xml.find("/xmlns:log/xmlns:trace").first
-          trace.add 'string', :key => "concept:name", :value => "Instance #{instancenr}" if trace.find('xmlns:string').empty?
-          event = trace.add "event"
-          event.add 'string', :key => "concept:name", :value => trace.find("string(xmlns:event[xmlns:string[@key='id:id' and @value='#{activity}']]/xmlns:string[@key='concept:name']/@value)")
-          event.add 'string', :key => "concept:instance", :value => notification["endpoint"] if notification["endpoint"]
-          event.add 'string', :key => "id:id", :value => notification["activity"]
-          event.add 'string', :key => "lifecycle:transition", :value => "unknown"
-          if receiving.any?
-            list = event.add 'list', :key => "data_received"
-            receiving.each do |k,v|
-              list.add 'string', :key => k, :value => v
+        if receiving && receiving.any?
+          list = event.add 'list', :key => "data_received"
+          if receiving.is_a? Array
+            receiving.each do |e|
+              e.each do |k,v|
+                case v['mimetype']
+                  when /\/xml$/ 
+                    node = list.add 'string', :key => k
+                    node.add XML::Smart.string(v['content']).root
+                  else
+                    list.add 'string', :key => k, :value => v['content']
+                end    
+              end
             end
+          else 
+            pp receiving
           end
-          event.add 'date', :key => "time:timestamp", :value => Time.now.iso8601 unless time_added
-        rescue => e
-          puts e.message
-          puts e.backtrace
         end
-      end  
-    else
-      pp "Something wrong"
+        event.add 'date', :key => "time:timestamp", :value => Time.now.iso8601 unless time_added
+      rescue => e
+        puts e.message
+        puts e.backtrace
+      end
     end
   end
+  def response
+    topic = @p[1].value
+    event_name = @p[2].value
+    log_dir = ::File.dirname(__FILE__) + "/logs"
+    instancenr = @h['CPEE_INSTANCE'].split('/').last
+    notification = JSON.parse(@p[3].value)
+    doc(event_name,log_dir,instancenr,notification)
+  end
 end  #}}}
 
 
-Riddl::Server.new(::File.dirname(__FILE__) + '/log.xml', :host => "cpee.org", :port => 9299) do #{{{
+Riddl::Server.new(::File.dirname(__FILE__) + '/log.xml', :host => "coruscant.wst.univie.ac.at", :port => 9299) do #{{{
   accessible_description true
   cross_site_xhr true
   log_path = "/home/demo/Projects/cpee-helpers/log/logs"

data/server/instances/20/properties.xml

@@ -0,0 +1,68 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>8ef13d4b-8709-4556-838a-38f48cad63ba</uuid>
+    <info>Enter info here</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state>ready</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <persons>3</persons>
+    <hotels>[]</hotels>
+    <costs>0</costs>
+  </dataelements>
+  <endpoints>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+  </endpoints>
+  <dsl>&lt;?xml version="1.0"?&gt;
+</dsl>
+  <dslx>
+    <parallel xmlns="http://cpee.org/ns/description/1.0">
+      <loop mode="pre_test" condition="data.persons &gt; 0">
+        <parallel_branch pass="data.persons" local="p">
+          <call id="a2" endpoint="bookHotel">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <to>"Vienna"</to>
+              </arguments>
+            </parameters>
+            <finalize output="result">data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f</finalize>
+          </call>
+        </parallel_branch>
+        <manipulate id="a3">data.persons -= 1</manipulate>
+      </loop>
+    </parallel>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <parallel xmlns="http://cpee.org/ns/description/1.0">
+      <loop mode="pre_test" condition="data.persons &gt; 0">
+        <parallel_branch pass="data.persons" local="p">
+          <call id="a2" endpoint="bookHotel">
+            <parameters>
+              <method>:post</method>
+              <arguments>
+                <to>"Vienna"</to>
+              </arguments>
+            </parameters>
+            <finalize output="result">data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f</finalize>
+          </call>
+        </parallel_branch>
+        <manipulate id="a3">data.persons -= 1</manipulate>
+      </loop>
+    </parallel>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
+  </transformation>
+</properties>

data/server/instances/21/properties.xml

@@ -0,0 +1,118 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>b27da837-73a2-418d-aad1-bc834317256e</uuid>
+    <info>BulkBuyer</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+  </attributes>
+  <state>stopped</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <instance>1</instance>
+  </dataelements>
+  <endpoints>
+    <corr>http://cpee.org/~demo/corr/corr.php</corr>
+    <mesg>http://cpee.org/~demo/corr/mesg.php</mesg>
+  </endpoints>
+  <dsl>call :a4, :mesg, parameters: { :label =&gt; "\"order\"", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :url, :value =&gt; "http://cpee.org/~demo/generated_data/instance_" + data.instance + "/m1.xml")] }
+call :a2, :corr, parameters: { :label =&gt; "\"status report production start\"", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :correlate, :value =&gt; "/order/id"), ⭐(:name =&gt; :value, :value =&gt; "m13_" + data.instance )] }
+call :a3, :corr, parameters: { :label =&gt; "\"status report end production\"", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :correlate, :value =&gt; "/order/id"), ⭐(:name =&gt; :value, :value =&gt; "m14_" + data.instance )] }
+call :a5, :corr, parameters: { :label =&gt; "\"delivery of product\"", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :correlate, :value =&gt; "/order/id"), ⭐(:name =&gt; :value, :value =&gt; "m15_" + data.instance )] }
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a4" endpoint="mesg">
+        <parameters>
+          <label>"order"</label>
+          <method>:post</method>
+          <arguments>
+            <url>"http://cpee.org/~demo/generated_data/instance_" + data.instance + "/m1.xml"</url>
+          </arguments>
+        </parameters>
+      </call>
+      <call id="a2" endpoint="corr">
+        <parameters>
+          <label>"status report production start"</label>
+          <method>:post</method>
+          <arguments>
+            <correlate>"/order/id"</correlate>
+            <value>"m13_" + data.instance </value>
+          </arguments>
+        </parameters>
+      </call>
+      <call id="a3" endpoint="corr">
+        <parameters>
+          <label>"status report end production"</label>
+          <method>:post</method>
+          <arguments>
+            <correlate>"/order/id"</correlate>
+            <value>"m14_" + data.instance </value>
+          </arguments>
+        </parameters>
+      </call>
+      <call id="a5" endpoint="corr">
+        <parameters>
+          <label>"delivery of product"</label>
+          <method>:post</method>
+          <arguments>
+            <correlate>"/order/id"</correlate>
+            <value>"m15_" + data.instance </value>
+          </arguments>
+        </parameters>
+      </call>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a4" endpoint="mesg">
+        <parameters>
+          <label>"order"</label>
+          <method>:post</method>
+          <arguments>
+            <url>"http://cpee.org/~demo/generated_data/instance_" + data.instance + "/m1.xml"</url>
+          </arguments>
+        </parameters>
+      </call>
+      <call id="a2" endpoint="corr">
+        <parameters>
+          <label>"status report production start"</label>
+          <method>:post</method>
+          <arguments>
+            <correlate>"/order/id"</correlate>
+            <value>"m13_" + data.instance </value>
+          </arguments>
+        </parameters>
+      </call>
+      <call id="a3" endpoint="corr">
+        <parameters>
+          <label>"status report end production"</label>
+          <method>:post</method>
+          <arguments>
+            <correlate>"/order/id"</correlate>
+            <value>"m14_" + data.instance </value>
+          </arguments>
+        </parameters>
+      </call>
+      <call id="a5" endpoint="corr">
+        <parameters>
+          <label>"delivery of product"</label>
+          <method>:post</method>
+          <arguments>
+            <correlate>"/order/id"</correlate>
+            <value>"m15_" + data.instance </value>
+          </arguments>
+        </parameters>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+</properties>