cpee 2.0.2 → 2.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/cockpit/themes/model/theme.js +1 -1
- data/cpee.gemspec +2 -2
- data/lib/cpee/implementation_properties.rb +3 -3
- data/server/resources/backend/run +1 -1
- data/tools/cpee +13 -6
- data/tools/server/resources/notifications/logging/subscription.xml +13 -1
- data/tools/server/resources/properties.init +16 -15
- metadata +2 -5
- data/tools/instantiation/instantiation +0 -23
- data/tools/server/resources/notifications/logging/consumer-secret +0 -1
- data/tools/server/resources/notifications/logging/producer-secret +0 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 95c3d4997c835af1ee4d34d11331ffff81cd630da92bd50bfdbb7222d84576a2
|
4
|
+
data.tar.gz: 1b05ef8c78a4c280496beb8875bc47efaac200a877f42f5a6c3f2c30bdf98976
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: eda37aca3ed44140077015b70825b1e3500cae7a5afd972d50ee389051bb281d8dd5e3b3416dcd66cd3b8072aa48c87a8693081b20eebdd6db3f71fc316cedfa
|
7
|
+
data.tar.gz: e795b2134cb33fb78cd318fae57fd5f42b0bc3ca9efea451b288874479ff6155d10990aefb217ade6f6520954024fb4ec5ca35a8fc9273e5ebf0af7a2a76ac56
|
@@ -241,7 +241,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
241
241
|
'label': function(node){
|
242
242
|
var ret;
|
243
243
|
if ($('> url',$(node).children('parameters').children('arguments')).length > 0) {
|
244
|
-
ret = [ { column: 'Label', value:
|
244
|
+
ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' <a target="blank_" href="' + $('> url',$(node).children('parameters').children('arguments')).text() + '"></a>' } ];
|
245
245
|
} else {
|
246
246
|
ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
|
247
247
|
}
|
data/cpee.gemspec
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = "cpee"
|
3
|
-
s.version = "2.0.
|
3
|
+
s.version = "2.0.8"
|
4
4
|
s.platform = Gem::Platform::RUBY
|
5
5
|
s.license = "LGPL-3.0"
|
6
6
|
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."
|
7
7
|
|
8
8
|
s.description = "see http://cpee.org"
|
9
9
|
|
10
|
-
s.files = Dir['{example/**/*,server/**/*,tools/**/*,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
|
10
|
+
s.files = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
|
11
11
|
s.require_path = 'lib'
|
12
12
|
s.extra_rdoc_files = ['README.md']
|
13
13
|
s.bindir = 'tools'
|
@@ -215,12 +215,12 @@ module CPEE
|
|
215
215
|
case state
|
216
216
|
when 'running'
|
217
217
|
CPEE::Persistence::write_instance id, opts
|
218
|
-
pid = Kernel.spawn(exe , :out => exe + '.out', :err => exe + '.err')
|
219
|
-
File.write(exe + '.pid',pid)
|
218
|
+
pid = Kernel.spawn(exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
|
220
219
|
Process.detach pid
|
220
|
+
File.write(exe + '.pid',pid)
|
221
221
|
when 'stopping'
|
222
222
|
pid = File.read(exe + '.pid') rescue nil
|
223
|
-
if pid && (Process.kill(0, pid) rescue false)
|
223
|
+
if pid && (Process.kill(0, pid.to_i) rescue false)
|
224
224
|
Process.kill('HUP', pid.to_i) rescue nil
|
225
225
|
else
|
226
226
|
File.unlink(exe + '.pid') rescue nil
|
data/tools/cpee
CHANGED
@@ -48,12 +48,11 @@ ARGV.options { |opt|
|
|
48
48
|
opt.on("")
|
49
49
|
opt.on(wrap("[ui] starts a simple static web server with the ui on http://localhost:8080. Use [cpui DIR] if you want stuff in apache or nginx."))
|
50
50
|
opt.on("")
|
51
|
-
opt.on(wrap("[convert] converts all testsets in the current directory to cpee2
|
51
|
+
opt.on(wrap("[convert] converts all testsets in the current directory to cpee2"))
|
52
52
|
opt.parse!
|
53
53
|
}
|
54
54
|
if (ARGV.length == 0) ||
|
55
|
-
(ARGV.length == 1 && ARGV[0]
|
56
|
-
(ARGV.length == 1 && ARGV[0] != 'convert') ||
|
55
|
+
(ARGV.length == 1 && !(%w(ui convert).include?(ARGV[0]))) ||
|
57
56
|
(ARGV.length == 2 && !(%w(abandon start delete! cpui new).include?(ARGV[0]))) ||
|
58
57
|
(ARGV.length == 3 && ARGV[0] != 'archive') ||
|
59
58
|
(ARGV.length > 3)
|
@@ -118,6 +117,16 @@ elsif command == 'convert'
|
|
118
117
|
doc.find('//x:start_git').each do |e|
|
119
118
|
e.text = 'https://centurio.work/flow-test/start/git/'
|
120
119
|
end rescue nil
|
120
|
+
doc.find('//d:finalize | //d:update | //d:prepare | //d:rescue').each do |e|
|
121
|
+
if e.parent.qname.name != 'code'
|
122
|
+
n = e.parent
|
123
|
+
if (x = n.find('d:code')).any?
|
124
|
+
x.first.add(e)
|
125
|
+
else
|
126
|
+
n.add('d:code').add(e)
|
127
|
+
end
|
128
|
+
end
|
129
|
+
end rescue nil
|
121
130
|
|
122
131
|
doc.find('//p:*').each do |e|
|
123
132
|
e.namespaces.delete_all!
|
@@ -247,6 +256,7 @@ elsif command == 'delete!'
|
|
247
256
|
elsif command == 'new'
|
248
257
|
if !File.exists?(p1)
|
249
258
|
FileUtils.cp_r("#{curpath}/server/",p1)
|
259
|
+
FileUtils.mkdir("#{p1}/archive") rescue nil
|
250
260
|
FileUtils.mkdir("#{p1}/instances") rescue nil
|
251
261
|
FileUtils.mkdir("#{p1}/resources") rescue nil
|
252
262
|
FileUtils.mkdir("#{p1}/handlerwrappers") rescue nil
|
@@ -257,9 +267,6 @@ elsif command == 'new'
|
|
257
267
|
cont.gsub!(/{CPEEWORKINGDIR}/,"#{File.realpath(p1)}")
|
258
268
|
cont.gsub!(/{CPEESERVER}/,"#{File.realpath(p1)}/server")
|
259
269
|
File.write("#{p1}/#{nam}",cont)
|
260
|
-
p f
|
261
|
-
p nam
|
262
|
-
p "#{p1}/#{nam}"
|
263
270
|
end
|
264
271
|
else
|
265
272
|
puts 'Directory already exists.'
|
@@ -1,7 +1,19 @@
|
|
1
|
-
<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/
|
1
|
+
<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0" url="http://localhost:9299/">
|
2
2
|
<topic id="activity">
|
3
3
|
<event>calling</event>
|
4
4
|
<event>receiving</event>
|
5
5
|
<event>done</event>
|
6
6
|
</topic>
|
7
|
+
<topic id="dataelements">
|
8
|
+
<event>change</event>
|
9
|
+
</topic>
|
10
|
+
<topic id="endpoints">
|
11
|
+
<event>change</event>
|
12
|
+
</topic>
|
13
|
+
<topic id="attributes">
|
14
|
+
<event>change</event>
|
15
|
+
</topic>
|
16
|
+
<topic id="task">
|
17
|
+
<event>instantiation</event>
|
18
|
+
</topic>
|
7
19
|
</subscription>
|
@@ -2,40 +2,41 @@
|
|
2
2
|
<!--
|
3
3
|
This file is part of CPEE.
|
4
4
|
|
5
|
-
CPEE is free software: you can redistribute it and/or modify it under the
|
6
|
-
of the GNU General Public License as published by the Free Software
|
7
|
-
either version 3 of the License, or (at your option) any later
|
5
|
+
CPEE is free software: you can redistribute it and/or modify it under the
|
6
|
+
terms of the GNU General Public License as published by the Free Software
|
7
|
+
Foundation, either version 3 of the License, or (at your option) any later
|
8
|
+
version.
|
8
9
|
|
9
10
|
CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
|
10
11
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
11
12
|
PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12
13
|
|
13
14
|
You should have received a copy of the GNU General Public License along with
|
14
|
-
CPEE (file COPYING in the main directory).
|
15
|
+
CPEE (file COPYING in the main directory). If not, see
|
15
16
|
<http://www.gnu.org/licenses/>.
|
16
17
|
-->
|
17
18
|
|
18
|
-
<properties xmlns="http://
|
19
|
-
<
|
20
|
-
|
21
|
-
<
|
22
|
-
<
|
23
|
-
</
|
24
|
-
<state>ready</state>
|
19
|
+
<properties xmlns="http://cpee.org/ns/properties/2.0">
|
20
|
+
<state changed="1970-01-01T00:00:00+00:00">ready</state>
|
21
|
+
<status>
|
22
|
+
<id>0</id>
|
23
|
+
<message>undefined</message>
|
24
|
+
</status>
|
25
25
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
26
26
|
<positions/>
|
27
27
|
<dataelements/>
|
28
28
|
<endpoints>
|
29
29
|
<timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
30
30
|
</endpoints>
|
31
|
+
<attributes>
|
32
|
+
<info/>
|
33
|
+
<modeltype>CPEE</modeltype>
|
34
|
+
<theme>preset</theme>
|
35
|
+
</attributes>
|
31
36
|
<dsl/>
|
32
37
|
<dslx>
|
33
38
|
<description xmlns="http://cpee.org/ns/description/1.0"/>
|
34
39
|
</dslx>
|
35
|
-
<status>
|
36
|
-
<id>0</id>
|
37
|
-
<message>undefined</message>
|
38
|
-
</status>
|
39
40
|
<description>
|
40
41
|
<description xmlns="http://cpee.org/ns/description/1.0"/>
|
41
42
|
</description>
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cpee
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Juergen eTM Mangler
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: tools
|
12
12
|
cert_chain: []
|
13
|
-
date: 2020-10-
|
13
|
+
date: 2020-10-13 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: riddl
|
@@ -508,9 +508,6 @@ files:
|
|
508
508
|
- server/routing/persist.rb
|
509
509
|
- server/server.rb
|
510
510
|
- tools/cpee
|
511
|
-
- tools/instantiation/instantiation
|
512
|
-
- tools/server/resources/notifications/logging/consumer-secret
|
513
|
-
- tools/server/resources/notifications/logging/producer-secret
|
514
511
|
- tools/server/resources/notifications/logging/subscription.xml
|
515
512
|
- tools/server/resources/properties.init
|
516
513
|
- tools/server/server.rb
|
@@ -1,23 +0,0 @@
|
|
1
|
-
#!/usr/bin/ruby
|
2
|
-
require 'rubygems'
|
3
|
-
require 'cpee/instantiation'
|
4
|
-
|
5
|
-
options = {
|
6
|
-
:host => 'localhost',
|
7
|
-
:port => 9296,
|
8
|
-
:secure => false
|
9
|
-
# :secure_options => {
|
10
|
-
# :private_key_file => '',
|
11
|
-
# :cert_chain_file => '',
|
12
|
-
# :verify_peer => false
|
13
|
-
# }
|
14
|
-
}
|
15
|
-
|
16
|
-
Riddl::Server.new(CPEE::Instantiation::SERVER, options) do
|
17
|
-
accessible_description true
|
18
|
-
cross_site_xhr true
|
19
|
-
|
20
|
-
@riddl_opts[:cpee] ||= 'http://localhost:8298/'
|
21
|
-
|
22
|
-
use CPEE::Instantiation::implementation(@riddl_opts)
|
23
|
-
end.loop!
|
@@ -1 +0,0 @@
|
|
1
|
-
f7c77861ac613eeac8fb9829c9a545a2
|
@@ -1 +0,0 @@
|
|
1
|
-
2a24d172b1aeb05fe94fdc5e095dec32
|