cpee 1.3.206 → 1.3.207

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d487ede487ce7bf7fe2aa4d2f59549540eb9b0a
-  data.tar.gz: 3ca95fe9bd0b351529bdc9538b983b2d6f00dd73
+  metadata.gz: f25f955ce4d025a56dd90b97e7aff04983aa79c7
+  data.tar.gz: 5166ac6d0dce705032203a3752c484b449918313
 SHA512:
-  metadata.gz: 362c25b3bc380f795d1d8c7817d2cb371947556e0cf953c12ff0ffd3ba8fb278f25e7697e7cb3f9c82d307215d4d2b933756160634f960390d341bb68c19baa8
-  data.tar.gz: 539140c12dc844c4186ec4a5cad599360b622d64ee2e4923d612b3ff40c40f5003b3b39bbb6160e4fa514410663fd46dec760ccc0b6f46d5a85bcbd770695afb
+  metadata.gz: e8a5abd2641fce0f5e6dccc5bcd4d82948918f0b3d95277d24af3a43b5a0fc3e252b49c1c23a9486233e71b138e5df0472752b8433f63437e50e05f5b6fee625
+  data.tar.gz: fb26385147cdac4639ca8207c740852b3685faf68fc221d4c0f0ed729dc23db71ff76cb39f3576d73e84304d79be57ac8c3f0df9e90b44af172ae64d57e7532e

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.206"
+  s.version          = "1.3.207"
   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/controller.rb

@@ -96,9 +96,9 @@ module CPEE
       unserialize_endpoints!
       unserialize_dsl!
       unserialize_positions!
-      unserialize_attributes!
 
       @uuid = sync_uuid!
+      unserialize_attributes!
     end
 
     attr_reader :id
@@ -286,6 +286,14 @@ module CPEE
       @properties.data.find("/p:properties/p:attributes/p:*").map do |ele|
         @attributes[ele.qname.name] = ele.text
       end
+      uuid = @properties.data.find("/p:properties/p:attributes/p:uuid")
+      if uuid.empty? || uuid.length != 1 || @properties.data.find("/p:properties/p:attributes/p:uuid[.=\"#{@uuid}\"]").empty?
+        @properties.modify do |doc|
+          attr = doc.find("/p:properties/p:attributes").first
+          attr.find('p:uuid').delete_all!
+          attr.prepend('uuid',@uuid)
+        end
+      end
     end #}}}
     def unserialize_dataelements! #{{{
       @instance.data.clear

data/log/yaml/log.xml

@@ -0,0 +1,27 @@
+<declaration xmlns="http://riddl.org/ns/declaration/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <interface name="events">
+    <xi:include href="http://www.riddl.org/ns/common-patterns/notifications-consumer/1.0/consumer.xml"/>
+  </interface>
+  <interface name="cpee" location="http://cpee.org:9298">
+    <xi:include href="http://cpee.org:9298/?riddl-description"/>
+  </interface>
+  <interface name="logoverlay">
+    <xi:include href="logoverlay.xml"/>
+  </interface>
+
+  <facade>
+    <tile>
+      <layer name="cpee"/>
+    </tile>
+    <tile>
+      <layer name="events">
+        <apply-to>/log</apply-to>
+      </layer>
+    </tile>
+    <tile>
+      <layer name="logoverlay">
+        <apply-to>/{}/log</apply-to>
+      </layer>
+    </tile>
+  </facade>
+</declaration>

data/log/yaml/logoverlay.xml

@@ -0,0 +1,10 @@
+<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">                        
+  <message name="logresponse">
+    <parameter name="file" mimetype="text/xml"/>
+  </message>
+
+  <resource>
+    <get out="logresponse"/>
+  </resource>
+
+</description>

data/log/yaml/server.rb

