cpee 1.3.222 → 1.3.223
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/cockpit/css/wfadaptor.css +1 -0
- data/cockpit/js/details.js +12 -0
- data/cockpit/js/instance.js +3 -2
- data/cockpit/js/wfadaptor.js +11 -1
- data/cockpit/testsets/BCO.xml +56 -0
- data/cockpit/testsets/BCS.xml +56 -0
- data/cockpit/testsets/Lego Boxer.xml +31 -0
- data/cockpit/testsets/Lego Conveyor.xml +6 -45
- data/cockpit/testsets/Lego Crane.xml +29 -55
- data/cockpit/testsets/Lego Ejector.xml +26 -8
- data/cockpit/testsets/Lego Plate.xml +12 -17
- data/cockpit/testsets/Lego Transporter.xml +2 -1
- data/cockpit/testsets/Manuel Labels.xml +55 -0
- data/cockpit/testsets/testsets.xml +9 -5
- data/cockpit/themes/labels/rngs/call.rng +3 -0
- data/cockpit/themes/labels/rngs/callmanipulate.rng +6 -0
- data/cockpit/themes/labels/theme.js +0 -10
- data/cpee.gemspec +1 -1
- data/server/handlerwrappers/default.rb +1 -1
- metadata +6 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c641212b9e2b621bf1d0434c67f5967e9b2255c8
|
|
4
|
+
data.tar.gz: f705d06f0d262566f6891292c57737b25d5df6dd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8454a32470b18571417cb2a63ecb7fe541a1e68d1fa61a4c2af9caef21541c16115cc7ad3eeeaa5ebc28a123a28dc2c5d7af56fec45da733fd81d0081ae7da47
|
|
7
|
+
data.tar.gz: a51ae838383b2f32c55084120504fc118dd091235a4af1aeb8c5dbde7f5a3645b3e5864f8fe8db0ce746d66826049e67202c1e8aa47898a88fdf4413ba25939e
|
data/cockpit/css/wfadaptor.css
CHANGED
data/cockpit/js/details.js
CHANGED
|
@@ -53,10 +53,22 @@ function do_main_save() { //{{{
|
|
|
53
53
|
ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
|
|
54
54
|
|
|
55
55
|
node.replaceWith($X(ntxt));
|
|
56
|
+
desc.refresh(function(graphrealization){
|
|
57
|
+
var vtarget = manifestation.adaptor.illustrator.get_node_by_svg_id(svgid);
|
|
58
|
+
if (vtarget.length > 0) {
|
|
59
|
+
vtarget.parents('g.element[element-id]').addClass('clicked');
|
|
60
|
+
}
|
|
61
|
+
var g = graphrealization.get_description();
|
|
62
|
+
save['graph'] = $X(g);
|
|
63
|
+
save['graph'].find('[xmlns]').removeAttr('xmlns');
|
|
64
|
+
});
|
|
56
65
|
|
|
57
66
|
$.ajax({
|
|
58
67
|
type: "PUT",
|
|
59
68
|
url: url + "/properties/values/description/",
|
|
69
|
+
headers: {
|
|
70
|
+
"Event-Source": myid
|
|
71
|
+
},
|
|
60
72
|
data: ({'content': '<content>' + desc.get_description() + '</content>'})
|
|
61
73
|
});
|
|
62
74
|
}
|
data/cockpit/js/instance.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
var ws;
|
|
2
|
+
var myid = ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
|
|
2
3
|
var running = false;
|
|
3
4
|
var subscription;
|
|
4
5
|
var subscription_state = 'less';
|
|
@@ -600,7 +601,7 @@ function save_svg() {// {{{
|
|
|
600
601
|
var gc = $('#graphcanvas').clone();
|
|
601
602
|
$.ajax({
|
|
602
603
|
type: "GET",
|
|
603
|
-
url: "
|
|
604
|
+
url: "css/wfadaptor.css",
|
|
604
605
|
success: function(res){
|
|
605
606
|
gc.prepend($X('<style xmlns="http://www.w3.org/2000/svg" type="text/css"><![CDATA[' + res + ']]></style>'));
|
|
606
607
|
$.ajax({
|
|
@@ -610,7 +611,7 @@ function save_svg() {// {{{
|
|
|
610
611
|
var name = $(res.documentElement).text();
|
|
611
612
|
|
|
612
613
|
$('#savesvg').attr('download',name + '.svg');
|
|
613
|
-
$('#savesvg').attr('href','data:application/xml;charset=utf-8;base64,' +
|
|
614
|
+
$('#savesvg').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(gc.serializeXML()));
|
|
614
615
|
document.getElementById('savesvg').click();
|
|
615
616
|
},
|
|
616
617
|
error: report_failure
|
data/cockpit/js/wfadaptor.js
CHANGED
|
@@ -168,7 +168,7 @@ function WfIllustrator(wf_adaptor) { // View {{{
|
|
|
168
168
|
this.set_svg = function(graph) { // {{{
|
|
169
169
|
if(graph.max.row < 1) graph.max.row = 1;
|
|
170
170
|
if(graph.max.col < 1) graph.max.col = 1;
|
|
171
|
-
self.svg.container.attr({'height': (graph.max.row+0.3)*self.height, '
|
|
171
|
+
self.svg.container.attr({'height': (graph.max.row+0.3)*self.height, 'style': "min-width: " + (graph.max.col+0.65)*self.width + "pt"});
|
|
172
172
|
self.svg.container.append(graph.svg);
|
|
173
173
|
} // }}}
|
|
174
174
|
this.get_node_by_svg_id = function(svg_id) { // {{{
|
|
@@ -368,6 +368,16 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
368
368
|
}
|
|
369
369
|
return 'a' + id;
|
|
370
370
|
} // }}}
|
|
371
|
+
var refresh = this.refresh = function(doit) {
|
|
372
|
+
id_counter = {};
|
|
373
|
+
labels = [];
|
|
374
|
+
illustrator.clear();
|
|
375
|
+
var graph = parse(description.children('description').get(0), {'row':0,'col':0});
|
|
376
|
+
self.set_labels(graph);
|
|
377
|
+
// set labels
|
|
378
|
+
illustrator.set_svg(graph);
|
|
379
|
+
doit(self);
|
|
380
|
+
}
|
|
371
381
|
var update = this.update = function(svgid) { // {{{
|
|
372
382
|
id_counter = {};
|
|
373
383
|
if(update_illustrator){
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
<?xml version="1.0"?>
|
|
2
|
+
<testset>
|
|
3
|
+
<attributes>
|
|
4
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
|
|
5
|
+
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
6
|
+
<theme>labels</theme>
|
|
7
|
+
<bc>operate</bc>
|
|
8
|
+
</attributes>
|
|
9
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
10
|
+
<dataelements><!--{{{-->
|
|
11
|
+
<x/>
|
|
12
|
+
</dataelements><!--}}}-->
|
|
13
|
+
<handlers/>
|
|
14
|
+
<endpoints><!--{{{-->
|
|
15
|
+
<timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
|
16
|
+
</endpoints><!--}}}-->
|
|
17
|
+
<description>
|
|
18
|
+
<description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
|
|
19
|
+
<call id="a1" endpoint="timeout">
|
|
20
|
+
<parameters><!--{{{-->
|
|
21
|
+
<label>Step 1</label>
|
|
22
|
+
<method>:post</method>
|
|
23
|
+
<arguments>
|
|
24
|
+
<timeout>2</timeout>
|
|
25
|
+
</arguments>
|
|
26
|
+
</parameters><!--}}}-->
|
|
27
|
+
<finalize output="result">data.x += "a1,"</finalize>
|
|
28
|
+
</call>
|
|
29
|
+
<call id="a2" endpoint="timeout">
|
|
30
|
+
<parameters><!--{{{-->
|
|
31
|
+
<label>Step 2</label>
|
|
32
|
+
<method>:post</method>
|
|
33
|
+
<arguments>
|
|
34
|
+
<timeout>4</timeout>
|
|
35
|
+
</arguments>
|
|
36
|
+
</parameters><!--}}}-->
|
|
37
|
+
<finalize output="result">data.x += "a2,"</finalize>
|
|
38
|
+
</call>
|
|
39
|
+
<call id="a3" endpoint="timeout">
|
|
40
|
+
<parameters><!--{{{-->
|
|
41
|
+
<label>Step 3</label>
|
|
42
|
+
<method>:post</method>
|
|
43
|
+
<arguments>
|
|
44
|
+
<timeout>4</timeout>
|
|
45
|
+
</arguments>
|
|
46
|
+
</parameters><!--}}}-->
|
|
47
|
+
<finalize output="result">data.x += "a3,"</finalize>
|
|
48
|
+
</call>
|
|
49
|
+
</description><!--}}}-->
|
|
50
|
+
</description>
|
|
51
|
+
<transformation>
|
|
52
|
+
<description type='copy'/>
|
|
53
|
+
<dataelements type='rest'/>
|
|
54
|
+
<endpoints type='rest'/>
|
|
55
|
+
</transformation>
|
|
56
|
+
</testset>
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
<?xml version="1.0"?>
|
|
2
|
+
<testset>
|
|
3
|
+
<attributes>
|
|
4
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
|
|
5
|
+
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
6
|
+
<theme>labels</theme>
|
|
7
|
+
<bc>start</bc>
|
|
8
|
+
</attributes>
|
|
9
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
10
|
+
<dataelements><!--{{{-->
|
|
11
|
+
<x/>
|
|
12
|
+
</dataelements><!--}}}-->
|
|
13
|
+
<handlers/>
|
|
14
|
+
<endpoints><!--{{{-->
|
|
15
|
+
<timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
|
16
|
+
</endpoints><!--}}}-->
|
|
17
|
+
<description>
|
|
18
|
+
<description xmlns="http://cpee.org/ns/description/1.0"><!--{{{-->
|
|
19
|
+
<call id="a1" endpoint="timeout">
|
|
20
|
+
<parameters><!--{{{-->
|
|
21
|
+
<label>Step 1</label>
|
|
22
|
+
<method>:post</method>
|
|
23
|
+
<arguments>
|
|
24
|
+
<timeout>2</timeout>
|
|
25
|
+
</arguments>
|
|
26
|
+
</parameters><!--}}}-->
|
|
27
|
+
<finalize output="result">data.x += "a1,"</finalize>
|
|
28
|
+
</call>
|
|
29
|
+
<call id="a2" endpoint="timeout">
|
|
30
|
+
<parameters><!--{{{-->
|
|
31
|
+
<label>Step 2</label>
|
|
32
|
+
<method>:post</method>
|
|
33
|
+
<arguments>
|
|
34
|
+
<timeout>4</timeout>
|
|
35
|
+
</arguments>
|
|
36
|
+
</parameters><!--}}}-->
|
|
37
|
+
<finalize output="result">data.x += "a2,"</finalize>
|
|
38
|
+
</call>
|
|
39
|
+
<call id="a3" endpoint="timeout">
|
|
40
|
+
<parameters><!--{{{-->
|
|
41
|
+
<label>Step 3</label>
|
|
42
|
+
<method>:post</method>
|
|
43
|
+
<arguments>
|
|
44
|
+
<timeout>4</timeout>
|
|
45
|
+
</arguments>
|
|
46
|
+
</parameters><!--}}}-->
|
|
47
|
+
<finalize output="result">data.x += "a3,"</finalize>
|
|
48
|
+
</call>
|
|
49
|
+
</description><!--}}}-->
|
|
50
|
+
</description>
|
|
51
|
+
<transformation>
|
|
52
|
+
<description type='copy'/>
|
|
53
|
+
<dataelements type='rest'/>
|
|
54
|
+
<endpoints type='rest'/>
|
|
55
|
+
</transformation>
|
|
56
|
+
</testset>
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
<testset>
|
|
2
|
+
<dataelements/>
|
|
3
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
4
|
+
<endpoints>
|
|
5
|
+
<timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
|
6
|
+
<dispense xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://boxer.wst.univie.ac.at:9200/dispense</dispense>
|
|
7
|
+
</endpoints>
|
|
8
|
+
<positions/>
|
|
9
|
+
<description>
|
|
10
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
11
|
+
<call id="a1" endpoint="dispense">
|
|
12
|
+
<parameters>
|
|
13
|
+
<label>Dispense</label>
|
|
14
|
+
<method>:post</method>
|
|
15
|
+
<arguments/>
|
|
16
|
+
</parameters>
|
|
17
|
+
</call>
|
|
18
|
+
</description>
|
|
19
|
+
</description>
|
|
20
|
+
<transformation>
|
|
21
|
+
<description type="copy"/>
|
|
22
|
+
<dataelements type="none"/>
|
|
23
|
+
<endpoints type="none"/>
|
|
24
|
+
</transformation>
|
|
25
|
+
<attributes>
|
|
26
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">boxxxxxer</info>
|
|
27
|
+
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
28
|
+
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
|
|
29
|
+
<bc>operate</bc>
|
|
30
|
+
</attributes>
|
|
31
|
+
</testset>
|
|
@@ -1,57 +1,16 @@
|
|
|
1
|
-
<?xml version="1.0"?>
|
|
2
1
|
<testset>
|
|
3
2
|
<dataelements/>
|
|
4
3
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
5
4
|
<endpoints>
|
|
6
5
|
<timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
|
7
|
-
<
|
|
8
|
-
<stop xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://assline.wst.univie.ac.at:9200/stop</stop>
|
|
9
|
-
<centering xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://assline.wst.univie.ac.at:9200/centering</centering>
|
|
10
|
-
<calibrate xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://assline.wst.univie.ac.at:9200/calibrate</calibrate>
|
|
6
|
+
<conveyor xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://conveyor.wst.univie.ac.at:9200/centering</conveyor>
|
|
11
7
|
</endpoints>
|
|
12
8
|
<positions/>
|
|
13
9
|
<description>
|
|
14
10
|
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
15
|
-
<call id="
|
|
11
|
+
<call id="a1" endpoint="conveyor">
|
|
16
12
|
<parameters>
|
|
17
|
-
<label>
|
|
18
|
-
<method>:post</method>
|
|
19
|
-
<arguments/>
|
|
20
|
-
</parameters>
|
|
21
|
-
</call>
|
|
22
|
-
<call id="a1" endpoint="centering" >
|
|
23
|
-
<parameters>
|
|
24
|
-
<label>Zentrieren</label>
|
|
25
|
-
<method>:post</method>
|
|
26
|
-
<arguments/>
|
|
27
|
-
</parameters>
|
|
28
|
-
</call>
|
|
29
|
-
<call id="a3" endpoint="start" >
|
|
30
|
-
<parameters>
|
|
31
|
-
<label>Starten</label>
|
|
32
|
-
<method>:post</method>
|
|
33
|
-
<arguments/>
|
|
34
|
-
</parameters>
|
|
35
|
-
</call>
|
|
36
|
-
<call id="a4" endpoint="timeout" >
|
|
37
|
-
<parameters>
|
|
38
|
-
<label>Timeout</label>
|
|
39
|
-
<method>:post</method>
|
|
40
|
-
<arguments>
|
|
41
|
-
<timeout>6</timeout>
|
|
42
|
-
</arguments>
|
|
43
|
-
</parameters>
|
|
44
|
-
</call>
|
|
45
|
-
<call id="a5" endpoint="stop">
|
|
46
|
-
<parameters>
|
|
47
|
-
<label>Stop</label>
|
|
48
|
-
<method>:post</method>
|
|
49
|
-
<arguments/>
|
|
50
|
-
</parameters>
|
|
51
|
-
</call>
|
|
52
|
-
<call id="a6" endpoint="calibrate">
|
|
53
|
-
<parameters>
|
|
54
|
-
<label>Kalibrieren</label>
|
|
13
|
+
<label>Centers the piece</label>
|
|
55
14
|
<method>:post</method>
|
|
56
15
|
<arguments/>
|
|
57
16
|
</parameters>
|
|
@@ -64,7 +23,9 @@
|
|
|
64
23
|
<endpoints type="none"/>
|
|
65
24
|
</transformation>
|
|
66
25
|
<attributes>
|
|
67
|
-
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
|
|
26
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">sdas</info>
|
|
68
27
|
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
28
|
+
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
|
|
29
|
+
<bc>operate</bc>
|
|
69
30
|
</attributes>
|
|
70
31
|
</testset>
|
|
@@ -3,99 +3,72 @@
|
|
|
3
3
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
4
4
|
<endpoints>
|
|
5
5
|
<timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
|
6
|
-
<
|
|
7
|
-
<
|
|
8
|
-
<
|
|
6
|
+
<cranepos xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://cranex.wst.univie.ac.at:9200/pos</cranepos>
|
|
7
|
+
<onoff xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://craney.wst.univie.ac.at:9200/onoff</onoff>
|
|
8
|
+
<raise xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://craney.wst.univie.ac.at:9200/raise</raise>
|
|
9
|
+
<lower xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://craney.wst.univie.ac.at:9200/lower</lower>
|
|
9
10
|
</endpoints>
|
|
10
11
|
<positions/>
|
|
11
12
|
<description>
|
|
12
13
|
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
13
|
-
<call id="a1" endpoint="
|
|
14
|
+
<call id="a1" endpoint="onoff">
|
|
14
15
|
<parameters>
|
|
15
|
-
<label>
|
|
16
|
-
<method>:post</method>
|
|
17
|
-
<arguments>
|
|
18
|
-
<pos>"conveyor"</pos>
|
|
19
|
-
</arguments>
|
|
20
|
-
</parameters>
|
|
21
|
-
</call>
|
|
22
|
-
<call id="a2" endpoint="vacuum">
|
|
23
|
-
<parameters>
|
|
24
|
-
<label/>
|
|
16
|
+
<label>TurnOn</label>
|
|
25
17
|
<method>:post</method>
|
|
26
|
-
<arguments
|
|
27
|
-
<switch>true</switch>
|
|
28
|
-
</arguments>
|
|
29
|
-
</parameters>
|
|
30
|
-
</call>
|
|
31
|
-
<call id="a3" endpoint="movey">
|
|
32
|
-
<parameters>
|
|
33
|
-
<label>Raise Crane</label>
|
|
34
|
-
<method>:post</method>
|
|
35
|
-
<arguments>
|
|
36
|
-
<up>true</up>
|
|
37
|
-
</arguments>
|
|
18
|
+
<arguments/>
|
|
38
19
|
</parameters>
|
|
39
20
|
</call>
|
|
40
|
-
<call id="
|
|
21
|
+
<call id="a3" endpoint="raise">
|
|
41
22
|
<parameters>
|
|
42
|
-
<label>
|
|
23
|
+
<label>Raise</label>
|
|
43
24
|
<method>:post</method>
|
|
44
|
-
<arguments
|
|
45
|
-
<pos>"plate"</pos>
|
|
46
|
-
</arguments>
|
|
25
|
+
<arguments/>
|
|
47
26
|
</parameters>
|
|
48
27
|
</call>
|
|
49
|
-
<call id="
|
|
28
|
+
<call id="a2" endpoint="cranepos">
|
|
50
29
|
<parameters>
|
|
51
|
-
<label>
|
|
30
|
+
<label>Go To Plate</label>
|
|
52
31
|
<method>:post</method>
|
|
53
32
|
<arguments>
|
|
54
|
-
<
|
|
33
|
+
<data>2</data>
|
|
55
34
|
</arguments>
|
|
56
35
|
</parameters>
|
|
57
36
|
</call>
|
|
58
|
-
<call id="
|
|
37
|
+
<call id="a4" endpoint="lower">
|
|
59
38
|
<parameters>
|
|
60
|
-
<label>
|
|
39
|
+
<label>Lower</label>
|
|
61
40
|
<method>:post</method>
|
|
62
41
|
<arguments/>
|
|
63
42
|
</parameters>
|
|
64
43
|
</call>
|
|
65
|
-
<call id="
|
|
44
|
+
<call id="a5" endpoint="onoff">
|
|
66
45
|
<parameters>
|
|
67
|
-
<label>
|
|
46
|
+
<label>TurnOff</label>
|
|
68
47
|
<method>:post</method>
|
|
69
|
-
<arguments
|
|
70
|
-
<timeout>5</timeout>
|
|
71
|
-
</arguments>
|
|
48
|
+
<arguments/>
|
|
72
49
|
</parameters>
|
|
73
50
|
</call>
|
|
74
|
-
<call id="
|
|
51
|
+
<call id="a6" endpoint="raise">
|
|
75
52
|
<parameters>
|
|
76
|
-
<label>Raise
|
|
53
|
+
<label>Raise</label>
|
|
77
54
|
<method>:post</method>
|
|
78
|
-
<arguments
|
|
79
|
-
<up>true</up>
|
|
80
|
-
</arguments>
|
|
55
|
+
<arguments/>
|
|
81
56
|
</parameters>
|
|
82
57
|
</call>
|
|
83
|
-
<call id="
|
|
58
|
+
<call id="a7" endpoint="cranepos">
|
|
84
59
|
<parameters>
|
|
85
60
|
<label>Go to Conveyor</label>
|
|
86
61
|
<method>:post</method>
|
|
87
62
|
<arguments>
|
|
88
|
-
<
|
|
63
|
+
<data>0</data>
|
|
89
64
|
</arguments>
|
|
90
65
|
</parameters>
|
|
91
66
|
</call>
|
|
92
|
-
<call id="
|
|
67
|
+
<call id="a8" endpoint="lower">
|
|
93
68
|
<parameters>
|
|
94
|
-
<label>Lower
|
|
69
|
+
<label>Lower</label>
|
|
95
70
|
<method>:post</method>
|
|
96
|
-
<arguments
|
|
97
|
-
<up>false</up>
|
|
98
|
-
</arguments>
|
|
71
|
+
<arguments/>
|
|
99
72
|
</parameters>
|
|
100
73
|
</call>
|
|
101
74
|
</description>
|
|
@@ -106,8 +79,9 @@
|
|
|
106
79
|
<endpoints type="none"/>
|
|
107
80
|
</transformation>
|
|
108
81
|
<attributes>
|
|
109
|
-
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
|
|
82
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">s</info>
|
|
110
83
|
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
111
|
-
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
|
|
84
|
+
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
|
|
85
|
+
<bc>operate</bc>
|
|
112
86
|
</attributes>
|
|
113
87
|
</testset>
|
|
@@ -1,24 +1,40 @@
|
|
|
1
|
-
<?xml version="1.0"?>
|
|
2
1
|
<testset>
|
|
3
2
|
<dataelements/>
|
|
4
3
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
5
4
|
<endpoints>
|
|
6
|
-
<
|
|
7
|
-
<
|
|
5
|
+
<timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
|
6
|
+
<klaueauf xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://ejector.wst.univie.ac.at:9200/klaue/auf</klaueauf>
|
|
7
|
+
<klauezu xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://ejector.wst.univie.ac.at:9200/klaue/zu</klauezu>
|
|
8
|
+
<plate xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://ejector.wst.univie.ac.at:9200/goto/plate</plate>
|
|
9
|
+
<goexit xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://ejector.wst.univie.ac.at:9200/goto/exit</goexit>
|
|
8
10
|
</endpoints>
|
|
9
11
|
<positions/>
|
|
10
12
|
<description>
|
|
11
13
|
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
12
|
-
<call id="a1" endpoint="
|
|
14
|
+
<call id="a1" endpoint="plate">
|
|
13
15
|
<parameters>
|
|
14
|
-
<label>
|
|
16
|
+
<label>Go to plate</label>
|
|
15
17
|
<method>:post</method>
|
|
16
18
|
<arguments/>
|
|
17
19
|
</parameters>
|
|
18
20
|
</call>
|
|
19
|
-
<call id="a2" endpoint="
|
|
21
|
+
<call id="a2" endpoint="klauezu">
|
|
20
22
|
<parameters>
|
|
21
|
-
<label>
|
|
23
|
+
<label>Close Claw</label>
|
|
24
|
+
<method>:post</method>
|
|
25
|
+
<arguments/>
|
|
26
|
+
</parameters>
|
|
27
|
+
</call>
|
|
28
|
+
<call id="a3" endpoint="goexit">
|
|
29
|
+
<parameters>
|
|
30
|
+
<label>Go To Exit</label>
|
|
31
|
+
<method>:post</method>
|
|
32
|
+
<arguments/>
|
|
33
|
+
</parameters>
|
|
34
|
+
</call>
|
|
35
|
+
<call id="a4" endpoint="klaueauf">
|
|
36
|
+
<parameters>
|
|
37
|
+
<label>Claw open</label>
|
|
22
38
|
<method>:post</method>
|
|
23
39
|
<arguments/>
|
|
24
40
|
</parameters>
|
|
@@ -31,7 +47,9 @@
|
|
|
31
47
|
<endpoints type="none"/>
|
|
32
48
|
</transformation>
|
|
33
49
|
<attributes>
|
|
34
|
-
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
|
|
50
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">asda</info>
|
|
35
51
|
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
52
|
+
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
|
|
53
|
+
<bc>operate</bc>
|
|
36
54
|
</attributes>
|
|
37
55
|
</testset>
|
|
@@ -1,27 +1,20 @@
|
|
|
1
|
-
<?xml version="1.0"?>
|
|
2
1
|
<testset>
|
|
3
|
-
<dataelements
|
|
4
|
-
<i xmlns="http://riddl.org/ns/common-patterns/properties/1.0">0</i>
|
|
5
|
-
</dataelements>
|
|
2
|
+
<dataelements/>
|
|
6
3
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
7
4
|
<endpoints>
|
|
8
5
|
<timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
|
9
|
-
<
|
|
6
|
+
<gonext xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://plate.wst.univie.ac.at:9200/gonext</gonext>
|
|
10
7
|
</endpoints>
|
|
11
8
|
<positions/>
|
|
12
9
|
<description>
|
|
13
10
|
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
14
|
-
<
|
|
15
|
-
<
|
|
16
|
-
<
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
<finalize output="result">data.i= data.i + 1</finalize>
|
|
22
|
-
<update output="result"/>
|
|
23
|
-
</call>
|
|
24
|
-
</loop>
|
|
11
|
+
<call id="a1" endpoint="gonext">
|
|
12
|
+
<parameters>
|
|
13
|
+
<label>GoNext</label>
|
|
14
|
+
<method>:post</method>
|
|
15
|
+
<arguments/>
|
|
16
|
+
</parameters>
|
|
17
|
+
</call>
|
|
25
18
|
</description>
|
|
26
19
|
</description>
|
|
27
20
|
<transformation>
|
|
@@ -30,7 +23,9 @@
|
|
|
30
23
|
<endpoints type="none"/>
|
|
31
24
|
</transformation>
|
|
32
25
|
<attributes>
|
|
33
|
-
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
|
|
26
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">ss</info>
|
|
34
27
|
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
28
|
+
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
|
|
29
|
+
<bc>operate</bc>
|
|
35
30
|
</attributes>
|
|
36
31
|
</testset>
|
|
@@ -37,6 +37,7 @@
|
|
|
37
37
|
<attributes>
|
|
38
38
|
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">s</info>
|
|
39
39
|
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
40
|
-
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
|
|
40
|
+
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">labels</theme>
|
|
41
|
+
<bc>start</bc>
|
|
41
42
|
</attributes>
|
|
42
43
|
</testset>
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
<testset>
|
|
2
|
+
<dataelements/>
|
|
3
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
4
|
+
<endpoints>
|
|
5
|
+
<timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
|
6
|
+
</endpoints>
|
|
7
|
+
<positions/>
|
|
8
|
+
<description>
|
|
9
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
10
|
+
<call id="a2" endpoint="timeout">
|
|
11
|
+
<parameters>
|
|
12
|
+
<label>centrifugation</label>
|
|
13
|
+
<method>:post</method>
|
|
14
|
+
<arguments/>
|
|
15
|
+
</parameters>
|
|
16
|
+
</call>
|
|
17
|
+
<call id="a1" endpoint="timeout">
|
|
18
|
+
<parameters>
|
|
19
|
+
<label>"any activity"</label>
|
|
20
|
+
<method>:post</method>
|
|
21
|
+
<arguments>
|
|
22
|
+
<timeout>2</timeout>
|
|
23
|
+
</arguments>
|
|
24
|
+
</parameters>
|
|
25
|
+
</call>
|
|
26
|
+
<call id="a3" endpoint="timeout">
|
|
27
|
+
<parameters>
|
|
28
|
+
<label>connect KWP</label>
|
|
29
|
+
<method>:post</method>
|
|
30
|
+
<arguments>
|
|
31
|
+
<timeout>2</timeout>
|
|
32
|
+
</arguments>
|
|
33
|
+
</parameters>
|
|
34
|
+
</call>
|
|
35
|
+
<call id="a4" endpoint="timeout">
|
|
36
|
+
<parameters>
|
|
37
|
+
<label>get loan</label>
|
|
38
|
+
<method>:post</method>
|
|
39
|
+
<arguments>
|
|
40
|
+
<timeout>2</timeout>
|
|
41
|
+
</arguments>
|
|
42
|
+
</parameters>
|
|
43
|
+
</call>
|
|
44
|
+
</description>
|
|
45
|
+
</description>
|
|
46
|
+
<transformation>
|
|
47
|
+
<description type="copy"/>
|
|
48
|
+
<dataelements type="none"/>
|
|
49
|
+
<endpoints type="none"/>
|
|
50
|
+
</transformation>
|
|
51
|
+
<attributes>
|
|
52
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Lego Conveyor</info>
|
|
53
|
+
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
54
|
+
</attributes>
|
|
55
|
+
</testset>
|
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
<testsets>
|
|
2
|
-
|
|
2
|
+
<!--testset>Centurio</testset-->
|
|
3
3
|
<testset>Log</testset>
|
|
4
|
+
<testset>BCS</testset>
|
|
5
|
+
<testset>BCO</testset>
|
|
4
6
|
<testset>Infinity</testset>
|
|
5
|
-
|
|
7
|
+
<!--testset>SOPROMO Test Sonification</testset-->
|
|
6
8
|
<testset>Linear</testset>
|
|
7
9
|
<testset>Coopis Testset</testset>
|
|
8
10
|
<testset>ICSOC Testset</testset>
|
|
9
11
|
<testset>Mangler 1</testset>
|
|
10
12
|
<testset>Mangler 2</testset>
|
|
11
13
|
<testset>Concurrent</testset>
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
14
|
+
<!--testset>Endpoints and Data Manipulation</testset-->
|
|
15
|
+
<!--testset>TEST - Wrong Positions</testset-->
|
|
16
|
+
<!--testset>TEST - Bad Loop</testset-->
|
|
15
17
|
<testset>Syncing P34</testset>
|
|
16
18
|
<testset>Syncing P34 1</testset>
|
|
17
19
|
<testset>Syncing P34 2</testset>
|
|
@@ -21,9 +23,11 @@
|
|
|
21
23
|
<testset>Worklist Parallel</testset>
|
|
22
24
|
<testset>Update</testset>
|
|
23
25
|
<testset>Promise</testset>
|
|
26
|
+
<testset>Lego Boxer</testset>
|
|
24
27
|
<testset>Lego Conveyor</testset>
|
|
25
28
|
<testset>Lego Transporter</testset>
|
|
26
29
|
<testset>Lego Ejector</testset>
|
|
27
30
|
<testset>Lego Crane</testset>
|
|
28
31
|
<testset>Lego Plate</testset>
|
|
32
|
+
<!--testset>Manuel Labels</testset-->
|
|
29
33
|
</testsets>
|
|
@@ -38,4 +38,10 @@
|
|
|
38
38
|
</attribute>
|
|
39
39
|
<text rngui:label='Script that is executed, when a service sends intermediate data'/>
|
|
40
40
|
</element>
|
|
41
|
+
<element name="_notes" rngui:header="Notes" rngui:label='General'>
|
|
42
|
+
<text rngui:label='Notes'/>
|
|
43
|
+
</element>
|
|
44
|
+
<element name="_notes_output" rngui:header="Notes" rngui:label='Output'>
|
|
45
|
+
<text rngui:label='Notes'/>
|
|
46
|
+
</element>
|
|
41
47
|
</element>
|
|
@@ -84,16 +84,6 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
84
84
|
vtarget.parents('g.element[element-id]').addClass('clicked');
|
|
85
85
|
}
|
|
86
86
|
|
|
87
|
-
if ($('#state').text() != 'finished')
|
|
88
|
-
$('#main ui-behind button').show();
|
|
89
|
-
if ($('#main ui-behind button').hasClass('highlight')) {
|
|
90
|
-
var check = confirm("Discard changes?");
|
|
91
|
-
if (check)
|
|
92
|
-
$('#main ui-behind button').removeClass('highlight');
|
|
93
|
-
else
|
|
94
|
-
return;
|
|
95
|
-
}
|
|
96
|
-
|
|
97
87
|
var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
|
|
98
88
|
|
|
99
89
|
if (self.adaptor.description.elements[$(node).attr('svg-type')]) {
|
data/cpee.gemspec
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
s.name = "cpee"
|
|
3
|
-
s.version = "1.3.
|
|
3
|
+
s.version = "1.3.223"
|
|
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). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"
|
|
@@ -69,7 +69,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
|
|
|
69
69
|
client = Riddl::Client.new(@handler_endpoint)
|
|
70
70
|
|
|
71
71
|
status, result, headers = client.request type => params
|
|
72
|
-
raise "Could not #{parameters[:method] || 'post'} #{@handler_endpoint}" if status
|
|
72
|
+
raise "Could not #{parameters[:method] || 'post'} #{@handler_endpoint}" if status < 200 || status >= 300
|
|
73
73
|
|
|
74
74
|
if headers["CPEE_CALLBACK"] && headers["CPEE_CALLBACK"] == 'true'
|
|
75
75
|
@controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
|
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: 1.3.
|
|
4
|
+
version: 1.3.223
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Juergen eTM Mangler
|
|
@@ -11,7 +11,7 @@ authors:
|
|
|
11
11
|
autorequire:
|
|
12
12
|
bindir: tools
|
|
13
13
|
cert_chain: []
|
|
14
|
-
date: 2018-01-
|
|
14
|
+
date: 2018-01-26 00:00:00.000000000 Z
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
17
17
|
name: riddl
|
|
@@ -115,6 +115,8 @@ files:
|
|
|
115
115
|
- cockpit/rngs/attributes.rng
|
|
116
116
|
- cockpit/rngs/dataelements.rng
|
|
117
117
|
- cockpit/rngs/endpoints.rng
|
|
118
|
+
- cockpit/testsets/BCO.xml
|
|
119
|
+
- cockpit/testsets/BCS.xml
|
|
118
120
|
- cockpit/testsets/CPEE.xml
|
|
119
121
|
- cockpit/testsets/Centurio.xml
|
|
120
122
|
- cockpit/testsets/Concurrent.xml
|
|
@@ -122,6 +124,7 @@ files:
|
|
|
122
124
|
- cockpit/testsets/Endpoints and Data Manipulation.xml
|
|
123
125
|
- cockpit/testsets/ICSOC Testset.xml
|
|
124
126
|
- cockpit/testsets/Infinity.xml
|
|
127
|
+
- cockpit/testsets/Lego Boxer.xml
|
|
125
128
|
- cockpit/testsets/Lego Conveyor.xml
|
|
126
129
|
- cockpit/testsets/Lego Crane.xml
|
|
127
130
|
- cockpit/testsets/Lego Ejector.xml
|
|
@@ -132,6 +135,7 @@ files:
|
|
|
132
135
|
- cockpit/testsets/Log.xml
|
|
133
136
|
- cockpit/testsets/Mangler 1.xml
|
|
134
137
|
- cockpit/testsets/Mangler 2.xml
|
|
138
|
+
- cockpit/testsets/Manuel Labels.xml
|
|
135
139
|
- cockpit/testsets/Promise.xml
|
|
136
140
|
- cockpit/testsets/SOPROMO Test Sonification.xml
|
|
137
141
|
- cockpit/testsets/Signavio.xml
|