cpee 2.1.47 → 2.1.48

data/server/executionhandlers/ruby/desc.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<description xmlns="http://cpee.org/ns/description/1.0">
+  <call id="a3" endpoint="">
+    <parameters>
+      <label>asdasd</label>
+      <method>:post</method>
+      <arguments/>
+    </parameters>
+    <annotations>
+      <_timing>
+        <_timing_weight/>
+        <_timing_avg/>
+        <explanations/>
+      </_timing>
+      <_shifting>
+        <_shifting_type>Duration</_shifting_type>
+      </_shifting>
+      <_context_data_analysis>
+        <probes/>
+        <ips/>
+      </_context_data_analysis>
+      <report>
+        <url/>
+      </report>
+      <_notes>
+        <_notes_general/>
+      </_notes>
+    </annotations>
+    <documentation>
+      <input/>
+      <output/>
+      <implementation>
+        <description/>
+      </implementation>
+    </documentation>
+  </call>
+  <closed_loop overrun="wait" execution="sequential">
+    <_probability>
+      <_probability_min/>
+      <_probability_max/>
+      <_probability_avg/>
+    </_probability>
+    <closed_loop_measuring ctime="200">
+      <_expected/>
+    </closed_loop_measuring>
+    <closed_loop_measuring ctime="200">
+      <_expected>
+        <value>test</value>
+        <value>bla</value>
+      </_expected>
+    </closed_loop_measuring>
+    <closed_loop_control ctime="200">
+      <_expected>
+        <change>
+          <type>:PID</type>
+          <value>grrr</value>
+          <upper/>
+          <lower/>
+        </change>
+        <change>
+          <type>:PID</type>
+          <value>duuur</value>
+          <upper/>
+          <lower/>
+        </change>
+      </_expected>
+      <closed_loop_control ctime="200">
+        <_expected/>
+      </closed_loop_control>
+    </closed_loop_control>
+    <closed_loop_cancel condition=""/>
+  </closed_loop>
+  <call id="a1" endpoint="">
+    <parameters>
+      <label/>
+      <method>:post</method>
+      <arguments/>
+    </parameters>
+    <annotations>
+      <_timing>
+        <_timing_weight/>
+        <_timing_avg/>
+        <explanations/>
+      </_timing>
+      <_shifting>
+        <_shifting_type>Duration</_shifting_type>
+      </_shifting>
+      <_context_data_analysis>
+        <probes/>
+        <ips/>
+      </_context_data_analysis>
+      <report>
+        <url/>
+      </report>
+      <_notes>
+        <_notes_general/>
+      </_notes>
+    </annotations>
+    <documentation>
+      <input/>
+      <output/>
+      <implementation>
+        <description/>
+      </implementation>
+    </documentation>
+  </call>
+</description>

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -221,6 +221,67 @@
       <xsl:text>end</xsl:text>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
+    <xsl:if test="name()='closed_loop'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>closed_loop</xsl:text>
+      <xsl:if test="@overrun">
+        <xsl:text> :overrun =&gt; </xsl:text>
+        <xsl:value-of select="@overrun"/>
+        <xsl:if test="@execution">
+          <xsl:text>, :execution =&gt; :</xsl:text>
+          <xsl:value-of select="@execution"/>
+        </xsl:if>
+      </xsl:if>
+      <xsl:text> do</xsl:text>
+      <xsl:call-template name="print-newline"/>
+      <xsl:apply-templates>
+        <xsl:with-param name="myspace">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:apply-templates>
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>end</xsl:text>
+      <xsl:call-template name="print-newline"/>
+    </xsl:if>
+    <xsl:if test="name()='closed_loop_measuring' or name()='closed_loop_control'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>closed_loop_slice :type =&gt; :</xsl:text>
+      <xsl:value-of select="substring(name(),13,10)"/>
+      <xsl:if test="@ctime">
+        <xsl:text>, :ctime =&gt; </xsl:text>
+        <xsl:value-of select="@ctime"/>
+      </xsl:if>
+      <xsl:text> do</xsl:text>
+      <xsl:call-template name="print-newline"/>
+      <xsl:apply-templates>
+        <xsl:with-param name="myspace">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:apply-templates>
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>end</xsl:text>
+      <xsl:call-template name="print-newline"/>
+    </xsl:if>
     <xsl:if test="name()='choose'">
       <xsl:call-template name="print-space">
         <xsl:with-param name="i">1</xsl:with-param>
@@ -229,14 +290,6 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>choose </xsl:text>
-      <xsl:choose>
-        <xsl:when test="@mode='exclusive'">
-          <xsl:text>:exclusive</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>:inclusive</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
       <xsl:text> do</xsl:text>
       <xsl:call-template name="print-newline"/>
       <xsl:apply-templates>

data/server/routing/end.pid

@@ -1 +1 @@
-10497
+383721

data/server/routing/forward-events-00.pid

@@ -1 +1 @@
-10510
+383730

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-10503
+383727

data/server/routing/persist.pid

@@ -1 +1 @@
-10500
+383724

data/tools/cpee

