cpee 1.3.195 → 1.3.196

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ca83c3343d021a5ef8d72455bc550e83201d270
-  data.tar.gz: e2a7058f722dfd2345afb0191ac2378cde3c84ef
+  metadata.gz: d5200d2c427d48101d74a760328fe54294fee5fb
+  data.tar.gz: 2f17a1cdf61c65ae94efc2fd59903e0e5473894a
 SHA512:
-  metadata.gz: 80af6401be78aa6963df433c8af5234189c4fc4f98a9996d521ba9908d5219ce3e94541e38032b98816017a512baae729f872b86aa60ce3b5e0d6bf2f971bda6
-  data.tar.gz: fc348e444fb1976444e493fcbf5da7480935d829d43ee794da5827cf4b1cf5d520d95537030386658aefa4f92092049736723a87d34aaf4676e63299f8479694
+  metadata.gz: ebf975384da3856a6689fb1d7863128d19ab0b4e6f0ceb7d4e4cd21b42b29f219305f308b8b68cdb0372e29152ed4a34ddf001ee52e2e3f08da204be9535a713
+  data.tar.gz: f9e0970be02b46418936bbde573822c9e9baacbde86a88d83057339c38a648e99a3a5e8db626063d001dfe4aa455ad809d3f20aa21fb8500a1fa6fb89ccbaf94

data/cockpit/js/instance.js

@@ -541,6 +541,7 @@ function save_testset() {// {{{
                           var name = $("value > info",res).text();
                           var pars = $X('<attributes/>');
                           pars.append($(res.documentElement).children());
+                          pars.find('uuid').remove();
                           testset.append(pars);
                           $('#savetestset').attr('download',name + '.xml');
                           $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + window.btoa(testset.serializePrettyXML()));
