cpee 1.5.19 → 1.5.24

data/lib/cpee/implementation.rb

@@ -77,6 +77,7 @@ module CPEE
       interface 'main' do
         run CPEE::Instances, controller if get '*'
         run CPEE::NewInstance, controller, opts if post 'instance-new'
+        run CPEE::NewXMLInstance, controller, opts if post 'instance-new-xml'
         on resource do |r|
           run CPEE::Info, controller if get
           run CPEE::DeleteInstance, controller, opts if delete
@@ -175,6 +176,33 @@ module CPEE
       Riddl::Parameter::Simple.new("id", id)
     end
   end #}}}
+  class NewXMLInstance < Riddl::Implementation #{{{
+    def response
+      controller = @a[0]
+      opts = @a[1]
+      xml = @p[0].value.read
+      id = controller.keys.sort.last.to_i
+
+
+      while true
+        id += 1
+        unless Dir.exists? opts[:instances] + "/#{id}"
+          Dir.mkdir(opts[:instances] + "/#{id}") rescue nil
+          break
+        end
+      end
+      File.write(File.join(opts[:instances].to_s,id.to_s,'properties.xml'),xml)
+
+      controller[id] = Controller.new(id,opts)
+      controller[id].state_change!
+
+      @headers << Riddl::Header.new("CPEE-INSTANCE", controller[id].instance)
+      @headers << Riddl::Header.new("CPEE-INSTANCE-URL", controller[id].instance_url)
+      @headers << Riddl::Header.new("CPEE-INSTANCE-UUID", controller[id].uuid)
+
+      Riddl::Parameter::Simple.new("id", id)
+    end
+  end #}}}
 
   class Info < Riddl::Implementation #{{{
     def response

data/lib/cpee/instantiation.rb

@@ -296,7 +296,6 @@ module CPEE
 
     class ContinueTask < Riddl::Implementation #{{{
       def response
-        cpee         = @h['X_CPEE'] || @a[0]
         cblist       = @a[1]
         topic        = @p[1].value
         event_name   = @p[2].value
@@ -305,6 +304,8 @@ module CPEE
         key = @r.last
         cb, condition, instance, uuid, instance_url = cblist.lrange(key,0,-1)
 
+        cpee = File.dirname(instance_url)
+
         orisend = {
           'CPEE-INSTANCE' => instance,
           'CPEE-INSTANCE-URL' => instance_url,

data/lib/engine.xml

@@ -30,6 +30,9 @@
   <message name="instance-new">
     <parameter name="info" type="string"/>
   </message>
+  <message name="instance-new-xml">
+    <parameter name="xml" mimetype="application/xml"/>
+  </message>
 
   <message name="instance-info">
     <parameter name="info" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
@@ -70,6 +73,7 @@
       <doc:documentation>a</doc:documentation>
     </get>
     <post in="instance-new" out="instance-id"/>
+    <post in="instance-new-xml" out="instance-id"/>
     <resource>
       <get in="*" out="instance-info"/>
       <delete in="*"/>

data/log/azure.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 require_relative 'azure_logger'
 
-Riddl::Server.new(File.join(__dir__,'/log.xml'), :host => 'localhost', :port => 9313) do
+Riddl::Server.new(File.join(__dir__,'/log.xml'), :host => 'localhost', :port => 9398) do
   accessible_description true
   cross_site_xhr true
   interface 'events' do

data/server/handlerwrappers/default.rb

@@ -65,6 +65,10 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     params
   end #}}}
 
+  def additional
+    { :attributes => @controller.attributes_translated } rescue {}
+  end
+
   def proto_curl(parameters) #{{{
     params = []
     callback = Digest::MD5.hexdigest(Kernel::rand().to_s)

data/server/resources/transformation_dslx.xsl

@@ -389,6 +389,9 @@
         <xsl:apply-templates select="d:*" mode="plainmulti"/>
         <xsl:text>]</xsl:text>
       </xsl:when>