@@ -36,7 +36,9 @@ ARGV.options { |opt|
 	opt.on("")
   opt.on(wrap("[archive DIR URL]      save properties from all finished instances listed at URL into DIR. Examples:\ncpee archive ./archive http://localhost:9298/1/\ncpee archive ./archive http://localhost:9298/1-200\ncpee archive ./archive http://localhost:9298/*"))
 	opt.on("")
-  opt.on(wrap("[abandon URL]          running processes are stopped; ready or stopped processes are abandoned. Examples:\ncpee abandon http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200\ncpee abandon http://localhost:9298/*"))
+  opt.on(wrap("[abandon! URL]         running processes are stopped; ready or stopped processes are abandoned. Examples:\ncpee abandon! http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200\ncpee abandon http://localhost:9298/*"))
+	opt.on("")
+  opt.on(wrap("[abandon URL]          ready or stopped processes are abandoned. Examples:\ncpee abandon http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200\ncpee abandon http://localhost:9298/*"))
 	opt.on("")
   opt.on(wrap("[a_by_name URL STRING] ready or stopped processes are abandoned by regex on attributes/info. Examples:\ncpee abandon http://localhost:9298/1/ \"aa.a\"\ncpee abandon http://localhost:9298/1-200 aaa"))
 	opt.on("")
@@ -55,7 +57,7 @@ ARGV.options { |opt|
 }
 if (ARGV.length == 0) ||
    (ARGV.length == 1  && !(%w(ui convert).include?(ARGV[0]))) ||
-   (ARGV.length == 2  && !(%w(abandon start delete! cpui new).include?(ARGV[0]))) ||
+   (ARGV.length == 2  && !(%w(abandon abandon! start delete! cpui new).include?(ARGV[0]))) ||
    (ARGV.length == 3  && !(%w(archive a_by_name).include?(ARGV[0]))) ||
    (ARGV.length >  3)
   puts ARGV.options
@@ -176,7 +178,7 @@ elsif command == 'archive'
       exit
     end
   else
-    names << File.basename(p2)
+    names << File.basename(p2).to_i
   end
   names.each do |name|
     print "Working on: " + name.to_s + "\r"
@@ -211,7 +213,6 @@ elsif command == 'archive'
       end
     end
   end
-  puts
 elsif command == 'a_by_name'
   p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)
@@ -231,7 +232,7 @@ elsif command == 'a_by_name'
       exit
     end
   else
-    names << File.basename(p1)
+    names << File.basename(p1).to_i
   end
   names.each do |name|
     print "Working on: " + name.to_s + "\r"
@@ -249,8 +250,7 @@ elsif command == 'a_by_name'
       end
     end
   end
-  puts
-elsif command == 'abandon'
+elsif command == 'abandon!'
   p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)
   names = []
@@ -269,7 +269,7 @@ elsif command == 'abandon'
       exit
     end
   else
-    names << File.basename(p1)
+    names << File.basename(p1).to_i
   end
   names.each do |name|
     print "Working on: " + name.to_s + "\r"
@@ -284,7 +284,38 @@ elsif command == 'abandon'
       end
     end
   end
-  puts
+elsif command == 'abandon'
+  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
+  base = File.dirname(p1)
+  names = []
+  if File.basename(p1) =~ /(\d+)-(\d+)/
+    names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p1) == '*'
+    res = Typhoeus.get(File.join(base,'/'), headers: { 'see-instances' => 'true' })
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
+  else
+    names << File.basename(p1).to_i
+  end
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    res1 = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
+    if res1.success?
+      if res1.response_body == 'stopping'
+        Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=stopping")
+      elsif res1.response_body == 'ready' || res1.response_body == 'stopped'
+        Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
+      end
+    end
+  end
 elsif command == 'start'
   p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.47
+  version: 2.1.48
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -252,7 +252,6 @@ files:
 - cockpit/templates/UR-VUE 2020 Solution View.xml
 - cockpit/templates/UR-VUE 2020.xml
 - cockpit/templates/Wait.xml
-- cockpit/templates/Wait.xml.attrs
 - cockpit/templates/Worklist.xml
 - cockpit/templates/instantiate.local/Take_Sub.xml
 - cockpit/templates/instantiate/Take_Perf.xml
@@ -704,6 +703,7 @@ files:
 - server/executionhandlers/ruby/backend/run
 - server/executionhandlers/ruby/connection.rb
 - server/executionhandlers/ruby/controller.rb
+- server/executionhandlers/ruby/desc.xml
 - server/executionhandlers/ruby/dsl_to_dslx.xsl
 - server/executionhandlers/ruby/execution.rb
 - server/resources/empty_dslx.xml
@@ -712,15 +712,12 @@ files:
 - server/resources/properties.init
 - server/resources/states.dot
 - server/resources/states.xml
+- server/resources/test.pdf
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/routing/end.pid
 - server/routing/end.rb
 - server/routing/forward-events-00.pid
-- server/routing/forward-events-01.pid
-- server/routing/forward-events-02.pid
-- server/routing/forward-events-03.pid
-- server/routing/forward-events-04.pid
 - server/routing/forward-events.rb
 - server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
@@ -752,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Preliminary release of cloud process execution engine (cpee.org). If you

data/cockpit/templates/Wait.xml.attrs

@@ -1,16 +0,0 @@
-{
-  "info": "Wait",
-  "creator": "Christine Ashcreek",
-  "author": "Christine Ashcreek",
-  "organisation1": "http://cpee.org/~demo/orgviz/organisation_informatik.xml",
-  "customer": "pilotfabrik",
-  "modeltype": "CPEE",
-  "guarded": "none",
-  "status": "development",
-  "guarded_id": "",
-  "model_uuid": "c09dad6b-547e-41a9-8f31-95c40e71c607",
-  "model_version": "",
-  "theme": "extended",
-  "design_dir": "Templates.dir",
-  "design_stage": "development"
-}

data/server/routing/forward-events-01.pid

@@ -1 +0,0 @@
-10513

data/server/routing/forward-events-02.pid

@@ -1 +0,0 @@
-10516

data/server/routing/forward-events-03.pid

@@ -1 +0,0 @@
-10519

data/server/routing/forward-events-04.pid

@@ -1 +0,0 @@
-10522