cpee 1.3.119 → 1.3.120

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.119"
+  s.version          = "1.3.120"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   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/server/handlerwrappers/default.rb

@@ -41,6 +41,19 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
       status, result, headers = client.request type => params
       raise "Could not #{parameters[:method] || 'post'} #{@handler_endpoint}" if status != 200
+      if result.length == 1
+        if result[0].is_a? Riddl::Parameter::Simple
+          result = result[0]
+        elsif result[0].is_a? Riddl::Parameter::Complex
+          if result[0].mimetype == 'application/json' 
+            result = JSON::parse(result[0].value.read)
+          elsif result[0].mimetype == 'application/xml' || result[0].mimetype == 'text/xml'
+            result = XML::Smart::string(result[0].value.read)
+          else
+            result = result[0]
+          end
+        end
+      end  
 
       if headers["CPEE_CALLBACK"] && headers["CPEE_CALLBACK"] == 'true'
         @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)

data/server/resources/properties.init

@@ -25,7 +25,9 @@
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
   <dsl/>
-  <dslx/>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0"/>
+  </dslx>  
   <status>
     <id>0</id>
     <message>undefined</message>

data/server/resources/transformation_dslx.xsl

@@ -215,6 +215,9 @@
           <xsl:when test="@type = 'symbolic'">
             <xsl:value-of select="text()"/>
           </xsl:when>
+          <xsl:when test="not(node())">
+            <xsl:text>nil</xsl:text>
+          </xsl:when>
           <xsl:otherwise>
             <xsl:text>"</xsl:text>
             <xsl:value-of select="text()"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.119
+  version: 1.3.120
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -69,10 +69,6 @@ extra_rdoc_files:
 - README
 files:
 - server/server.rb
-- server/instances/1/properties.xml
-- server/instances/1/notifications/9a9f296b8446be3ee15a99fbb94543dd/consumer-secret
-- server/instances/1/notifications/9a9f296b8446be3ee15a99fbb94543dd/subscription.xml
-- server/instances/1/notifications/9a9f296b8446be3ee15a99fbb94543dd/producer-secret
 - server/resources/properties.schema.active
 - server/resources/properties.schema.finished
 - server/resources/transformation_dslx.xsl
@@ -95,8 +91,11 @@ files:
 - lib/engine/instances.rng
 - lib/cpee.xml
 - cockpit/css/ui.css
+- cockpit/contrib/graph_example.svg
+- cockpit/contrib/tree_example.svg
 - cockpit/contrib/transformation2.xsl
 - cockpit/contrib/transformation1.xsl
+- cockpit/contrib/legend.svg
 - cockpit/contrib/symbols.svg
 - cockpit/index.html
 - cockpit/lib/jquery.caret.min.js
@@ -104,6 +103,7 @@ files:
 - cockpit/lib/wfadaptor.js
 - cockpit/lib/wfadaptor.css
 - cockpit/lib/jquery-ui.custom.min.js
+- cockpit/lib/jquery.cookie.js
 - cockpit/lib/parsequery.js
 - cockpit/lib/util.js
 - cockpit/lib/ui.js

data/server/instances/1/notifications/9a9f296b8446be3ee15a99fbb94543dd/consumer-secret

@@ -1 +0,0 @@
-0ae34c4d977c3ce6ec3fb7123f33f44d

data/server/instances/1/notifications/9a9f296b8446be3ee15a99fbb94543dd/producer-secret

@@ -1 +0,0 @@
-b771dae71e9968a0c1514db370f0aa96

data/server/instances/1/notifications/9a9f296b8446be3ee15a99fbb94543dd/subscription.xml

@@ -1,27 +0,0 @@
-<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0">
-  <topic id="running">
-    <event>activity_calling</event>
-    <event>activity_manipulating</event>
-    <event>activity_failed</event>
-    <event>activity_done</event>
-  </topic>
-  <topic id="properties/position">
-    <event>change</event>
-  </topic>
-  <topic id="properties/description">
-    <event>change</event>
-    <event>error</event>
-  </topic>
-  <topic id="properties/state">
-    <event>change</event>
-  </topic>
-  <topic id="properties/dataelements">
-    <event>change</event>
-  </topic>
-  <topic id="properties/endpoints">
-    <event>change</event>
-  </topic>
-  <topic id="properties/handlers">
-    <event>change</event>
-  </topic>
-</subscription>

data/server/instances/1/properties.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  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/>.
--->
-
-<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
-  <info/>
-  <state>ready</state>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <positions/>
-  <dataelements/>
-  <endpoints>
-    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-  </endpoints>
-  <dsl/>
-  <dslx/>
-  <status>
-    <id>0</id>
-    <message>undefined</message>
-  </status>
-  <description>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
-  </description>
-  <transformation>
-    <description type='copy'/>
-    <dataelements type='xslt'/>
-    <endpoints type='xslt'/>
-  </transformation>
-</properties>