cpee 1.4.8 → 1.4.10

data/server/instances/3/properties.xml

@@ -1,115 +1,151 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <info>Linear</info>
+    <uuid>5f4b8bb6-2bc2-4e7e-8aee-5bc26ef80658</uuid>
+    <info>Plain Instance</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>ready</state>
+  <state>finished</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions>
-    <a1>after</a1>
-  </positions>
+  <positions/>
   <dataelements>
-    <x/>
+    <persons>0</persons>
+    <card>Visa_12345</card>
+    <airline>Lufthansa</airline>
+    <hotels>["Mariott","Mariott","Rathaus"]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>1125.0</costs>
   </dataelements>
   <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
   </endpoints>
-  <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,"
+  <dsl>call :a1, :bookAir, parameters: { :label =&gt; "Book Airline", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :from, :value =&gt; "data.from"), ⭐(:name =&gt; :to, :value =&gt; "data.to"), ⭐(:name =&gt; :persons, :value =&gt; "data.persons")] }, finalize: &lt;&lt;-END
+  data.airline = result.value('id')
+  data.costs += result.value('costs').to_f
+  status.update 1, 'Hotel'
 END
+parallel do
+  loop pre_test{data.persons &gt; 0}  do
+    parallel_branch data.persons do |p|
+      call :a2, :bookHotel, parameters: { :label =&gt; "Book Hotel", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :to, :value =&gt; "data.to")] }, finalize: &lt;&lt;-END
+        data.hotels &lt;&lt; result.value('id')
+        data.costs += result.value('costs').to_f
+      END
+    end
+    manipulate :a3, &lt;&lt;-END
+      data.persons -= 1
+    END
+  end
+end
+choose :inclusive do
+  alternative test{data.costs &gt; 700} do
+    call :a4, :approve, parameters: { :label =&gt; "Approve Hotel", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :costs, :value =&gt; "data.costs")] }
+  end
+end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <!--{{{-->
-      <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">
+      <call id="a1" endpoint="bookAir">
         <parameters>
-          <!--{{{-->
+          <label>Book Airline</label>
           <method>:post</method>
           <arguments>
-            <timeout>4</timeout>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
           </arguments>
         </parameters>
-        <!--}}}-->
-        <finalize output="result">data.x += "a3,"</finalize>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
       </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <label>Book Hotel</label>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</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>
+      <choose mode="inclusive">
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <label>Approve Hotel</label>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
     </description>
   </dslx>
   <status>
-    <id>0</id>
-    <message>undefined</message>
+    <id>1</id>
+    <message>Hotel</message>
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <!--{{{-->
-      <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">
+      <call id="a1" endpoint="bookAir">
         <parameters>
-          <!--{{{-->
+          <label>Book Airline</label>
           <method>:post</method>
           <arguments>
-            <timeout>4</timeout>
+            <from>data.from</from>
+            <to>data.to</to>
+            <persons>data.persons</persons>
           </arguments>
         </parameters>
-        <!--}}}-->
-        <finalize output="result">data.x += "a3,"</finalize>
+        <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
       </call>
+      <parallel>
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch pass="data.persons" local="p">
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <label>Book Hotel</label>
+                <method>:post</method>
+                <arguments>
+                  <to>data.to</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>
+      <choose mode="inclusive">
+        <alternative condition="data.costs &gt; 700">
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <label>Approve Hotel</label>
+              <method>:post</method>
+              <arguments>
+                <costs>data.costs</costs>
+              </arguments>
+            </parameters>
+          </call>
+        </alternative>
+      </choose>
     </description>
   </description>
   <transformation>

data/server/resources/base.xml

@@ -0,0 +1,78 @@
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="workqueue_mm">
+        <parameters>
+          <label>Setup Machine </label>
+          <method>:post</method>
+          <arguments>
+            <nc-program>Kuli</nc-program>
+            <material-name>XF-3</material-name>
+            <material-pic>https://centurio.work/customers/prime/maxxmill/mat.jpg</material-pic>
+            <result-pic>https://centurio.work/customers/prime/maxxmill/res.jpg</result-pic>
+            <comment>As fast as possible</comment>
+            <tools>
+              <tool>
+                <place>1</place>
+                <tool-name>Schrupper (500)</tool-name>
+                <tool-holder>X3</tool-holder>
+                <tool-orientation>gegenspindel axial</tool-orientation>
+                <corrections>
+                  <correction length-x="45.5" length-z="3" radius="1"/>
+                </corrections>
+                <attachments>
+                  <attachment label="Tool">https://centurio.work/customers/prime/maxxmill/tool.jpg</attachment>
+                </attachments>
+              </tool>
+              <tool>
+                <place>2</place>
+                <tool-name>Schaftfräser d6</tool-name>
+                <tool-holder>SK45</tool-holder>
+                <tool-orientation>-</tool-orientation>
+                <corrections>
+                  <correction length-x="45.5" length-z="3" radius="1"/>
+                </corrections>
+                <attachments>
+                  <attachment label="Tool">https://centurio.work/customers/prime/maxxmill/schaftfraeser.jpg</attachment>
+                </attachments>
+              </tool>
+            </tools>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.setup = result['status']</finalize>
+        <update output="result">data.task = result['task']</update>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+      <choose mode="exclusive">
+        <alternative condition="data.setup == 'ok'">
+          <call id="a2" endpoint="timeout">
+            <parameters>
+              <label>Produce Part</label>
+              <method>:post</method>
+              <arguments>
+                <timeout>8</timeout>
+              </arguments>
+            </parameters>
+            <finalize output="result"/>
+            <update output="result"/>
+            <_timing>
+              <_timing_min/>
+              <_timing_max/>
+              <_timing_avg/>
+            </_timing>
+            <_notes>
+              <_notes_general/>
+              <_notes_output/>
+              <_attachments/>
+            </_notes>
+          </call>
+        </alternative>
+      </choose>
+    </description>

data/server/resources/test.rb

@@ -0,0 +1,19 @@
+def manipulate(bla, label=nil, script=nil, &aaa)
+  if aaa.nil? && script.nil? && !label.nil?
+    script, label = label, nil
+  end
+  p label
+  p script
+  p aaa
+  p '---'
+end
+
+manipulate :a1, <<-END
+  bla1
+END
+manipulate :a2, "", <<-END
+  bla2
+END
+manipulate :a2, "" do
+  bla2
+end

data/server/resources/test.xml

@@ -0,0 +1,33 @@
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <manipulate id="a1" label="test">a
+a
+a</manipulate>
+      <choose mode="exclusive">
+        <alternative condition="">
+          <terminate/>
+        </alternative>
+        <alternative condition="">
+          <stop/>
+        </alternative>
+        <otherwise/>
+      </choose>
+      <call id="a2" endpoint="">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+        </parameters>
+        <finalize output="result"/>
+        <update output="result"/>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>

data/server/resources/topics.xml

@@ -58,11 +58,14 @@
   </topic>
   <topic id='handler'>
     <event>change</event>
-    <event>error</event>
-    <event>debug</event>
-    <event>info</event>
   </topic>
   <topic id='simulating'>
     <event>step</event>
   </topic>
+  <topic id='task'>
+    <event>instantiation</event>
+    <event>error</event>
+    <event>debug</event>
+    <event>info</event>
+  </topic>
 </topics>

data/server/resources/transformation_dslx.xsl

@@ -358,6 +358,11 @@
         <xsl:apply-templates select="d:*" mode="sub"/>
         <xsl:text>]</xsl:text>
       </xsl:when>
+      <xsl:when test="count(*) &gt; 0 and name()='sensors'">
+        <xsl:text>"[ </xsl:text>
+        <xsl:apply-templates select="*" mode="JSON"/>
+        <xsl:text>]"</xsl:text>
+      </xsl:when>
       <xsl:when test="count(*) &gt; 0 and not(name()='arguments')">
         <xsl:text>{</xsl:text>
         <xsl:apply-templates select="d:*" mode="parameter"/>

data/server/server.pid

@@ -0,0 +1 @@
+10311

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.10
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -98,6 +98,7 @@ files:
 - README
 - Rakefile
 - cockpit/README
+- cockpit/config.json
 - cockpit/contrib/graph_example.svg
 - cockpit/contrib/legend.svg
 - cockpit/contrib/symbols.svg
@@ -275,95 +276,36 @@ files:
 - lib/instantiation.xml
 - log/chain.xml
 - log/elasticsearch.rb
+- log/elasticsearch_logging.rb
+- log/legacy/test_es.rb
+- log/legacy/test_split.rb
 - log/log.xml
-- log/logs/1/test
 - log/logs/index.php
 - log/non_tamp.rb
 - log/template.xes_xml
 - log/template.xes_yaml
 - log/topics.xml
+- log/trace.yaml
+- log/trace_sic.yaml
 - log/xes_xml.rb
 - log/xes_yaml.rb
 - server/handlerwrappers/default.rb
 - server/handlerwrappers/soap.rb
 - server/instances/1/properties.xml
-- server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/consumer-secret
-- server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/producer-secret
-- server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/subscription.xml
-- server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/consumer-secret
-- server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/producer-secret
-- server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/subscription.xml
-- server/instances/10/properties.xml
-- server/instances/11/properties.xml
-- server/instances/12/properties.xml
-- server/instances/13/properties.xml
-- server/instances/14/properties.xml
-- server/instances/15/properties.xml
-- server/instances/16/properties.xml
-- server/instances/17/properties.xml
-- server/instances/18/properties.xml
-- server/instances/19/properties.xml
 - server/instances/2/properties.xml
-- server/instances/20/properties.xml
-- server/instances/21/properties.xml
-- server/instances/22/properties.xml
-- server/instances/23/properties.xml
-- server/instances/24/properties.xml
-- server/instances/25/properties.xml
-- server/instances/26/properties.xml
-- server/instances/27/properties.xml
-- server/instances/28/properties.xml
-- server/instances/29/properties.xml
 - server/instances/3/properties.xml
-- server/instances/30/properties.xml
-- server/instances/31/properties.xml
-- server/instances/313/notifications/crisp/consumer-secret
-- server/instances/313/notifications/crisp/producer-secret
-- server/instances/313/notifications/crisp/subscription.xml
-- server/instances/313/notifications/logging/consumer-secret
-- server/instances/313/notifications/logging/producer-secret
-- server/instances/313/notifications/logging/subscription.xml
-- server/instances/313/notifications/logging_yaml/consumer-secret
-- server/instances/313/notifications/logging_yaml/producer-secret
-- server/instances/313/notifications/logging_yaml/subscription.xml
-- server/instances/313/properties.xml
-- server/instances/32/properties.xml
-- server/instances/33/properties.xml
-- server/instances/4/properties.xml
-- server/instances/5/properties.xml
-- server/instances/6/properties.xml
-- server/instances/662/notifications/crisp/consumer-secret
-- server/instances/662/notifications/crisp/producer-secret
-- server/instances/662/notifications/crisp/subscription.xml
-- server/instances/662/notifications/logging/consumer-secret
-- server/instances/662/notifications/logging/producer-secret
-- server/instances/662/notifications/logging/subscription.xml
-- server/instances/662/notifications/logging_yaml/consumer-secret
-- server/instances/662/notifications/logging_yaml/producer-secret
-- server/instances/662/notifications/logging_yaml/subscription.xml
-- server/instances/662/properties.xml
-- server/instances/663/properties.xml
-- server/instances/664/properties.xml
-- server/instances/665/properties.xml
-- server/instances/666/properties.xml
-- server/instances/667/properties.xml
-- server/instances/668/properties.xml
-- server/instances/669/properties.xml
-- server/instances/670/properties.xml
-- server/instances/671/properties.xml
-- server/instances/672/properties.xml
-- server/instances/673/properties.xml
-- server/instances/7/properties.xml
-- server/instances/8/properties.xml
-- server/instances/9/properties.xml
+- server/resources/base.xml
 - server/resources/empty_dslx.xml
 - server/resources/properties.init
 - server/resources/properties.schema.active
 - server/resources/properties.schema.finished
 - server/resources/properties.schema.inactive
+- server/resources/test.rb
+- server/resources/test.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/resources/transformation_dslx.xsl
+- server/server.pid
 - server/server.rb
 - test/callback.rb
 - tools/cpee
@@ -393,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Preliminary release of cloud process execution engine (cpee). If you just