cpee 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd427d42a5f3a293559f8ac3687b80b76c6479e8c62f00bceff03606aaba3e1
-  data.tar.gz: '08a71c3d9c4b8091bc09f4d45fc3a95e2d717780186c5d2c021df4476388c9a8'
+  metadata.gz: ceb3ebb10b51f80ab5279f9738c67e1b916c06f10b7f30352ba8c2152172fbbd
+  data.tar.gz: 48b7e67c715b8ed0a9e5e4fa4cd90786f5cf2096fc1362c0d679c729e0576816
 SHA512:
-  metadata.gz: 56c2e4b9a14c5b4f12fd57f22a70ce707db68f14618c11966950726eccc5769a8b4036ef6fb62d486a60afe4ea7310710069dec25ac0913ba73378e927c7edaf
-  data.tar.gz: 32a0cbc433baa7be0f84741d92b1c30b7ebb9ad10ed12e2f70c0398d5f1bfd0279495e80ac21e5237b3fb57580585d5895dacbd1b830c2797790b446af555749
+  metadata.gz: 9b1340826747baad2c00ed578b84a87d20d3d6ffb31d7a6cf6f856ba8366686d6c8044faebd819168d36488dc690956ed2c44e38b999f81f6edf83fac86a5c4e
+  data.tar.gz: b5744e76d4fa37304555a1fb1678a6181e1bda425e4a5007419214c514af3c78f4bee52adb5623f76a2a84509c7c28ebd2a8ca299b1b1b1c175dec45f047a3d9

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.5"
+  s.version          = "2.0.6"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."

data/tools/cpee

@@ -246,6 +246,7 @@ elsif command == 'delete!'
 elsif command == 'new'
   if !File.exists?(p1)
     FileUtils.cp_r("#{curpath}/server/",p1)
+    FileUtils.cp_r("#{curpath}/archive/",p1)
     FileUtils.mkdir("#{p1}/instances") rescue nil
     FileUtils.mkdir("#{p1}/resources") rescue nil
     FileUtils.mkdir("#{p1}/handlerwrappers") rescue nil
@@ -256,9 +257,6 @@ elsif command == 'new'
       cont.gsub!(/{CPEEWORKINGDIR}/,"#{File.realpath(p1)}")
       cont.gsub!(/{CPEESERVER}/,"#{File.realpath(p1)}/server")
       File.write("#{p1}/#{nam}",cont)
-      p f
-      p nam
-      p "#{p1}/#{nam}"
     end
   else
     puts 'Directory already exists.'

data/tools/server/resources/notifications/logging/subscription.xml

@@ -1,7 +1,19 @@
-<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9300/log">
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0" url="http://localhost:9299/">
   <topic id="activity">
     <event>calling</event>
     <event>receiving</event>
     <event>done</event>
   </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="attributes">
+    <event>change</event>
+  </topic>
+  <topic id="task">
+    <event>instantiation</event>
+  </topic>
 </subscription>

data/tools/server/resources/properties.init

@@ -2,40 +2,41 @@
 <!--
   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 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
+  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">
-  <attributes>
-    <info/>
-    <modeltype>CPEE</modeltype>
-    <theme>default</theme>
-  </attributes>
-  <state>ready</state>
+<properties xmlns="http://cpee.org/ns/properties/2.0">
+  <state changed="1970-01-01T00:00:00+00:00">ready</state>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
   <dataelements/>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
   </endpoints>
+  <attributes>
+    <info/>
+    <modeltype>CPEE</modeltype>
+    <theme>preset</theme>
+  </attributes>
   <dsl/>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0"/>
   </dslx>
-  <status>
-    <id>0</id>
-    <message>undefined</message>
-  </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0"/>
   </description>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -508,9 +508,6 @@ files:
 - server/routing/persist.rb
 - server/server.rb
 - tools/cpee
-- tools/instantiation/instantiation
-- tools/server/resources/notifications/logging/consumer-secret
-- tools/server/resources/notifications/logging/producer-secret
 - tools/server/resources/notifications/logging/subscription.xml
 - tools/server/resources/properties.init
 - tools/server/server.rb

data/tools/instantiation/instantiation

@@ -1,23 +0,0 @@
-#!/usr/bin/ruby
-require 'rubygems'
-require 'cpee/instantiation'
-
-options = {
-  :host => 'localhost',
-  :port => 9296,
-  :secure => false
-  # :secure_options => {
-  #   :private_key_file => '',
-  #   :cert_chain_file => '',
-  #   :verify_peer => false
-  # }
-}
-
-Riddl::Server.new(CPEE::Instantiation::SERVER, options) do
-  accessible_description true
-  cross_site_xhr true
-
-  @riddl_opts[:cpee] ||= 'http://localhost:8298/'
-
-  use CPEE::Instantiation::implementation(@riddl_opts)
-end.loop!

data/tools/server/resources/notifications/logging/consumer-secret

@@ -1 +0,0 @@
-f7c77861ac613eeac8fb9829c9a545a2

data/tools/server/resources/notifications/logging/producer-secret

@@ -1 +0,0 @@
-2a24d172b1aeb05fe94fdc5e095dec32