+      <xsl:when test="count(*) &gt; 0 and name()='report'">
+        <xsl:apply-templates select="d:*" mode="plainmulti"/>
+      </xsl:when>
       <xsl:when test="count(*) &gt; 0 and not(name()='arguments')">
         <xsl:text>{</xsl:text>
         <xsl:apply-templates select="d:*" mode="parameter"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.19
+  version: 1.5.24
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -61,6 +61,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: xml-smart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +144,7 @@ files:
 - cockpit/contrib/transformation1.xsl
 - cockpit/contrib/transformation2.xsl
 - cockpit/contrib/tree_example.svg
+- cockpit/css/model.css
 - cockpit/css/track.css
 - cockpit/css/ui.css
 - cockpit/css/wfadaptor.css
@@ -131,10 +152,12 @@ files:
 - cockpit/index.html
 - cockpit/js/details.js
 - cockpit/js/instance.js
+- cockpit/js/model.js
 - cockpit/js/parameters.js
 - cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
+- cockpit/model.html
 - cockpit/rngs/attributes.rng
 - cockpit/rngs/dataelements.rng
 - cockpit/rngs/endpoints.rng
@@ -181,6 +204,45 @@ files:
 - cockpit/testsets/convert_preset.rb
 - cockpit/testsets/testsets.xml
 - cockpit/testsets/transformations.xml
+- cockpit/themes/compact/rngs/alternative.rng
+- cockpit/themes/compact/rngs/call.rng
+- cockpit/themes/compact/rngs/callmanipulate.rng
+- cockpit/themes/compact/rngs/choose.rng
+- cockpit/themes/compact/rngs/critical.rng
+- cockpit/themes/compact/rngs/escape.rng
+- cockpit/themes/compact/rngs/group.rng
+- cockpit/themes/compact/rngs/loop.rng
+- cockpit/themes/compact/rngs/manipulate.rng
+- cockpit/themes/compact/rngs/otherwise.rng
+- cockpit/themes/compact/rngs/parallel.rng
+- cockpit/themes/compact/rngs/parallel_branch.rng
+- cockpit/themes/compact/rngs/scripts.rng
+- cockpit/themes/compact/rngs/stop.rng
+- cockpit/themes/compact/rngs/terminate.rng
+- cockpit/themes/compact/symbols/alternative.svg
+- cockpit/themes/compact/symbols/arrow.svg
+- cockpit/themes/compact/symbols/call.svg
+- cockpit/themes/compact/symbols/callmanipulate.svg
+- cockpit/themes/compact/symbols/choose.svg
+- cockpit/themes/compact/symbols/choose_exclusive.svg
+- cockpit/themes/compact/symbols/choose_inclusive.svg
+- cockpit/themes/compact/symbols/complex.svg
+- cockpit/themes/compact/symbols/critical.svg
+- cockpit/themes/compact/symbols/end.svg
+- cockpit/themes/compact/symbols/escape.svg
+- cockpit/themes/compact/symbols/event_end.svg
+- cockpit/themes/compact/symbols/loop.svg
+- cockpit/themes/compact/symbols/manipulate.svg
+- cockpit/themes/compact/symbols/otherwise.svg
+- cockpit/themes/compact/symbols/parallel.svg
+- cockpit/themes/compact/symbols/parallel_branch.svg
+- cockpit/themes/compact/symbols/parallel_branch_compact.svg
+- cockpit/themes/compact/symbols/parallel_branch_event.svg
+- cockpit/themes/compact/symbols/parallel_branch_normal.svg
+- cockpit/themes/compact/symbols/scripts.svg
+- cockpit/themes/compact/symbols/start.svg
+- cockpit/themes/compact/symbols/stop.svg
+- cockpit/themes/compact/symbols/terminate.svg
 - cockpit/themes/compact/theme.js
 - cockpit/themes/default/rngs/alternative.rng
 - cockpit/themes/default/rngs/call.rng
@@ -223,7 +285,165 @@ files:
 - cockpit/themes/default/symbols/stop.svg
 - cockpit/themes/default/symbols/terminate.svg
 - cockpit/themes/default/theme.js
+- cockpit/themes/extended/rngs/alternative.rng
+- cockpit/themes/extended/rngs/call.rng
+- cockpit/themes/extended/rngs/callmanipulate.rng
+- cockpit/themes/extended/rngs/choose.rng
+- cockpit/themes/extended/rngs/critical.rng
+- cockpit/themes/extended/rngs/escape.rng
+- cockpit/themes/extended/rngs/group.rng
+- cockpit/themes/extended/rngs/loop.rng
+- cockpit/themes/extended/rngs/manipulate.rng
+- cockpit/themes/extended/rngs/otherwise.rng
+- cockpit/themes/extended/rngs/parallel.rng
+- cockpit/themes/extended/rngs/parallel_branch.rng
+- cockpit/themes/extended/rngs/scripts.rng
+- cockpit/themes/extended/rngs/stop.rng
+- cockpit/themes/extended/rngs/terminate.rng
+- cockpit/themes/extended/symbols/alternative.svg
+- cockpit/themes/extended/symbols/arrow.svg
+- cockpit/themes/extended/symbols/call.svg
+- cockpit/themes/extended/symbols/callmanipulate.svg
+- cockpit/themes/extended/symbols/choose.svg
+- cockpit/themes/extended/symbols/choose_exclusive.svg
+- cockpit/themes/extended/symbols/choose_inclusive.svg
+- cockpit/themes/extended/symbols/complex.svg
+- cockpit/themes/extended/symbols/critical.svg
+- cockpit/themes/extended/symbols/end.svg
+- cockpit/themes/extended/symbols/escape.svg
+- cockpit/themes/extended/symbols/event_end.svg
+- cockpit/themes/extended/symbols/loop.svg
+- cockpit/themes/extended/symbols/manipulate.svg
+- cockpit/themes/extended/symbols/otherwise.svg
+- cockpit/themes/extended/symbols/parallel.svg
+- cockpit/themes/extended/symbols/parallel_branch.svg
+- cockpit/themes/extended/symbols/parallel_branch_compact.svg
+- cockpit/themes/extended/symbols/parallel_branch_event.svg
+- cockpit/themes/extended/symbols/parallel_branch_normal.svg
+- cockpit/themes/extended/symbols/scripts.svg
+- cockpit/themes/extended/symbols/start.svg
+- cockpit/themes/extended/symbols/stop.svg
+- cockpit/themes/extended/symbols/terminate.svg
 - cockpit/themes/extended/theme.js
+- cockpit/themes/labels/rngs/alternative.rng
+- cockpit/themes/labels/rngs/call.rng
+- cockpit/themes/labels/rngs/callmanipulate.rng
+- cockpit/themes/labels/rngs/choose.rng
+- cockpit/themes/labels/rngs/critical.rng
+- cockpit/themes/labels/rngs/escape.rng
+- cockpit/themes/labels/rngs/finalize.rng
+- cockpit/themes/labels/rngs/group.rng
+- cockpit/themes/labels/rngs/loop.rng
+- cockpit/themes/labels/rngs/manipulate.rng
+- cockpit/themes/labels/rngs/otherwise.rng
+- cockpit/themes/labels/rngs/parallel.rng
+- cockpit/themes/labels/rngs/parallel_branch.rng
+- cockpit/themes/labels/rngs/stop.rng
+- cockpit/themes/labels/rngs/terminate.rng
+- cockpit/themes/labels/rngs/update.rng
+- cockpit/themes/labels/symbols/alternative.svg
+- cockpit/themes/labels/symbols/arrow.svg
+- cockpit/themes/labels/symbols/call.svg
+- cockpit/themes/labels/symbols/callmanipulate.svg
+- cockpit/themes/labels/symbols/choose.svg
+- cockpit/themes/labels/symbols/choose_exclusive.svg
+- cockpit/themes/labels/symbols/choose_inclusive.svg
+- cockpit/themes/labels/symbols/complex.svg
+- cockpit/themes/labels/symbols/critical.svg
+- cockpit/themes/labels/symbols/end.svg
+- cockpit/themes/labels/symbols/escape.svg
+- cockpit/themes/labels/symbols/event_end.svg
+- cockpit/themes/labels/symbols/loop.svg
+- cockpit/themes/labels/symbols/manipulate.svg
+- cockpit/themes/labels/symbols/otherwise.svg
+- cockpit/themes/labels/symbols/parallel.svg
+- cockpit/themes/labels/symbols/parallel_branch.svg
+- cockpit/themes/labels/symbols/parallel_branch_compact.svg
+- cockpit/themes/labels/symbols/parallel_branch_event.svg
+- cockpit/themes/labels/symbols/parallel_branch_normal.svg
+- cockpit/themes/labels/symbols/scripts.svg
+- cockpit/themes/labels/symbols/start.svg
+- cockpit/themes/labels/symbols/stop.svg
+- cockpit/themes/labels/symbols/terminate.svg
+- cockpit/themes/model/rngs/alternative.rng
+- cockpit/themes/model/rngs/call.rng
+- cockpit/themes/model/rngs/callmanipulate.rng
+- cockpit/themes/model/rngs/choose.rng
+- cockpit/themes/model/rngs/critical.rng
+- cockpit/themes/model/rngs/escape.rng
+- cockpit/themes/model/rngs/group.rng
+- cockpit/themes/model/rngs/loop.rng
+- cockpit/themes/model/rngs/manipulate.rng
+- cockpit/themes/model/rngs/otherwise.rng
+- cockpit/themes/model/rngs/parallel.rng
+- cockpit/themes/model/rngs/parallel_branch.rng
+- cockpit/themes/model/rngs/scripts.rng
+- cockpit/themes/model/rngs/stop.rng
+- cockpit/themes/model/rngs/terminate.rng
+- cockpit/themes/model/symbols/alternative.svg
+- cockpit/themes/model/symbols/arrow.svg
+- cockpit/themes/model/symbols/call.svg
+- cockpit/themes/model/symbols/callmanipulate.svg
+- cockpit/themes/model/symbols/choose.svg
+- cockpit/themes/model/symbols/choose_exclusive.svg
+- cockpit/themes/model/symbols/choose_inclusive.svg
+- cockpit/themes/model/symbols/complex.svg
+- cockpit/themes/model/symbols/critical.svg
+- cockpit/themes/model/symbols/end.svg
+- cockpit/themes/model/symbols/escape.svg
+- cockpit/themes/model/symbols/event_end.svg
+- cockpit/themes/model/symbols/loop.svg
+- cockpit/themes/model/symbols/manipulate.svg
+- cockpit/themes/model/symbols/otherwise.svg
+- cockpit/themes/model/symbols/parallel.svg
+- cockpit/themes/model/symbols/parallel_branch.svg
+- cockpit/themes/model/symbols/parallel_branch_compact.svg
+- cockpit/themes/model/symbols/parallel_branch_event.svg
+- cockpit/themes/model/symbols/parallel_branch_normal.svg
+- cockpit/themes/model/symbols/scripts.svg
+- cockpit/themes/model/symbols/start.svg
+- cockpit/themes/model/symbols/stop.svg
+- cockpit/themes/model/symbols/terminate.svg
+- cockpit/themes/model/theme.js
+- cockpit/themes/packed/rngs/alternative.rng
+- cockpit/themes/packed/rngs/call.rng
+- cockpit/themes/packed/rngs/callmanipulate.rng
+- cockpit/themes/packed/rngs/choose.rng
+- cockpit/themes/packed/rngs/critical.rng
+- cockpit/themes/packed/rngs/escape.rng
+- cockpit/themes/packed/rngs/group.rng
+- cockpit/themes/packed/rngs/loop.rng
+- cockpit/themes/packed/rngs/manipulate.rng
+- cockpit/themes/packed/rngs/otherwise.rng
+- cockpit/themes/packed/rngs/parallel.rng
+- cockpit/themes/packed/rngs/parallel_branch.rng
+- cockpit/themes/packed/rngs/scripts.rng
+- cockpit/themes/packed/rngs/stop.rng
+- cockpit/themes/packed/rngs/terminate.rng
+- cockpit/themes/packed/symbols/alternative.svg
+- cockpit/themes/packed/symbols/arrow.svg
+- cockpit/themes/packed/symbols/call.svg
+- cockpit/themes/packed/symbols/callmanipulate.svg
+- cockpit/themes/packed/symbols/choose.svg
+- cockpit/themes/packed/symbols/choose_exclusive.svg
+- cockpit/themes/packed/symbols/choose_inclusive.svg
+- cockpit/themes/packed/symbols/complex.svg
+- cockpit/themes/packed/symbols/critical.svg
+- cockpit/themes/packed/symbols/end.svg
+- cockpit/themes/packed/symbols/escape.svg
+- cockpit/themes/packed/symbols/event_end.svg
+- cockpit/themes/packed/symbols/loop.svg
+- cockpit/themes/packed/symbols/manipulate.svg
+- cockpit/themes/packed/symbols/otherwise.svg
+- cockpit/themes/packed/symbols/parallel.svg
+- cockpit/themes/packed/symbols/parallel_branch.svg
+- cockpit/themes/packed/symbols/parallel_branch_compact.svg
+- cockpit/themes/packed/symbols/parallel_branch_event.svg
+- cockpit/themes/packed/symbols/parallel_branch_normal.svg
+- cockpit/themes/packed/symbols/scripts.svg
+- cockpit/themes/packed/symbols/start.svg
+- cockpit/themes/packed/symbols/stop.svg
+- cockpit/themes/packed/symbols/terminate.svg
 - cockpit/themes/packed/theme.js
 - cockpit/themes/preset/rngs/alternative.rng
 - cockpit/themes/preset/rngs/call.rng
@@ -240,6 +460,30 @@ files:
 - cockpit/themes/preset/rngs/scripts.rng
 - cockpit/themes/preset/rngs/stop.rng
 - cockpit/themes/preset/rngs/terminate.rng
+- cockpit/themes/preset/symbols/alternative.svg
+- cockpit/themes/preset/symbols/arrow.svg
+- cockpit/themes/preset/symbols/call.svg
+- cockpit/themes/preset/symbols/callmanipulate.svg
+- cockpit/themes/preset/symbols/choose.svg
+- cockpit/themes/preset/symbols/choose_exclusive.svg
+- cockpit/themes/preset/symbols/choose_inclusive.svg
+- cockpit/themes/preset/symbols/complex.svg
+- cockpit/themes/preset/symbols/critical.svg
+- cockpit/themes/preset/symbols/end.svg
+- cockpit/themes/preset/symbols/escape.svg
+- cockpit/themes/preset/symbols/event_end.svg
+- cockpit/themes/preset/symbols/loop.svg
+- cockpit/themes/preset/symbols/manipulate.svg
+- cockpit/themes/preset/symbols/otherwise.svg
+- cockpit/themes/preset/symbols/parallel.svg
+- cockpit/themes/preset/symbols/parallel_branch.svg
+- cockpit/themes/preset/symbols/parallel_branch_compact.svg
+- cockpit/themes/preset/symbols/parallel_branch_event.svg
+- cockpit/themes/preset/symbols/parallel_branch_normal.svg
+- cockpit/themes/preset/symbols/scripts.svg
+- cockpit/themes/preset/symbols/start.svg
+- cockpit/themes/preset/symbols/stop.svg
+- cockpit/themes/preset/symbols/terminate.svg
 - cockpit/themes/preset/theme.js
 - cockpit/track.html
 - contrib/Screenshot at 2011-09-28 02:38:11.png
@@ -338,7 +582,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Preliminary release of cloud process execution engine (cpee). If you just