cpee 2.0.3 → 2.0.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/cockpit/themes/model/theme.js +1 -1
- data/cpee.gemspec +2 -2
- data/lib/cpee/implementation.rb +1 -1
- data/lib/cpee/implementation_properties.rb +1 -1
- data/tools/cpee +12 -6
- data/tools/server/resources/notifications/logging/subscription.xml +13 -1
- data/tools/server/resources/properties.init +16 -15
- metadata +6 -9
- 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: 811f6ba4e6ef11aa5de45fb30c400e05b061413912dfe2395d3e49f54e1bb0e8
|
4
|
+
data.tar.gz: 18d970c9e70317eb063d60e35fb9df8714e1692f5b374a3b1ad9fa7ba8750993
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 151b7914bc3823b202df188d8f444a76bfcd1fa175e6fde33dbb4e0b33cddfe094bf72929f9b9b460523a50195fe573b610a38b1b4e9a87cb8c2e0bb6efb44d1
|
7
|
+
data.tar.gz: 8cec770c49dcbdd614bde9d4d5c5aa788d24660d5ca1ed09af87957abd320512313dbe2b0afae14646ebf316695be4094ca902ed0da64385eb78c5aaaf3c9dfb
|
@@ -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.9"
|
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'
|
data/lib/cpee/implementation.rb
CHANGED
@@ -183,7 +183,7 @@ module CPEE
|
|
183
183
|
doc = XML::Smart::open_unprotected(opts[:properties_init])
|
184
184
|
doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
|
185
185
|
name = @p[0].value
|
186
|
-
id = redis.
|
186
|
+
id = redis.zrevrange('instances', 0, 0).first.to_i + 1
|
187
187
|
uuid = SecureRandom.uuid
|
188
188
|
instance = 'instance:' + id.to_s
|
189
189
|
redis.multi do |multi|
|
@@ -215,7 +215,7 @@ module CPEE
|
|
215
215
|
case state
|
216
216
|
when 'running'
|
217
217
|
CPEE::Persistence::write_instance id, opts
|
218
|
-
pid = Kernel.spawn(exe , :pgroup => true, :in=>
|
218
|
+
pid = Kernel.spawn(exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
|
219
219
|
Process.detach pid
|
220
220
|
File.write(exe + '.pid',pid)
|
221
221
|
when 'stopping'
|
data/tools/cpee
CHANGED
@@ -52,8 +52,7 @@ ARGV.options { |opt|
|
|
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!
|
@@ -170,7 +179,6 @@ elsif command == 'archive'
|
|
170
179
|
uuid = xprop.find("string(/p:properties/p:attributes/p:uuid)")
|
171
180
|
id = name.to_s
|
172
181
|
File.write(File.join(p1,uuid + '.xml'),prop.response_body) if prop.headers['Content-Type'] =~ /^(text|application)\/xml/
|
173
|
-
p File.join(base,name.to_s,'/')
|
174
182
|
Typhoeus.delete(File.join(base,name.to_s,'/'))
|
175
183
|
end
|
176
184
|
end
|
@@ -247,6 +255,7 @@ elsif command == 'delete!'
|
|
247
255
|
elsif command == 'new'
|
248
256
|
if !File.exists?(p1)
|
249
257
|
FileUtils.cp_r("#{curpath}/server/",p1)
|
258
|
+
FileUtils.mkdir("#{p1}/archive") rescue nil
|
250
259
|
FileUtils.mkdir("#{p1}/instances") rescue nil
|
251
260
|
FileUtils.mkdir("#{p1}/resources") rescue nil
|
252
261
|
FileUtils.mkdir("#{p1}/handlerwrappers") rescue nil
|
@@ -257,9 +266,6 @@ elsif command == 'new'
|
|
257
266
|
cont.gsub!(/{CPEEWORKINGDIR}/,"#{File.realpath(p1)}")
|
258
267
|
cont.gsub!(/{CPEESERVER}/,"#{File.realpath(p1)}/server")
|
259
268
|
File.write("#{p1}/#{nam}",cont)
|
260
|
-
p f
|
261
|
-
p nam
|
262
|
-
p "#{p1}/#{nam}"
|
263
269
|
end
|
264
270
|
else
|
265
271
|
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,16 +1,16 @@
|
|
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.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Juergen eTM Mangler
|
8
8
|
- Ralph Vigne
|
9
9
|
- Gerhard Stuermer
|
10
|
-
autorequire:
|
10
|
+
autorequire:
|
11
11
|
bindir: tools
|
12
12
|
cert_chain: []
|
13
|
-
date: 2020-10-
|
13
|
+
date: 2020-10-14 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
|
@@ -518,7 +515,7 @@ homepage: http://cpee.org/
|
|
518
515
|
licenses:
|
519
516
|
- LGPL-3.0
|
520
517
|
metadata: {}
|
521
|
-
post_install_message:
|
518
|
+
post_install_message:
|
522
519
|
rdoc_options: []
|
523
520
|
require_paths:
|
524
521
|
- lib
|
@@ -533,8 +530,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
533
530
|
- !ruby/object:Gem::Version
|
534
531
|
version: '0'
|
535
532
|
requirements: []
|
536
|
-
rubygems_version: 3.1.
|
537
|
-
signing_key:
|
533
|
+
rubygems_version: 3.1.4
|
534
|
+
signing_key:
|
538
535
|
specification_version: 4
|
539
536
|
summary: Preliminary release of cloud process execution engine (cpee.org). If you
|
540
537
|
just need workflow execution, without a rest service exposing it, then use WEEL.
|
@@ -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
|