cpee 1.5.16 → 1.5.17
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/js/instance.js +1 -1
- data/cockpit/js/wfadaptor.js +1 -1
- data/cockpit/testsets/BCO.xml +2 -2
- data/cockpit/testsets/BCS.xml +2 -2
- data/cockpit/testsets/Lego Full.xml +142 -0
- data/cockpit/testsets/Lego Liddy.xml +40 -0
- data/cockpit/testsets/Lego_Part_1.xml +85 -0
- data/cockpit/testsets/Linear.xml +2 -2
- data/cockpit/testsets/Syncing P34 1.xml +2 -2
- data/cockpit/testsets/Syncing P34 2.xml +2 -2
- data/cockpit/testsets/Syncing P34 3.xml +2 -2
- data/cockpit/testsets/Syncing P34.xml +2 -2
- data/cockpit/testsets/testsets.xml +3 -1
- data/cockpit/themes/compact/theme.js +73 -45
- data/cockpit/themes/extended/theme.js +73 -45
- data/cockpit/themes/packed/theme.js +73 -45
- data/cockpit/themes/preset/theme.js +73 -45
- data/cpee.gemspec +1 -1
- data/lib/cpee/instantiation.rb +22 -5
- data/lib/instantiation.xml +9 -0
- data/log/azure.rb +10 -0
- data/log/azure_logger.rb +136 -0
- data/server/handlerwrappers/default.rb +8 -8
- data/server/resources/transformation_dslx.xsl +24 -5
- data/server/server.pid +1 -0
- metadata +8 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 573b791f6a88975d5ce2831dbfd2ed4e77d775ca9f709b112b048184a9fa09c6
|
|
4
|
+
data.tar.gz: f3c79182f4e61e798b080c0ce53b4faf0daa3956cd191cb8a0ac2ef485de38e3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c5b8e29b71e6c1c3024358752418a6bbd06ab85f050d512c87915303b06bcbfbf5d68289fee561d81437531669631b9781b7a10104604833126f839ab9fff829
|
|
7
|
+
data.tar.gz: ab2efbee98945882e0261a818690fd7b4fa69802744f20242abd29bc88ffe459c4001b4535e7a3145b9cff664ae12d5124357c72d3bb409ad62f674ebfb3aa4c
|
data/cockpit/js/instance.js
CHANGED
data/cockpit/js/wfadaptor.js
CHANGED
|
@@ -230,7 +230,7 @@ function WfIllustrator(wf_adaptor) { // View {{{
|
|
|
230
230
|
spli.each(function(k,v) {
|
|
231
231
|
var tspan = $X('<tspan x="0" dy="' + (spli.length > 1 ? '-7' : '0') + '" xmlns="http://www.w3.org/2000/svg"></tspan>');
|
|
232
232
|
if (k == 0) {
|
|
233
|
-
tspan.text(
|
|
233
|
+
tspan.text(v);
|
|
234
234
|
} else {
|
|
235
235
|
tspan.text(v);
|
|
236
236
|
tspan.attr('dy','15');
|
data/cockpit/testsets/BCO.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<attributes>
|
|
3
3
|
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
|
|
4
4
|
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
5
|
-
<theme>
|
|
5
|
+
<theme>preset</theme>
|
|
6
6
|
<bc>operate</bc>
|
|
7
7
|
</attributes>
|
|
8
8
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
@@ -70,4 +70,4 @@
|
|
|
70
70
|
<dataelements type="rest"/>
|
|
71
71
|
<endpoints type="rest"/>
|
|
72
72
|
</transformation>
|
|
73
|
-
</testset>
|
|
73
|
+
</testset>
|
data/cockpit/testsets/BCS.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<attributes>
|
|
3
3
|
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
|
|
4
4
|
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
5
|
-
<theme>
|
|
5
|
+
<theme>preset</theme>
|
|
6
6
|
<bc>start</bc>
|
|
7
7
|
</attributes>
|
|
8
8
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
@@ -70,4 +70,4 @@
|
|
|
70
70
|
<dataelements type="rest"/>
|
|
71
71
|
<endpoints type="rest"/>
|
|
72
72
|
</transformation>
|
|
73
|
-
</testset>
|
|
73
|
+
</testset>
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
<testset>
|
|
2
|
+
<dataelements>
|
|
3
|
+
</dataelements>
|
|
4
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
5
|
+
<endpoints>
|
|
6
|
+
<timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
|
|
7
|
+
<deploy xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://coruscant.wst.univie.ac.at:9296/url</deploy>
|
|
8
|
+
</endpoints>
|
|
9
|
+
<description>
|
|
10
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
11
|
+
<loop mode="pre_test" condition="true">
|
|
12
|
+
<parallel wait="-1">
|
|
13
|
+
<parallel_branch pass="" local="">
|
|
14
|
+
<call id="a2" endpoint="deploy">
|
|
15
|
+
<parameters>
|
|
16
|
+
<label>Dispense</label>
|
|
17
|
+
<method>:post</method>
|
|
18
|
+
<arguments>
|
|
19
|
+
<info>Lego1</info>
|
|
20
|
+
<behavior>wait_running</behavior>
|
|
21
|
+
<url>http://cpee.org/~demo/cpee-cockpit/testsets/Lego_Part_1.xml</url>
|
|
22
|
+
</arguments>
|
|
23
|
+
<sensors/>
|
|
24
|
+
</parameters>
|
|
25
|
+
<_timing>
|
|
26
|
+
<_timing_min/>
|
|
27
|
+
<_timing_max/>
|
|
28
|
+
<_timing_avg/>
|
|
29
|
+
</_timing>
|
|
30
|
+
<_notes>
|
|
31
|
+
<_notes_general/>
|
|
32
|
+
<_attachments/>
|
|
33
|
+
</_notes>
|
|
34
|
+
</call>
|
|
35
|
+
</parallel_branch>
|
|
36
|
+
<parallel_branch pass="" local="">
|
|
37
|
+
<call id="a3" endpoint="deploy">
|
|
38
|
+
<parameters>
|
|
39
|
+
<label>Boxer</label>
|
|
40
|
+
<method>:post</method>
|
|
41
|
+
<arguments>
|
|
42
|
+
<info>Boxer</info>
|
|
43
|
+
<behavior>wait_running</behavior>
|
|
44
|
+
<url>http://cpee.org/~demo/cpee-cockpit/testsets/Lego%20Boxer.xml</url>
|
|
45
|
+
</arguments>
|
|
46
|
+
<sensors/>
|
|
47
|
+
</parameters>
|
|
48
|
+
<_timing>
|
|
49
|
+
<_timing_min/>
|
|
50
|
+
<_timing_max/>
|
|
51
|
+
<_timing_avg/>
|
|
52
|
+
</_timing>
|
|
53
|
+
<_notes>
|
|
54
|
+
<_notes_general/>
|
|
55
|
+
<_attachments/>
|
|
56
|
+
</_notes>
|
|
57
|
+
</call>
|
|
58
|
+
</parallel_branch>
|
|
59
|
+
<parallel_branch pass="" local="">
|
|
60
|
+
<call id="a4" endpoint="deploy">
|
|
61
|
+
<parameters>
|
|
62
|
+
<label>Liddy</label>
|
|
63
|
+
<method>:post</method>
|
|
64
|
+
<arguments>
|
|
65
|
+
<info>Liddy</info>
|
|
66
|
+
<behavior>wait_running</behavior>
|
|
67
|
+
<url>http://cpee.org/~demo/cpee-cockpit/testsets/Lego%20Liddy.xml</url>
|
|
68
|
+
</arguments>
|
|
69
|
+
<sensors/>
|
|
70
|
+
</parameters>
|
|
71
|
+
<_timing>
|
|
72
|
+
<_timing_min/>
|
|
73
|
+
<_timing_max/>
|
|
74
|
+
<_timing_avg/>
|
|
75
|
+
</_timing>
|
|
76
|
+
<_notes>
|
|
77
|
+
<_notes_general/>
|
|
78
|
+
<_attachments/>
|
|
79
|
+
</_notes>
|
|
80
|
+
</call>
|
|
81
|
+
</parallel_branch>
|
|
82
|
+
<parallel_branch pass="" local="">
|
|
83
|
+
<call id="a5" endpoint="deploy">
|
|
84
|
+
<parameters>
|
|
85
|
+
<label>Ejector</label>
|
|
86
|
+
<method>:post</method>
|
|
87
|
+
<arguments>
|
|
88
|
+
<info>Ejector</info>
|
|
89
|
+
<behavior>wait_running</behavior>
|
|
90
|
+
<url>http://cpee.org/~demo/cpee-cockpit/testsets/Lego%20Ejector.xml</url>
|
|
91
|
+
</arguments>
|
|
92
|
+
<sensors/>
|
|
93
|
+
</parameters>
|
|
94
|
+
<_timing>
|
|
95
|
+
<_timing_min/>
|
|
96
|
+
<_timing_max/>
|
|
97
|
+
<_timing_avg/>
|
|
98
|
+
</_timing>
|
|
99
|
+
<_notes>
|
|
100
|
+
<_notes_general/>
|
|
101
|
+
<_attachments/>
|
|
102
|
+
</_notes>
|
|
103
|
+
</call>
|
|
104
|
+
</parallel_branch>
|
|
105
|
+
</parallel>
|
|
106
|
+
<call id="a6" endpoint="deploy">
|
|
107
|
+
<parameters>
|
|
108
|
+
<label>Plate</label>
|
|
109
|
+
<method>:post</method>
|
|
110
|
+
<arguments>
|
|
111
|
+
<info>Plate</info>
|
|
112
|
+
<behavior>wait_running</behavior>
|
|
113
|
+
<url>http://cpee.org/~demo/cpee-cockpit/testsets/Lego%20Plate.xml</url>
|
|
114
|
+
</arguments>
|
|
115
|
+
<sensors/>
|
|
116
|
+
</parameters>
|
|
117
|
+
<_timing>
|
|
118
|
+
<_timing_min/>
|
|
119
|
+
<_timing_max/>
|
|
120
|
+
<_timing_avg/>
|
|
121
|
+
</_timing>
|
|
122
|
+
<_notes>
|
|
123
|
+
<_notes_general/>
|
|
124
|
+
<_notes_output/>
|
|
125
|
+
<_attachments/>
|
|
126
|
+
</_notes>
|
|
127
|
+
</call>
|
|
128
|
+
<stop id="a1"/>
|
|
129
|
+
</loop>
|
|
130
|
+
</description>
|
|
131
|
+
</description>
|
|
132
|
+
<transformation>
|
|
133
|
+
<description type="copy"/>
|
|
134
|
+
<dataelements type="none"/>
|
|
135
|
+
<endpoints type="none"/>
|
|
136
|
+
</transformation>
|
|
137
|
+
<attributes>
|
|
138
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Super_Lego</info>
|
|
139
|
+
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
140
|
+
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
|
|
141
|
+
</attributes>
|
|
142
|
+
</testset>
|
|
@@ -0,0 +1,40 @@
|
|
|
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://liddy.wst.univie.ac.at:9200/press</dispense>
|
|
7
|
+
</endpoints>
|
|
8
|
+
<description>
|
|
9
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
10
|
+
<call id="a1" endpoint="dispense">
|
|
11
|
+
<parameters>
|
|
12
|
+
<label>Press Lid</label>
|
|
13
|
+
<method>:post</method>
|
|
14
|
+
<arguments/>
|
|
15
|
+
<sensors/>
|
|
16
|
+
</parameters>
|
|
17
|
+
<_timing>
|
|
18
|
+
<_timing_min/>
|
|
19
|
+
<_timing_max/>
|
|
20
|
+
<_timing_avg/>
|
|
21
|
+
</_timing>
|
|
22
|
+
<_notes>
|
|
23
|
+
<_notes_general/>
|
|
24
|
+
<_attachments/>
|
|
25
|
+
</_notes>
|
|
26
|
+
</call>
|
|
27
|
+
</description>
|
|
28
|
+
</description>
|
|
29
|
+
<transformation>
|
|
30
|
+
<description type="copy"/>
|
|
31
|
+
<dataelements type="none"/>
|
|
32
|
+
<endpoints type="none"/>
|
|
33
|
+
</transformation>
|
|
34
|
+
<attributes>
|
|
35
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Liddy</info>
|
|
36
|
+
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
37
|
+
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
|
|
38
|
+
<bc xmlns="http://riddl.org/ns/common-patterns/properties/1.0">operate</bc>
|
|
39
|
+
</attributes>
|
|
40
|
+
</testset>
|
|
@@ -0,0 +1,85 @@
|
|
|
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
|
+
<deploy xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://coruscant.wst.univie.ac.at:9296/url</deploy>
|
|
7
|
+
</endpoints>
|
|
8
|
+
<description>
|
|
9
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
10
|
+
<call id="a1" endpoint="deploy">
|
|
11
|
+
<parameters>
|
|
12
|
+
<label>Dispense onto Conveyor</label>
|
|
13
|
+
<method>:post</method>
|
|
14
|
+
<arguments>
|
|
15
|
+
<info>Transporter</info>
|
|
16
|
+
<behavior>wait_running</behavior>
|
|
17
|
+
<url>http://cpee.org/~demo/cpee-cockpit/testsets/Lego%20Transporter.xml</url>
|
|
18
|
+
</arguments>
|
|
19
|
+
<sensors/>
|
|
20
|
+
</parameters>
|
|
21
|
+
<_timing>
|
|
22
|
+
<_timing_min/>
|
|
23
|
+
<_timing_max/>
|
|
24
|
+
<_timing_avg/>
|
|
25
|
+
</_timing>
|
|
26
|
+
<_notes>
|
|
27
|
+
<_notes_general/>
|
|
28
|
+
<_attachments/>
|
|
29
|
+
</_notes>
|
|
30
|
+
</call>
|
|
31
|
+
<call id="a2" endpoint="deploy">
|
|
32
|
+
<parameters>
|
|
33
|
+
<label>Get to Crane</label>
|
|
34
|
+
<method>:post</method>
|
|
35
|
+
<arguments>
|
|
36
|
+
<info>Conveyor</info>
|
|
37
|
+
<behavior>wait_running</behavior>
|
|
38
|
+
<url>http://cpee.org/~demo/cpee-cockpit/testsets/Lego%20Conveyor.xml</url>
|
|
39
|
+
</arguments>
|
|
40
|
+
<sensors/>
|
|
41
|
+
</parameters>
|
|
42
|
+
<_timing>
|
|
43
|
+
<_timing_min/>
|
|
44
|
+
<_timing_max/>
|
|
45
|
+
<_timing_avg/>
|
|
46
|
+
</_timing>
|
|
47
|
+
<_notes>
|
|
48
|
+
<_notes_general/>
|
|
49
|
+
<_attachments/>
|
|
50
|
+
</_notes>
|
|
51
|
+
</call>
|
|
52
|
+
<call id="a3" endpoint="deploy">
|
|
53
|
+
<parameters>
|
|
54
|
+
<label>Get to Plate</label>
|
|
55
|
+
<method>:post</method>
|
|
56
|
+
<arguments>
|
|
57
|
+
<info>Crane</info>
|
|
58
|
+
<behavior>wait_running</behavior>
|
|
59
|
+
<url>http://cpee.org/~demo/cpee-cockpit/testsets/Lego%20Crane.xml</url>
|
|
60
|
+
</arguments>
|
|
61
|
+
<sensors/>
|
|
62
|
+
</parameters>
|
|
63
|
+
<_timing>
|
|
64
|
+
<_timing_min/>
|
|
65
|
+
<_timing_max/>
|
|
66
|
+
<_timing_avg/>
|
|
67
|
+
</_timing>
|
|
68
|
+
<_notes>
|
|
69
|
+
<_notes_general/>
|
|
70
|
+
<_attachments/>
|
|
71
|
+
</_notes>
|
|
72
|
+
</call>
|
|
73
|
+
</description>
|
|
74
|
+
</description>
|
|
75
|
+
<transformation>
|
|
76
|
+
<description type="copy"/>
|
|
77
|
+
<dataelements type="none"/>
|
|
78
|
+
<endpoints type="none"/>
|
|
79
|
+
</transformation>
|
|
80
|
+
<attributes>
|
|
81
|
+
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Lego_Part_1</info>
|
|
82
|
+
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
83
|
+
<theme xmlns="http://riddl.org/ns/common-patterns/properties/1.0">preset</theme>
|
|
84
|
+
</attributes>
|
|
85
|
+
</testset>
|
data/cockpit/testsets/Linear.xml
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<attributes>
|
|
8
8
|
<info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Linear</info>
|
|
9
9
|
<modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
|
|
10
|
-
<theme>
|
|
10
|
+
<theme>preset</theme>
|
|
11
11
|
</attributes>
|
|
12
12
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
13
13
|
<dataelements>
|
|
@@ -74,4 +74,4 @@
|
|
|
74
74
|
<dataelements type="rest"/>
|
|
75
75
|
<endpoints type="rest"/>
|
|
76
76
|
</transformation>
|
|
77
|
-
</testset>
|
|
77
|
+
</testset>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<attributes>
|
|
3
3
|
<info>Syncing Instance 1</info>
|
|
4
4
|
<modeltype>CPEE</modeltype>
|
|
5
|
-
<theme>
|
|
5
|
+
<theme>preset</theme>
|
|
6
6
|
</attributes>
|
|
7
7
|
<positions/>
|
|
8
8
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
@@ -77,4 +77,4 @@
|
|
|
77
77
|
<dataelements type="rest"/>
|
|
78
78
|
<endpoints type="rest"/>
|
|
79
79
|
</transformation>
|
|
80
|
-
</testset>
|
|
80
|
+
</testset>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<attributes>
|
|
3
3
|
<info>Syncing Instance 2</info>
|
|
4
4
|
<modeltype>CPEE</modeltype>
|
|
5
|
-
<theme>
|
|
5
|
+
<theme>preset</theme>
|
|
6
6
|
</attributes>
|
|
7
7
|
<positions/>
|
|
8
8
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
@@ -77,4 +77,4 @@
|
|
|
77
77
|
<dataelements type="rest"/>
|
|
78
78
|
<endpoints type="rest"/>
|
|
79
79
|
</transformation>
|
|
80
|
-
</testset>
|
|
80
|
+
</testset>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<attributes>
|
|
3
3
|
<info>Syncing Instance 3</info>
|
|
4
4
|
<modeltype>CPEE</modeltype>
|
|
5
|
-
<theme>
|
|
5
|
+
<theme>preset</theme>
|
|
6
6
|
</attributes>
|
|
7
7
|
<positions/>
|
|
8
8
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
@@ -77,4 +77,4 @@
|
|
|
77
77
|
<dataelements type="rest"/>
|
|
78
78
|
<endpoints type="rest"/>
|
|
79
79
|
</transformation>
|
|
80
|
-
</testset>
|
|
80
|
+
</testset>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<attributes>
|
|
3
3
|
<info>Syncing</info>
|
|
4
4
|
<modeltype>CPEE</modeltype>
|
|
5
|
-
<theme>
|
|
5
|
+
<theme>preset</theme>
|
|
6
6
|
</attributes>
|
|
7
7
|
<positions/>
|
|
8
8
|
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
@@ -77,4 +77,4 @@
|
|
|
77
77
|
<dataelements type="rest"/>
|
|
78
78
|
<endpoints type="rest"/>
|
|
79
79
|
</transformation>
|
|
80
|
-
</testset>
|
|
80
|
+
</testset>
|
|
@@ -152,7 +152,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
152
152
|
'params': [null, xml_node]
|
|
153
153
|
}];
|
|
154
154
|
}
|
|
155
|
-
if($('>
|
|
155
|
+
if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
|
|
156
156
|
var icon = self.elements.callmanipulate.illustrator.svg.clone();
|
|
157
157
|
icon.children('.rfill:last').addClass('menu');
|
|
158
158
|
menu['Delete'].push({
|
|
@@ -160,7 +160,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
160
160
|
'function_call': self.adaptor.description.remove,
|
|
161
161
|
'menu_icon': icon,
|
|
162
162
|
'type': undefined,
|
|
163
|
-
'params': ['>
|
|
163
|
+
'params': ['> code', xml_node]
|
|
164
164
|
});
|
|
165
165
|
}
|
|
166
166
|
if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
|
|
@@ -253,7 +253,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
253
253
|
},
|
|
254
254
|
'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
|
|
255
255
|
'resolve_symbol': function(node) {
|
|
256
|
-
if($('
|
|
256
|
+
if($('code', node).length > 0) {
|
|
257
257
|
return 'callmanipulate';
|
|
258
258
|
} else {
|
|
259
259
|
return 'call';
|
|
@@ -263,7 +263,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
263
263
|
},//}}}
|
|
264
264
|
'description': self.adaptor.theme_dir + 'rngs/call.rng',
|
|
265
265
|
'permissible_children': function(node,mode) { //{{{
|
|
266
|
-
if(node.children('
|
|
266
|
+
if(node.children('code').length < 1)
|
|
267
267
|
return [
|
|
268
268
|
{'label': 'Scripts',
|
|
269
269
|
'function_call': self.adaptor.description.insert_last_into,
|
|
@@ -537,7 +537,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
537
537
|
var childs = null;
|
|
538
538
|
if (mode == 'into') { func = self.adaptor.description.insert_first_into }
|
|
539
539
|
else { func = self.adaptor.description.insert_after }
|
|
540
|
-
|
|
540
|
+
var childs = [
|
|
541
541
|
{'label': 'Service Call with Scripts',
|
|
542
542
|
'function_call': func,
|
|
543
543
|
'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
|
|
@@ -577,13 +577,18 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
577
577
|
'function_call': func,
|
|
578
578
|
'menu_icon': self.elements.stop.illustrator.svg.clone(),
|
|
579
579
|
'type': 'stop',
|
|
580
|
-
'params': [self.adaptor.description.elements.stop, node]}
|
|
581
|
-
{'label': 'Critical',
|
|
582
|
-
'function_call': func,
|
|
583
|
-
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
584
|
-
'type': 'critical',
|
|
585
|
-
'params': [self.adaptor.description.elements.critical, node]}
|
|
580
|
+
'params': [self.adaptor.description.elements.stop, node]}
|
|
586
581
|
];
|
|
582
|
+
if(node.parent('parallel_branch').length > 0) {
|
|
583
|
+
childs.push({
|
|
584
|
+
'label': 'Critical',
|
|
585
|
+
'function_call': func,
|
|
586
|
+
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
587
|
+
'type': 'critical',
|
|
588
|
+
'params': [self.adaptor.description.elements.critical, node]
|
|
589
|
+
});
|
|
590
|
+
}
|
|
591
|
+
return childs;
|
|
587
592
|
}, //}}}
|
|
588
593
|
'adaptor': {//{{{
|
|
589
594
|
'mousedown': function (node,e) {
|
|
@@ -624,7 +629,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
624
629
|
'type': 'parallel_branch',
|
|
625
630
|
'params': [self.adaptor.description.elements.parallel_branch, node]}];
|
|
626
631
|
}
|
|
627
|
-
|
|
632
|
+
var childs = [
|
|
628
633
|
{'label': 'Service Call with Scripts',
|
|
629
634
|
'function_call': func,
|
|
630
635
|
'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
|
|
@@ -664,13 +669,18 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
664
669
|
'function_call': func,
|
|
665
670
|
'menu_icon': self.elements.stop.illustrator.svg.clone(),
|
|
666
671
|
'type': 'stop',
|
|
667
|
-
'params': [self.adaptor.description.elements.stop, node]}
|
|
668
|
-
{'label': 'Critical',
|
|
669
|
-
'function_call': func,
|
|
670
|
-
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
671
|
-
'type': 'critical',
|
|
672
|
-
'params': [self.adaptor.description.elements.critical, node]}
|
|
672
|
+
'params': [self.adaptor.description.elements.stop, node]}
|
|
673
673
|
];
|
|
674
|
+
if(node.parent('parallel_branch').length > 0) {
|
|
675
|
+
childs.push({
|
|
676
|
+
'label': 'Critical',
|
|
677
|
+
'function_call': func,
|
|
678
|
+
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
679
|
+
'type': 'critical',
|
|
680
|
+
'params': [self.adaptor.description.elements.critical, node]
|
|
681
|
+
});
|
|
682
|
+
}
|
|
683
|
+
return childs;
|
|
674
684
|
}, //}}}
|
|
675
685
|
'adaptor': {//{{{
|
|
676
686
|
'mousedown': function (node,e) {
|
|
@@ -716,7 +726,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
716
726
|
'menu_icon': self.elements.call.illustrator.svg.clone(),
|
|
717
727
|
'type': 'call',
|
|
718
728
|
'params': [self.adaptor.description.elements.call, node]},
|
|
719
|
-
{'label': '
|
|
729
|
+
{'label': 'Script',
|
|
720
730
|
'function_call': func,
|
|
721
731
|
'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
|
|
722
732
|
'type': 'manipulate',
|
|
@@ -740,13 +750,17 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
740
750
|
'function_call': func,
|
|
741
751
|
'menu_icon': self.elements.stop.illustrator.svg.clone(),
|
|
742
752
|
'type': 'stop',
|
|
743
|
-
'params': [self.adaptor.description.elements.stop, node]}
|
|
744
|
-
{'label': 'Critical',
|
|
745
|
-
'function_call': func,
|
|
746
|
-
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
747
|
-
'type': 'critical',
|
|
748
|
-
'params': [self.adaptor.description.elements.critical, node]}
|
|
753
|
+
'params': [self.adaptor.description.elements.stop, node]}
|
|
749
754
|
];
|
|
755
|
+
if(node.parent('parallel_branch').length > 0) {
|
|
756
|
+
childs.push({
|
|
757
|
+
'label': 'Critical',
|
|
758
|
+
'function_call': func,
|
|
759
|
+
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
760
|
+
'type': 'critical',
|
|
761
|
+
'params': [self.adaptor.description.elements.critical, node]
|
|
762
|
+
});
|
|
763
|
+
}
|
|
750
764
|
if(node.parent('parallel').length > node.parent('parallel_branch').length) {
|
|
751
765
|
childs.push({'label': 'Parallel Branch',
|
|
752
766
|
'function_call': func,
|
|
@@ -806,7 +820,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
806
820
|
'menu_icon': self.elements.call.illustrator.svg.clone(),
|
|
807
821
|
'type': 'call',
|
|
808
822
|
'params': [self.adaptor.description.elements.call, node]},
|
|
809
|
-
{'label': '
|
|
823
|
+
{'label': 'Script',
|
|
810
824
|
'function_call': func,
|
|
811
825
|
'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
|
|
812
826
|
'type': 'manipulate',
|
|
@@ -825,7 +839,12 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
825
839
|
'function_call': func,
|
|
826
840
|
'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
|
|
827
841
|
'type': 'parallel_branch',
|
|
828
|
-
'params': [self.adaptor.description.elements.parallel_branch, node]}
|
|
842
|
+
'params': [self.adaptor.description.elements.parallel_branch, node]},
|
|
843
|
+
{'label': 'Stop',
|
|
844
|
+
'function_call': func,
|
|
845
|
+
'menu_icon': self.elements.stop.illustrator.svg.clone(),
|
|
846
|
+
'type': 'stop',
|
|
847
|
+
'params': [self.adaptor.description.elements.stop, node]}
|
|
829
848
|
];
|
|
830
849
|
if(node.get(0).tagName != 'parallel')
|
|
831
850
|
childs.push({'label': 'Parallel',
|
|
@@ -871,10 +890,9 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
871
890
|
'description': self.adaptor.theme_dir + 'rngs/parallel_branch.rng',
|
|
872
891
|
'permissible_children': function(node,mode) { //{{{
|
|
873
892
|
var func = null;
|
|
874
|
-
var childs = null;
|
|
875
893
|
if (mode == 'into') { func = self.adaptor.description.insert_first_into }
|
|
876
894
|
else { func = self.adaptor.description.insert_after }
|
|
877
|
-
childs =
|
|
895
|
+
var childs = [
|
|
878
896
|
{'label': 'Service Call with Scripts',
|
|
879
897
|
'function_call': func,
|
|
880
898
|
'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
|
|
@@ -919,7 +937,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
919
937
|
'function_call': func,
|
|
920
938
|
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
921
939
|
'type': 'critical',
|
|
922
|
-
'params': [self.adaptor.description.elements.critical, node]}
|
|
940
|
+
'params': [self.adaptor.description.elements.critical, node]}
|
|
923
941
|
];
|
|
924
942
|
if(node.parents('choose').length > node.parents('alternative, otherwise').length && node.get(0).tagName == 'parallel_branch') {
|
|
925
943
|
return [{'label': 'Alternative',
|
|
@@ -964,7 +982,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
964
982
|
var func = null;
|
|
965
983
|
if (mode == 'into') { func = self.adaptor.description.insert_first_into }
|
|
966
984
|
else { func = self.adaptor.description.insert_after }
|
|
967
|
-
|
|
985
|
+
var childs = [
|
|
968
986
|
{'label': 'Service Call with Scripts',
|
|
969
987
|
'function_call': func,
|
|
970
988
|
'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
|
|
@@ -1004,13 +1022,18 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
1004
1022
|
'function_call': func,
|
|
1005
1023
|
'menu_icon': self.elements.stop.illustrator.svg.clone(),
|
|
1006
1024
|
'type': 'stop',
|
|
1007
|
-
'params': [self.adaptor.description.elements.stop, node]}
|
|
1008
|
-
{'label': 'Critical',
|
|
1009
|
-
'function_call': func,
|
|
1010
|
-
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
1011
|
-
'type': 'critical',
|
|
1012
|
-
'params': [self.adaptor.description.elements.critical, node]},
|
|
1025
|
+
'params': [self.adaptor.description.elements.stop, node]}
|
|
1013
1026
|
];
|
|
1027
|
+
if(node.parent('parallel_branch').length > 0) {
|
|
1028
|
+
childs.push({
|
|
1029
|
+
'label': 'Critical',
|
|
1030
|
+
'function_call': func,
|
|
1031
|
+
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
1032
|
+
'type': 'critical',
|
|
1033
|
+
'params': [self.adaptor.description.elements.critical, node]
|
|
1034
|
+
});
|
|
1035
|
+
}
|
|
1036
|
+
return childs;
|
|
1014
1037
|
}, //}}}
|
|
1015
1038
|
'adaptor': {//{{{
|
|
1016
1039
|
'mousedown': function (node,e) {
|
|
@@ -1074,7 +1097,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
1074
1097
|
var func = null;
|
|
1075
1098
|
if (mode == 'into') { func = self.adaptor.description.insert_first_into }
|
|
1076
1099
|
else { func = self.adaptor.description.insert_after }
|
|
1077
|
-
|
|
1100
|
+
var childs = [
|
|
1078
1101
|
{'label': 'Service Call with Scripts',
|
|
1079
1102
|
'function_call': func,
|
|
1080
1103
|
'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
|
|
@@ -1085,7 +1108,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
1085
1108
|
'menu_icon': self.elements.call.illustrator.svg.clone(),
|
|
1086
1109
|
'type': 'call',
|
|
1087
1110
|
'params': [self.adaptor.description.elements.call, node]},
|
|
1088
|
-
{'label': 'Script
|
|
1111
|
+
{'label': 'Script',
|
|
1089
1112
|
'function_call': func,
|
|
1090
1113
|
'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
|
|
1091
1114
|
'type': 'manipulate',
|
|
@@ -1114,13 +1137,18 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
1114
1137
|
'function_call': func,
|
|
1115
1138
|
'menu_icon': self.elements.stop.illustrator.svg.clone(),
|
|
1116
1139
|
'type': 'stop',
|
|
1117
|
-
'params': [self.adaptor.description.elements.stop, node]}
|
|
1118
|
-
{'label': 'Critical',
|
|
1119
|
-
'function_call': func,
|
|
1120
|
-
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
1121
|
-
'type': 'critical',
|
|
1122
|
-
'params': [self.adaptor.description.elements.critical, node]}
|
|
1140
|
+
'params': [self.adaptor.description.elements.stop, node]}
|
|
1123
1141
|
];
|
|
1142
|
+
if(node.parent('parallel_branch').length > 0) {
|
|
1143
|
+
childs.push({
|
|
1144
|
+
'label': 'Critical',
|
|
1145
|
+
'function_call': func,
|
|
1146
|
+
'menu_icon': self.elements.critical.illustrator.svg.clone(),
|
|
1147
|
+
'type': 'critical',
|
|
1148
|
+
'params': [self.adaptor.description.elements.critical, node]
|
|
1149
|
+
});
|
|
1150
|
+
}
|
|
1151
|
+
return childs;
|
|
1124
1152
|
}, //}}}
|
|
1125
1153
|
'adaptor': {//{{{
|
|
1126
1154
|
'mousedown': function (node,e) {
|