@@ -788,15 +789,24 @@ function load_testset_dataelements(url,testset) {// {{{
 function load_testset_attributes(url,testset) {// {{{
   if ($("testset > attributes",testset).length == 0) { return; }
   var ser = '';
-  $("testset > attributes > *",testset).each(function(){
-    ser += $(this).serializeXML() + "\n";
-  });
-  var val = "<content>" + ser + "</content>";
   $.ajax({
-    type: "PUT",
-    url: url + "/properties/values/attributes",
-    data: ({content: val}),
-    error: report_failure
+    type: "GET",
+    url: url + "/properties/values/attributes/uuid",
+    success: function(res){
+      var uuid = $X('<uuid/>');
+          uuid.text($('value',res).text());
+      $("testset > attributes",testset).prepend(uuid);
+      $("testset > attributes > *",testset).each(function(){
+        ser += $(this).serializeXML() + "\n";
+      });
+      var val = "<content>" + ser + "</content>";
+      $.ajax({
+        type: "PUT",
+        url: url + "/properties/values/attributes",
+        data: ({content: val}),
+        error: report_failure
+      });
+    }
   });
 }// }}}
 function load_testset_endpoints(url,testset) {// {{{

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.195"
+  s.version          = "1.3.196"
   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/log/server.rb

@@ -12,61 +12,78 @@ require 'riddl/utils/turtle'
 
 
 class Logging < Riddl::Implementation #{{{
+  LOGTEMPLATE = <<-END
+    <log xmlns="http://www.xes-standard.org/" xes.version="2.0" xes.features="nested-attributes">
+      <extension name="Time" prefix="time" uri="http://www.xes-standard.org/time.xesext"/>
+      <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"/>
+      <trace/>
+    </log>
+  END
   def response
     topic = @p[1].value
-    event = @p[2].value
-    if(topic == 'activity' && (event=='done' || event == 'calling'))
+    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']
       parameters = notification['parameters']
-      log_hash = notification['log_hash']
-      Dir.mkdir(log_dir+'/'+instancenr) unless Dir.exist?(log_dir+'/'+instancenr)
-      unless File.exist?(log_dir+'/'+instancenr+'/log.xes')
-        FileUtils.cp(::File.dirname(__FILE__)+'/template.xes', log_dir+'/'+instancenr+'/log.xes')
-        XML::Smart.modify(log_dir+'/'+instancenr+'/log.xes') do |xml|
+      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}"
+          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 => parameters["label"] if parameters && parameters.has_key?('label')
+          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 => 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
+          end
+          event.add 'date', :key => "time:timestamp", :value => Time.now 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']
+      receiving = notification['received']
+      Dir.mkdir(log_dir+'/'+uuid) unless Dir.exist?(log_dir+'/'+uuid)
       time_added=false
-      XML::Smart.modify(log_dir+'/'+instancenr+'/log.xes') do |xml|
-        trace = xml.find("/xmlns:log/xmlns:trace").first
-        event = trace.add "event"
-        event.add 'string', :key => "concept:name", :value => parameters["label"]
-        event.add 'string', :key => "lifecycle:transition", :value => event=='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
-        end
-        if log_hash.has_key?("data_received")
-          log_hash["data_received"].delete_if do |e|
-            if e.keys[0]=="timestamp"
-              event.add 'date', :key => "time:timestamp", :value => e.values[0]
-             time_added=true
-              true
-            else
-              false
-            end
-          end
-          if log_hash["data_received"].length > 0
+      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: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"
-            log_hash["data_received"].each{|e| list.add 'string', :key => e.keys[0] , :value => e.values[0]}
+            receiving.each do |k,v|
+              list.add 'string', :key => k, :value => v
+            end
           end
+          event.add 'date', :key => "time:timestamp", :value => Time.now unless time_added
+        rescue => e
+          puts e.message
+          puts e.backtrace
         end
-        event.add 'date', :key => "time:timestamp", :value => Time.now unless time_added
-      end
+      end  
     else
       pp "Something wrong"
     end
-
-
-
-
   end
 end  #}}}
 

data/server/handlerwrappers/default.rb

@@ -44,8 +44,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def activity_handle(passthrough, parameters) # {{{
-    @controller.notify("activity/calling", :instance => @controller.instance, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
-
+    @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
     result = []
     if passthrough.nil?
       params = []
@@ -110,36 +109,36 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def inform_activity_done # {{{
-    @controller.notify("activity/done", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
+    @controller.notify("activity/done", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position)
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("activity/manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
+    @controller.notify("activity/manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position)
   end # }}}
   def inform_activity_failed(err) # {{{
     puts err.message
     puts err.backtrace
-    @controller.notify("activity/failed", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
+    @controller.notify("activity/failed", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
   end # }}}
   def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
     unless status.nil?
       @controller.serialize_status!
-      @controller.notify("status/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :id => status.id, :message => status.message)
+      @controller.notify("status/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :id => status.id, :message => status.message)
     end
     unless changed_dataelements.nil?
       @controller.serialize_dataelements!
-      @controller.notify("dataelements/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :changed => changed_dataelements)
+      @controller.notify("dataelements/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_dataelements)
     end
     unless changed_endpoints.nil?
       @controller.serialize_endpoints!
-      @controller.notify("endpoints/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position, :changed => changed_endpoints)
+      @controller.notify("endpoints/change", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_endpoints)
     end
   end # }}}
 
   def vote_sync_after # {{{
-    @controller.call_vote("activity/syncing_after", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
+    @controller.call_vote("activity/syncing_after", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position)
   end # }}}
   def vote_sync_before(parameters=nil) # {{{
-    @controller.call_vote("activity/syncing_before", :endpoint => @handler_endpoint, :instance => @controller.instance, :activity => @handler_position)
+    @controller.call_vote("activity/syncing_before", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position)
   end # }}}
 
   def simplify_result(result)
@@ -181,12 +180,12 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :instance => @controller.instance, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result))
+    @controller.notify("activity/receiving", :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result))
     result = simplify_result(result)
     if options['CPEE_UPDATE']
       @handler_returnValue = result
       if options['CPEE_UPDATE_STATUS']
-        @controller.notify("activity/status", :instance => @controller.instance, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])
+        @controller.notify("activity/status", :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])
       end
       @handler_continue.continue WEEL::Signal::Again
     else
@@ -203,6 +202,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @controller.call_vote("simulating/step",
       :endpoint => @handler_endpoint,
       :instance => @controller.instance,
+      :instance_uuid => @controller.uuid,
       :activity => tid,
       :type => type,
       :nesting => nesting,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.195
+  version: 1.3.196
 platform: ruby
 authors:
 - Juergen eTM Mangler