@@ -0,0 +1,122 @@
+#!/usr/bin/ruby
+require 'pp'
+require 'json'
+require 'yaml'
+require 'rubygems'
+require 'riddl/server'
+require 'riddl/client'
+require 'riddl/utils/notifications_producer'
+require 'riddl/utils/properties'
+require 'riddl/utils/fileserve'
+require 'riddl/utils/downloadify'
+require 'riddl/utils/turtle'
+require 'time'
+
+class Logging < Riddl::Implementation #{{{
+  LOGTEMPLATE = {"log" =>  
+    {"extension" =>
+      { "time" =>"http://www.xes-standard.org/time.xesext", 
+        "concept" => "http://www.xes-standard.org/concept.xesext", 
+        "organisational" => "http://www.xes-standard.org/org.xesext", 
+        "lifecylce" => "http://www.xes-standard.org/lifecycle.xesext"
+      },
+      "global" => 
+        {
+          "trace" =>{"concept:name" => "__INVALID__"},
+          "event"=> {
+            "concept:name"=>"__INVALID__",
+            "concept:endpoint" => "", 
+            "id:id" => "", 
+            "lifecycle:transition" => "complete",
+            "time:timestamp" => ""
+          }
+        },
+      "classifier" =>{
+        "Data" => "data_send data_received",
+        "Data_Received"=>"data_receiver",
+        "Data_Send" => "data_send"
+      },
+      "trace" => {}
+    }
+  }
+  def doc(event_name,log_dir,instancenr,notification)
+    log = LOGTEMPLATE
+    uuid = notification['instance_uuid']
+    activity = notification["activity"]
+    parameters = notification['parameters']
+    receiving = notification['received']
+    Dir.mkdir(log_dir+'/'+uuid) unless Dir.exist?(log_dir+'/'+uuid)
+    time_added=false
+    log["log"]["trace"]["concept:name"] ||= "Instance #{instancenr}" unless log["log"]["trace"]["concept:name"]
+    File.open(log_dir+'/'+uuid+'/log.xes','w'){|f| f.puts log.to_yaml} unless File.exists? log_dir+'/'+uuid+'/log.xes'
+    event = {}
+    event["trace:id"] = instancenr
+    if parameters && parameters.has_key?('label')
+      event["concept:name"] = parameters["label"]
+    else
+      event["concept:name"]= log["log"]["trace"]["concept:name"]
+    end
+    event["concept:endpoint"] = notification["endpoint"] if notification["endpoint"]
+    event["id:id"] = activity
+    unless event_name=='receiving'
+      event["lifecycle:transition"]= event_name=='done'?"complete":"start"
+    else
+      event["lifecycle:transition"]="unknown"
+    end
+    data_send = ((parameters["arguments"].nil? ? [] : parameters["arguments"]) rescue [])
+    event["list"] = {"data_send" => data_send} unless data_send.empty?
+    if receiving && receiving.any?
+      if event.has_key? "list"
+        event["list"]["data_received"] ||= receiving 
+      else
+        event["list"] = {"data_receiver" => receiving} 
+      end
+    end
+    event["time:timestamp"]= Time.now.iso8601 unless time_added
+    File.open(log_dir+'/'+uuid+'/log.xes',"a") do |f|
+      f << {'event' => event}.to_yaml
+    end
+  end
+  
+	def rec_unjson(value,list,key)
+		case value
+			when Array then
+				li = list.add 'list', :key => key
+				value.each_with_index do |v,k|
+					rec_unjson(v,li,k)
+				end
+			when Hash then
+				li = list.add 'list', :key => key
+				value.each do |k,v|
+					rec_unjson(v,li,k)
+				end
+			else
+				list.add 'string', :key => key, :value => value
+		end
+	end
+
+  def response
+    topic = @p[1].value
+    event_name = @p[2].value
+    log_dir = ::File.dirname(__FILE__) + "/../logs_yaml"
+    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 => "coruscant.wst.univie.ac.at", :port => 9300) do #{{{
+  accessible_description true
+  cross_site_xhr true
+  log_path = "/home/demo/Projects/cpee-helpers/log/logs_yaml"
+
+  interface 'events' do
+	    run Logging if post 'event'
+  end
+  interface 'logoverlay' do |r|
+    run Riddl::Utils::FileServe, log_path + r[:h]["RIDDL_DECLARATION_PATH"]+ ".xes","text/xml" if get
+  end
+
+
+end.loop! #}}}

data/log/yaml/topics.xml

@@ -0,0 +1,22 @@
+<!--
+  This file is part of CPEE.
+
+  CPEE is free software: you can redistribute it and/or modify it under the terms
+  of the GNU General Public License as published by the Free Software Foundation,
+  either version 3 of the License, or (at your option) any later version.
+
+  CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  CPEE (file COPYING in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
+<topics xmlns='http://riddl.org/ns/common-patterns/notifications-producer/1.0'>
+  <topic id='activity'>
+    <event>calling</event>
+    <event>done</event>
+  </topic>
+</topics>

data/log/yaml/yaml.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/ruby
+require 'yaml'
+require 'pp'
+
+def pbuf(buf)
+  unless buf.empty?
+    pp YAML.load(buf)
+    pp '---'
+  end
+  buf.clear
+end
+
+buf = ""
+File.open('log.xes').each do |line|
+  pbuf(buf) if line == "---\n"
+  buf += line
+end
+
+pbuf(buf)

data/server/instances/1/properties.xml

@@ -1,6 +1,6 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>618e7837-ef17-4a56-9039-b37f5b7e0fbd</uuid>
+    <uuid/>
     <info>Lego Plate</info>
     <modeltype>CPEE</modeltype>
   </attributes>

data/server/instances/2/properties.xml

@@ -1,9 +1,9 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>dec6ca32-a6b1-4955-bd97-79a1bc130f2d</uuid>
     <info/>
     <modeltype>CPEE</modeltype>
     <theme>default</theme>
+    <uuid/>
   </attributes>
   <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>

data/server/instances/3/properties.xml

@@ -1,38 +1,73 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>c7e3ea2f-f932-4b57-978b-f26b5897bc86</uuid>
-    <info>Lego Plate</info>
+    <info>Linear</info>
     <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <uuid>
+  
+  e3ee0cf2-f36c-45a0-9dc7-d5a2b54cc3bd
+  aaaaaaaa-f36c-45a0-9dc7-d5a2b54cc3bd
+
+  aaaaaaaa-f36c-45a0-9dc7-d5a2b54cc3bd
+</uuid>
   </attributes>
-  <state>stopped</state>
+  <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
+  <positions>
+    <a1>after</a1>
+  </positions>
   <dataelements>
-    <i>0</i>
+    <x/>
   </dataelements>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <move>http://plate.wst.univie.ac.at:9200/go-next</move>
   </endpoints>
-  <dsl>loop pre_test{i&lt;2}  do
-  call :a1, :move, parameters: { :label =&gt; "Move to next station", :method =&gt; :post, :arguments =&gt; nil }, finalize: &lt;&lt;-END
-    data.i= data.i + 1
-  END
-end
+  <dsl>call :a1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }, finalize: &lt;&lt;-END
+  data.x += "a1,"
+END
+call :a2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a2,"
+END
+call :a3, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a3,"
+END
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <loop mode="pre_test" condition="i&lt;2">
-        <call id="a1" endpoint="move">
-          <parameters>
-            <label>Move to next station</label>
-            <method>:post</method>
-            <arguments/>
-          </parameters>
-          <finalize output="result">data.i= data.i + 1</finalize>
-          <update output="result"/>
-        </call>
-      </loop>
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
     </description>
   </dslx>
   <status>
@@ -41,22 +76,45 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <loop mode="pre_test" condition="i&lt;2">
-        <call id="a1" endpoint="move">
-          <parameters>
-            <label>Move to next station</label>
-            <method>:post</method>
-            <arguments/>
-          </parameters>
-          <finalize output="result">data.i= data.i + 1</finalize>
-          <update output="result"/>
-        </call>
-      </loop>
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
     </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
   </transformation>
 </properties>

data/server/instances/4/properties.xml

@@ -1,38 +1,67 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>90ee9a6e-cb92-4234-a571-607f8345b0a6</uuid>
-    <info>Lego Plate</info>
+    <uuid>3e8bef88-b2b4-484d-a3ae-17441983c57c</uuid>
+    <info>Linear</info>
     <modeltype>CPEE</modeltype>
+    <theme>default</theme>
   </attributes>
-  <state>stopped</state>
+  <state>ready</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
+  <positions>
+    <a1>after</a1>
+  </positions>
   <dataelements>
-    <i>0</i>
+    <x/>
   </dataelements>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <move>http://plate.wst.univie.ac.at:9200/go-next</move>
   </endpoints>
-  <dsl>loop pre_test{i&lt;2}  do
-  call :a1, :move, parameters: { :label =&gt; "Move to next station", :method =&gt; :post, :arguments =&gt; nil }, finalize: &lt;&lt;-END
-    data.i= data.i + 1
-  END
-end
+  <dsl>call :a1, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 2)] }, finalize: &lt;&lt;-END
+  data.x += "a1,"
+END
+call :a2, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a2,"
+END
+call :a3, :timeout, parameters: { :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; 4)] }, finalize: &lt;&lt;-END
+  data.x += "a3,"
+END
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <loop mode="pre_test" condition="i&lt;2">
-        <call id="a1" endpoint="move">
-          <parameters>
-            <label>Move to next station</label>
-            <method>:post</method>
-            <arguments/>
-          </parameters>
-          <finalize output="result">data.i= data.i + 1</finalize>
-          <update output="result"/>
-        </call>
-      </loop>
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
     </description>
   </dslx>
   <status>
@@ -41,22 +70,45 @@ end
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <loop mode="pre_test" condition="i&lt;2">
-        <call id="a1" endpoint="move">
-          <parameters>
-            <label>Move to next station</label>
-            <method>:post</method>
-            <arguments/>
-          </parameters>
-          <finalize output="result">data.i= data.i + 1</finalize>
-          <update output="result"/>
-        </call>
-      </loop>
+      <!--{{{-->
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>2</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a1,"</finalize>
+      </call>
+      <call id="a2" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a2,"</finalize>
+      </call>
+      <call id="a3" endpoint="timeout">
+        <parameters>
+          <!--{{{-->
+          <method>:post</method>
+          <arguments>
+            <timeout>4</timeout>
+          </arguments>
+        </parameters>
+        <!--}}}-->
+        <finalize output="result">data.x += "a3,"</finalize>
+      </call>
     </description>
   </description>
   <transformation>
     <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
+    <dataelements type="rest"/>
+    <endpoints type="rest"/>
   </transformation>
 </properties>