cpee 2.1.35 → 2.1.36

Sign up to get free protection for your applications and to get access to all the features.
Files changed (59) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/css/track.css +1 -1
  3. data/cockpit/js/details.js +2 -2
  4. data/cockpit/templates/Subprocess.xml +3 -0
  5. data/cockpit/themes/compact/rngs/call.rng +107 -86
  6. data/cockpit/themes/compact/rngs/callmanipulate.rng +10 -6
  7. data/cockpit/themes/compact/rngs/start.rng +94 -73
  8. data/cockpit/themes/compact/symbols/call_sensor.svg +9 -0
  9. data/cockpit/themes/compact/symbols/callmanipulate.svg +3 -3
  10. data/cockpit/themes/compact/symbols/callmanipulate_sensor.svg +11 -0
  11. data/cockpit/themes/compact/theme.js +25 -5
  12. data/cockpit/themes/control/rngs/call.rng +107 -86
  13. data/cockpit/themes/control/rngs/callmanipulate.rng +10 -6
  14. data/cockpit/themes/control/rngs/start.rng +94 -73
  15. data/cockpit/themes/control/symbols/call_sensor.svg +9 -0
  16. data/cockpit/themes/control/symbols/callmanipulate.svg +3 -3
  17. data/cockpit/themes/control/symbols/callmanipulate_sensor.svg +11 -0
  18. data/cockpit/themes/default/rngs/call.rng +107 -86
  19. data/cockpit/themes/default/rngs/callmanipulate.rng +10 -6
  20. data/cockpit/themes/default/rngs/start.rng +94 -73
  21. data/cockpit/themes/default/symbols/call_sensor.svg +9 -0
  22. data/cockpit/themes/default/symbols/callmanipulate.svg +3 -3
  23. data/cockpit/themes/default/symbols/callmanipulate_sensor.svg +11 -0
  24. data/cockpit/themes/default/theme.js +25 -5
  25. data/cockpit/themes/extended/rngs/call.rng +107 -86
  26. data/cockpit/themes/extended/rngs/callmanipulate.rng +10 -6
  27. data/cockpit/themes/extended/rngs/start.rng +94 -73
  28. data/cockpit/themes/extended/symbols/call_sensor.svg +9 -0
  29. data/cockpit/themes/extended/symbols/callmanipulate.svg +3 -3
  30. data/cockpit/themes/extended/symbols/callmanipulate_sensor.svg +11 -0
  31. data/cockpit/themes/extended/theme.js +25 -5
  32. data/cockpit/themes/model/symbols/call_sensor.svg +9 -0
  33. data/cockpit/themes/model/symbols/callmanipulate.svg +3 -3
  34. data/cockpit/themes/model/symbols/callmanipulate_sensor.svg +11 -0
  35. data/cockpit/themes/packed/rngs/call.rng +107 -86
  36. data/cockpit/themes/packed/rngs/callmanipulate.rng +10 -6
  37. data/cockpit/themes/packed/rngs/start.rng +94 -73
  38. data/cockpit/themes/packed/symbols/call_sensor.svg +9 -0
  39. data/cockpit/themes/packed/symbols/callmanipulate.svg +3 -3
  40. data/cockpit/themes/packed/symbols/callmanipulate_sensor.svg +11 -0
  41. data/cockpit/themes/packed/theme.js +25 -5
  42. data/cockpit/themes/preset/rngs/call.rng +107 -86
  43. data/cockpit/themes/preset/rngs/callmanipulate.rng +10 -6
  44. data/cockpit/themes/preset/rngs/start.rng +94 -73
  45. data/cockpit/themes/preset/symbols/call_sensor.svg +9 -0
  46. data/cockpit/themes/preset/symbols/callmanipulate.svg +3 -3
  47. data/cockpit/themes/preset/symbols/callmanipulate_sensor.svg +11 -0
  48. data/cockpit/themes/preset/theme.js +25 -5
  49. data/cpee.gemspec +1 -1
  50. data/lib/cpee/implementation.rb +25 -14
  51. data/lib/cpee/message.rb +0 -1
  52. data/server/executionhandlers/ruby/connection.rb +29 -17
  53. data/server/resources/states.xml +3 -0
  54. data/server/routing/end.pid +1 -0
  55. data/server/routing/forward-events.pid +1 -0
  56. data/server/routing/forward-votes.pid +1 -0
  57. data/server/routing/persist.pid +1 -0
  58. data/tools/cpee +6 -4
  59. metadata +20 -2
data/cockpit/themes/preset/rngs/call.rng CHANGED
@@ -34,92 +34,6 @@
34
34
  <element name="_timing_avg" rngui:label="Avg in min">
35
35
  <data type="float" rngui:label="Minutes"/>
36
36
  </element>
37
- <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
38
-
39
- <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
40
- <zeroOrMore rngui:label="Add Probe">
41
- <element name="probe">
42
- <element name="name" rngui:label="Label">
43
- <data type="string" rngui:label="Label"/>
44
- </element>
45
- <element name="extractor_type" rngui:label="Extractor Type">
46
- <choice>
47
- <value id='code'>Code</value>
48
- <value id='service'>Service</value>
49
- </choice>
50
- </element>
51
- <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
52
- <text rngui:label="Code"/>
53
- </element>
54
- <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
55
- <data type="string" rngui:label="Service Url"/>
56
- </element>
57
- <element name="extractor_params" rngui:label="Extractor Service Arguments:">
58
- <zeroOrMore rngui:label="Create Argument Pairs">
59
- <element rngui:label="Name">
60
- <anyName/>
61
- <data type="string" rngui:label="Value / Json"/>
62
- </element>
63
- </zeroOrMore>
64
- </element>
65
- <element name="visualizer_url" rngui:label="Visualizer Url">
66
- <data type="string" rngui:label="Service Url"/>
67
- </element>
68
- <element name="visualizer_params" rngui:label="Visualizer Arguments">
69
- <zeroOrMore rngui:label="Create Argument Pairs">
70
- <element rngui:label="Name">
71
- <anyName/>
72
- <data type="string" rngui:label="Value / Json"/>
73
- </element>
74
- </zeroOrMore>
75
- </element>
76
- </element>
77
- </zeroOrMore>
78
- </element>
79
-
80
- <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
81
- <zeroOrMore rngui:label="Add Impact Profile">
82
- <element name="ip">
83
- <element name="name" rngui:label="Label">
84
- <data type="string" rngui:label="Label"/>
85
- </element>
86
- <element name="target" rngui:label="Target Value">
87
- <data type="string" rngui:label="Value"/>
88
- </element>
89
- <element name="ifs" rngui:header="Impact Factors">
90
- <zeroOrMore rngui:label="Add Impact Factor">
91
- <element name="if">
92
- <element name="ivs" rngui:header="Impact Values">
93
- <zeroOrMore rngui:label="Add Impact Value ">
94
- <element name="iv">
95
- <element name="extractor_url" rngui:label="Extractor Url">
96
- <data type="string" rngui:label="Service Url + Parameters"/>
97
- </element>
98
- <element name="aggregator_url" rngui:label="Aggregator Url">
99
- <data type="string" rngui:label="Service Url + Parameters"/>
100
- </element>
101
- </element>
102
- </zeroOrMore>
103
- </element>
104
- <element name="aggregator_url" rngui:label="Impact Function Url">
105
- <data type="string" rngui:label="Service Url + Parameters"/>
106
- </element>
107
- </element>
108
- </zeroOrMore>
109
- </element>
110
- <element name="vfunc_url" rngui:label="Violation Function Url">
111
- <data type="string" rngui:label="Service Url + Parameters"/>
112
- </element>
113
- </element>
114
- </zeroOrMore>
115
- </element>
116
-
117
- </element>
118
- <element name="report" rngui:header="Reporting" rngui:fold="closed">
119
- <element name="url" rngui:label='HTML Snippet'>
120
- <data type="string" rngui:label="url to report snippet"/>
121
- </element>
122
- </element>
123
37
  <element name="explanations" rngui:header="Explanations">
124
38
  <zeroOrMore rngui:label="Add Explanation">
125
39
  <element name="explanation">
@@ -149,12 +63,119 @@
149
63
  </zeroOrMore>
150
64
  </element>
151
65
  </element>
66
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
67
+
68
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
69
+ <zeroOrMore rngui:label="Add Probe">
70
+ <element name="probe">
71
+ <element name="id" rngui:label="ID">
72
+ <data type="string" rngui:label="ID"/>
73
+ </element>
74
+ <element name="source" rngui:label="Source">
75
+ <data type="string" rngui:label="Where does the sensor value come from?"/>
76
+ </element>
77
+ <element name="extractor_type" rngui:label="Extractor Type">
78
+ <choice>
79
+ <value id='intrinsic'>Intrinsic</value>
80
+ <value id='extrinsic'>Extrinsic</value>
81
+ <value id='separate'>Separate</value>
82
+ </choice>
83
+ </element>
84
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
85
+ <text rngui:label="Code"/>
86
+ </element>
87
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
88
+ <data type="string" rngui:label="Service Url"/>
89
+ </element>
90
+ <element name="extractor_params" rngui:label="Extractor Service Arguments:">
91
+ <zeroOrMore rngui:label="Create Argument Pairs">
92
+ <element rngui:label="Name">
93
+ <anyName/>
94
+ <data type="string" rngui:label="Value / Json"/>
95
+ </element>
96
+ </zeroOrMore>
97
+ </element>
98
+ <element name="visualizer_url" rngui:label="Visualizer Url">
99
+ <data type="string" rngui:label="Service Url"/>
100
+ </element>
101
+ <element name="visualizer_params" rngui:label="Visualizer Arguments">
102
+ <zeroOrMore rngui:label="Create Argument Pairs">
103
+ <element rngui:label="Name">
104
+ <anyName/>
105
+ <data type="string" rngui:label="Value / Json"/>
106
+ </element>
107
+ </zeroOrMore>
108
+ </element>
109
+ </element>
110
+ </zeroOrMore>
111
+ </element>
112
+
113
+ <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
114
+ <zeroOrMore rngui:label="Add Impact Profile">
115
+ <element name="ip">
116
+ <element name="name" rngui:label="Label">
117
+ <data type="string" rngui:label="Label"/>
118
+ </element>
119
+ <element name="target" rngui:label="Target Value">
120
+ <data type="string" rngui:label="Value"/>
121
+ </element>
122
+ <element name="ifs" rngui:header="Impact Factors">
123
+ <zeroOrMore rngui:label="Add Impact Factor">
124
+ <element name="if">
125
+ <element name="ivs" rngui:header="Impact Values">
126
+ <zeroOrMore rngui:label="Add Impact Value ">
127
+ <element name="iv">
128
+ <element name="extractor_url" rngui:label="Extractor Url">
129
+ <data type="string" rngui:label="Service Url + Parameters"/>
130
+ </element>
131
+ <element name="extractor_params" rngui:header="Extractor Arguments">
132
+ <zeroOrMore rngui:label="Create Extractor Argument Pairs">
133
+ <element rngui:label="Name">
134
+ <anyName/>
135
+ <data type="string" rngui:label="Value / Json"/>
136
+ </element>
137
+ </zeroOrMore>
138
+ </element>
139
+ <element name="aggregator_url" rngui:label="Aggregator Url">
140
+ <data type="string" rngui:label="Service Url + Parameters"/>
141
+ </element>
142
+ <element name="aggregator_params" rngui:header="Extractor Arguments">
143
+ <zeroOrMore rngui:label="Create Aggregator Argument Pairs">
144
+ <element rngui:label="Name">
145
+ <anyName/>
146
+ <data type="string" rngui:label="Value / Json"/>
147
+ </element>
148
+ </zeroOrMore>
149
+ </element>
150
+ </element>
151
+ </zeroOrMore>
152
+ </element>
153
+ <element name="aggregator_url" rngui:label="Impact Function Url">
154
+ <data type="string" rngui:label="Service Url + Parameters"/>
155
+ </element>
156
+ </element>
157
+ </zeroOrMore>
158
+ </element>
159
+ <element name="vfunc_url" rngui:label="Violation Function Url">
160
+ <data type="string" rngui:label="Service Url + Parameters"/>
161
+ </element>
162
+ </element>
163
+ </zeroOrMore>
164
+ </element>
165
+
166
+ </element>
167
+ <element name="report" rngui:header="Reporting" rngui:fold="closed">
168
+ <element name="url" rngui:label='HTML Snippet'>
169
+ <data type="string" rngui:label="url to report snippet"/>
170
+ </element>
171
+ </element>
152
172
  <element name="_notes" rngui:header="Notes" rngui:fold="closed">
153
173
  <element name="_notes_general" rngui:label="General">
154
174
  <text rngui:wrap="true" rngui:label="Notes"/>
155
175
  </element>
156
176
  </element>
157
177
  </element>
178
+
158
179
  <element name="documentation" rngui:header="Documentation">
159
180
  <element name="input" rngui:header="Input Arguments" rngui:fold="closed">
160
181
  <zeroOrMore rngui:label="Create Argument">
data/cockpit/themes/preset/rngs/callmanipulate.rng CHANGED
@@ -91,19 +91,23 @@
91
91
  <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
92
92
  <zeroOrMore rngui:label="Add Probe">
93
93
  <element name="probe">
94
- <element name="name" rngui:label="Label">
95
- <data type="string" rngui:label="Label"/>
94
+ <element name="id" rngui:label="ID">
95
+ <data type="string" rngui:label="ID"/>
96
+ </element>
97
+ <element name="source" rngui:label="Source">
98
+ <data type="string" rngui:label="Where does the sensor value come from?"/>
96
99
  </element>
97
100
  <element name="extractor_type" rngui:label="Extractor Type">
98
101
  <choice>
99
- <value id='code'>Code</value>
100
- <value id='service'>Service</value>
102
+ <value id='intrinsic'>Intrinsic</value>
103
+ <value id='extrinsic'>Extrinsic</value>
104
+ <value id='separate'>Separate</value>
101
105
  </choice>
102
106
  </element>
103
- <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
107
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
104
108
  <text rngui:label="Code"/>
105
109
  </element>
106
- <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
110
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
107
111
  <data type="string" rngui:label="Service Url"/>
108
112
  </element>
109
113
  <element name="extractor_params" rngui:label="Extractor Service Arguments:">
data/cockpit/themes/preset/rngs/start.rng CHANGED
@@ -1,83 +1,104 @@
1
1
  <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="description" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
2
- <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All changes to data elements in the process as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to individual tasks to define more restricted data probes.">
2
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
3
3
 
4
- <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
5
- <zeroOrMore rngui:label="Add Probe">
6
- <element name="probe">
7
- <element name="name" rngui:label="Label">
8
- <data type="string" rngui:label="Label"/>
9
- </element>
10
- <element name="extractor_type" rngui:label="Extractor Type">
11
- <choice>
12
- <value id='code'>Code</value>
13
- <value id='service'>Service</value>
14
- </choice>
15
- </element>
16
- <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic data'>
17
- <text rngui:label="Code"/>
18
- </element>
19
- <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For intrinsic &amp; discrete data'>
20
- <data type="string" rngui:label="Service Url"/>
21
- </element>
22
- <element name="extractor_params" rngui:label="Extractor Service Arguments:">
23
- <zeroOrMore rngui:label="Create Argument Pairs">
24
- <element rngui:label="Name">
25
- <anyName/>
26
- <data type="string" rngui:label="Value / Json"/>
27
- </element>
28
- </zeroOrMore>
29
- </element>
30
- <element name="visualizer_url" rngui:label="Visualizer Url">
31
- <data type="string" rngui:label="Service Url"/>
32
- </element>
33
- <element name="visualizer_params" rngui:label="Visualizer Arguments">
34
- <zeroOrMore rngui:label="Create Argument Pairs">
35
- <element rngui:label="Name">
36
- <anyName/>
37
- <data type="string" rngui:label="Value / Json"/>
38
- </element>
39
- </zeroOrMore>
4
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
5
+ <zeroOrMore rngui:label="Add Probe">
6
+ <element name="probe">
7
+ <element name="id" rngui:label="ID">
8
+ <data type="string" rngui:label="ID"/>
9
+ </element>
10
+ <element name="source" rngui:label="Source">
11
+ <data type="string" rngui:label="Where does the sensor value come from?"/>
12
+ </element>
13
+ <element name="extractor_type" rngui:label="Extractor Type">
14
+ <choice>
15
+ <value id='intrinsic'>Intrinsic</value>
16
+ <value id='extrinsic'>Extrinsic</value>
17
+ <value id='separate'>Separate</value>
18
+ </choice>
19
+ </element>
20
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
21
+ <text rngui:label="Code"/>
22
+ </element>
23
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
24
+ <data type="string" rngui:label="Service Url"/>
25
+ </element>
26
+ <element name="extractor_params" rngui:label="Extractor Service Arguments:">
27
+ <zeroOrMore rngui:label="Create Argument Pairs">
28
+ <element rngui:label="Name">
29
+ <anyName/>
30
+ <data type="string" rngui:label="Value / Json"/>
31
+ </element>
32
+ </zeroOrMore>
33
+ </element>
34
+ <element name="visualizer_url" rngui:label="Visualizer Url">
35
+ <data type="string" rngui:label="Service Url"/>
36
+ </element>
37
+ <element name="visualizer_params" rngui:label="Visualizer Arguments">
38
+ <zeroOrMore rngui:label="Create Argument Pairs">
39
+ <element rngui:label="Name">
40
+ <anyName/>
41
+ <data type="string" rngui:label="Value / Json"/>
42
+ </element>
43
+ </zeroOrMore>
44
+ </element>
40
45
  </element>
41
- </element>
42
- </zeroOrMore>
43
- </element>
46
+ </zeroOrMore>
47
+ </element>
44
48
 
45
- <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
46
- <zeroOrMore rngui:label="Add Impact Profile">
47
- <element name="ip">
48
- <element name="name" rngui:label="Label">
49
- <data type="string" rngui:label="Label"/>
50
- </element>
51
- <element name="target" rngui:label="Target Value">
52
- <data type="string" rngui:label="Value"/>
53
- </element>
54
- <element name="ifs" rngui:header="Impact Factors">
55
- <zeroOrMore rngui:label="Add Impact Factor">
56
- <element name="if">
57
- <element name="ivs" rngui:header="Impact Values">
58
- <zeroOrMore rngui:label="Add Impact Value ">
59
- <element name="iv">
60
- <element name="extractor_url" rngui:label="Extractor Url">
61
- <data type="string" rngui:label="Service Url + Parameters"/>
62
- </element>
63
- <element name="aggregator_url" rngui:label="Aggregator Url">
64
- <data type="string" rngui:label="Service Url + Parameters"/>
49
+ <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
50
+ <zeroOrMore rngui:label="Add Impact Profile">
51
+ <element name="ip">
52
+ <element name="name" rngui:label="Label">
53
+ <data type="string" rngui:label="Label"/>
54
+ </element>
55
+ <element name="target" rngui:label="Target Value">
56
+ <data type="string" rngui:label="Value"/>
57
+ </element>
58
+ <element name="ifs" rngui:header="Impact Factors">
59
+ <zeroOrMore rngui:label="Add Impact Factor">
60
+ <element name="if">
61
+ <element name="ivs" rngui:header="Impact Values">
62
+ <zeroOrMore rngui:label="Add Impact Value ">
63
+ <element name="iv">
64
+ <element name="extractor_url" rngui:label="Extractor Url">
65
+ <data type="string" rngui:label="Service Url + Parameters"/>
66
+ </element>
67
+ <element name="extractor_params" rngui:header="Extractor Arguments">
68
+ <zeroOrMore rngui:label="Create Extractor Argument Pairs">
69
+ <element rngui:label="Name">
70
+ <anyName/>
71
+ <data type="string" rngui:label="Value / Json"/>
72
+ </element>
73
+ </zeroOrMore>
74
+ </element>
75
+ <element name="aggregator_url" rngui:label="Aggregator Url">
76
+ <data type="string" rngui:label="Service Url + Parameters"/>
77
+ </element>
78
+ <element name="aggregator_params" rngui:header="Extractor Arguments">
79
+ <zeroOrMore rngui:label="Create Aggregator Argument Pairs">
80
+ <element rngui:label="Name">
81
+ <anyName/>
82
+ <data type="string" rngui:label="Value / Json"/>
83
+ </element>
84
+ </zeroOrMore>
85
+ </element>
65
86
  </element>
66
- </element>
67
- </zeroOrMore>
87
+ </zeroOrMore>
88
+ </element>
89
+ <element name="aggregator_url" rngui:label="Impact Function Url">
90
+ <data type="string" rngui:label="Service Url + Parameters"/>
91
+ </element>
68
92
  </element>
69
- <element name="aggregator_url" rngui:label="Impact Function Url">
70
- <data type="string" rngui:label="Service Url + Parameters"/>
71
- </element>
72
- </element>
73
- </zeroOrMore>
74
- </element>
75
- <element name="vfunc_url" rngui:label="Violation Function Url">
76
- <data type="string" rngui:label="Service Url + Parameters"/>
93
+ </zeroOrMore>
94
+ </element>
95
+ <element name="vfunc_url" rngui:label="Violation Function Url">
96
+ <data type="string" rngui:label="Service Url + Parameters"/>
97
+ </element>
77
98
  </element>
78
- </element>
79
- </zeroOrMore>
99
+ </zeroOrMore>
100
+ </element>
101
+
80
102
  </element>
81
103
 
82
- </element>
83
104
  </element>
data/cockpit/themes/preset/symbols/call_sensor.svg ADDED
@@ -0,0 +1,9 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <path class="cline stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
3
+ <path class="cline stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>
4
+ <circle cx="27" cy="3" r="2" class="cfill cline rfill normal"/>
5
+ <g class="replace">
6
+ <rect x="1" y="1" width="28" height="28" rx="4" class="hfill rfill cline stand"/>
7
+ <path class="normal" style="fill:#000000;" d="m 21.561187,10.184155 c 0,-0.03232 0,-0.03232 0,-0.03232 C 21.076371,9.5054099 20.494591,8.9559512 19.815848,8.4388133 l 0,0.032323 C 19.266389,8.891311 18.71693,9.3438064 18.199794,9.7963017 17.973545,9.6670167 17.779619,9.5700535 17.585693,9.4730903 17.327124,9.3438064 17.068556,9.2145213 16.777665,9.1498799 16.680695,9.1175569 16.583739,9.0852339 16.486775,9.0852339 16.422135,8.3741695 16.357491,7.6631063 16.260528,6.952042 15.937318,6.887396 15.614106,6.887396 15.258574,6.855073 c -0.09697,0 -0.193926,0 -0.258569,0 -0.09697,0 -0.193925,0 -0.258568,0 -0.323211,0.032323 -0.614101,0.032323 -0.90499,0.096969 -0.09697,0.6787425 -0.161606,1.3898068 -0.193927,2.1008712 -0.129284,0 -0.226248,0.032323 -0.355532,0.064646 -0.03232,0 -0.06465,0 -0.09697,0.032323 -0.258568,0.064646 -0.517136,0.1939264 -0.775704,0.3232103 -0.226249,0.096969 -0.420175,0.1939264 -0.614102,0.3232114 -0.549458,-0.4524953 -1.066595,-0.87267 -1.616054,-1.3251654 0,0 0,0 -0.03232,-0.032323 C 10.022552,8.5357845 9.8932693,8.6327419 9.7963053,8.7297051 9.5700583,8.8913109 9.3761314,9.0852373 9.2145262,9.2791637 8.9236366,9.5377327 8.6973883,9.8609431 8.4388194,10.184155 c 0,0 0,0 0.032323,0 0.4201747,0.549459 0.87267,1.066596 1.325166,1.616054 -0.129285,0.193927 -0.258569,0.420175 -0.355533,0.614101 -0.129285,0.258569 -0.226248,0.549459 -0.2908894,0.808028 -0.064646,0.129284 -0.096969,0.258568 -0.096969,0.355531 -0.7110644,0.06465 -1.4221288,0.129285 -2.1008713,0.226248 -0.064646,0.323211 -0.096969,0.646422 -0.096969,1.001954 0,0.484816 0.032323,0.969632 0.1292839,1.422128 0.6787437,0.06465 1.3574862,0.129284 2.0685505,0.193926 0,0.129284 0.032323,0.258569 0.096969,0.355532 0.064646,0.29089 0.1616049,0.549459 0.2908899,0.840349 0.129284,0.226247 0.2262471,0.452495 0.387853,0.646421 -0.452496,0.549459 -0.9049912,1.066596 -1.3251647,1.616054 0.484816,0.678744 1.0665957,1.260523 1.7453387,1.74534 l 0,-0.03232 c 0.517137,-0.420175 1.066596,-0.87267 1.583733,-1.325166 l 0.03232,0 c 0.161605,0.09697 0.355532,0.193928 0.517136,0.290891 0.290891,0.129284 0.614101,0.258568 0.904991,0.32321 0.129284,0.03232 0.226248,0.06465 0.32321,0.09697 0.06465,0.678743 0.129285,1.389807 0.226249,2.100871 0.290889,0.03232 0.581779,0.06465 0.90499,0.06465 0.06465,0 0.258568,0 0.484817,0 0.355532,0 0.711064,-0.03232 1.066595,-0.09697 0.06465,-0.678742 0.129285,-1.389807 0.193926,-2.10087 0.09697,-0.03232 0.193927,-0.06465 0.29089,-0.09697 l 0,0 c 0.290891,-0.06464 0.549459,-0.161605 0.808028,-0.290889 0.226248,-0.09697 0.452495,-0.226248 0.678743,-0.387854 0,0.03232 0,0.03232 0.03232,0.03232 0.517137,0.452495 1.066596,0.904989 1.616054,1.325164 0.09697,-0.06465 0.193927,-0.129284 0.323212,-0.226247 0.193926,-0.161606 0.387852,-0.355532 0.549458,-0.549459 0.29089,-0.290889 0.58178,-0.614101 0.840348,-0.969633 -0.452495,-0.549459 -0.90499,-1.098917 -1.357486,-1.616054 0,-0.03232 0,-0.03232 0,-0.03232 0.09697,-0.161605 0.193927,-0.355531 0.29089,-0.549457 0.09696,-0.258569 0.226248,-0.517138 0.29089,-0.775707 0,-0.03232 0,-0.06465 0.03232,-0.06465 0,-0.129285 0.03232,-0.226248 0.06465,-0.290891 0.711065,-0.06465 1.422129,-0.129284 2.100872,-0.193926 0.06464,-0.323211 0.06464,-0.646422 0.09697,-0.969632 0,-0.09697 0,-0.193927 0,-0.29089 0,-0.06465 0,-0.161606 0,-0.258569 -0.03232,-0.323212 -0.03232,-0.646422 -0.09697,-0.969633 -0.678743,-0.06465 -1.389807,-0.129284 -2.100872,-0.193927 -0.03232,-0.09697 -0.06465,-0.193926 -0.06465,-0.290889 -0.09697,-0.29089 -0.193927,-0.58178 -0.323212,-0.872669 -0.09697,-0.193927 -0.226247,-0.420175 -0.32321,-0.614102 0.420173,-0.517136 0.872669,-1.066595 1.325164,-1.616054 z m -8.629731,2.682651 c 0.581779,-0.614101 1.292844,-0.904991 2.100871,-0.87267 0.840348,-0.03232 1.519091,0.258569 2.133192,0.87267 0.581779,0.581779 0.872669,1.292843 0.872669,2.10087 0,0.840348 -0.29089,1.519092 -0.872669,2.133192 -0.614101,0.58178 -1.292844,0.87267 -2.133192,0.87267 -0.808027,0 -1.519092,-0.29089 -2.100871,-0.87267 -0.581779,-0.6141 -0.872669,-1.292844 -0.872669,-2.133192 0,-0.808027 0.29089,-1.519091 0.872669,-2.10087 z"/>
8
+ </g>
9
+ </svg>
data/cockpit/themes/preset/symbols/callmanipulate.svg CHANGED
@@ -1,8 +1,8 @@
1
1
  <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
2
  <g class="replace">
3
3
  <rect x="1" y="1" width="28" height="28" rx="4" class="cline hfill rfill stand"/>
4
- <path class="normal" transform="translate(-2,-2)" style="fill:#000000;" d="m 21.561187,10.184155 c 0,-0.03232 0,-0.03232 0,-0.03232 C 21.076371,9.5054099 20.494591,8.9559512 19.815848,8.4388133 l 0,0.032323 C 19.266389,8.891311 18.71693,9.3438064 18.199794,9.7963017 17.973545,9.6670167 17.779619,9.5700535 17.585693,9.4730903 17.327124,9.3438064 17.068556,9.2145213 16.777665,9.1498799 16.680695,9.1175569 16.583739,9.0852339 16.486775,9.0852339 16.422135,8.3741695 16.357491,7.6631063 16.260528,6.952042 15.937318,6.887396 15.614106,6.887396 15.258574,6.855073 c -0.09697,0 -0.193926,0 -0.258569,0 -0.09697,0 -0.193925,0 -0.258568,0 -0.323211,0.032323 -0.614101,0.032323 -0.90499,0.096969 -0.09697,0.6787425 -0.161606,1.3898068 -0.193927,2.1008712 -0.129284,0 -0.226248,0.032323 -0.355532,0.064646 -0.03232,0 -0.06465,0 -0.09697,0.032323 -0.258568,0.064646 -0.517136,0.1939264 -0.775704,0.3232103 -0.226249,0.096969 -0.420175,0.1939264 -0.614102,0.3232114 -0.549458,-0.4524953 -1.066595,-0.87267 -1.616054,-1.3251654 0,0 0,0 -0.03232,-0.032323 C 10.022552,8.5357845 9.8932693,8.6327419 9.7963053,8.7297051 9.5700583,8.8913109 9.3761314,9.0852373 9.2145262,9.2791637 8.9236366,9.5377327 8.6973883,9.8609431 8.4388194,10.184155 c 0,0 0,0 0.032323,0 0.4201747,0.549459 0.87267,1.066596 1.325166,1.616054 -0.129285,0.193927 -0.258569,0.420175 -0.355533,0.614101 -0.129285,0.258569 -0.226248,0.549459 -0.2908894,0.808028 -0.064646,0.129284 -0.096969,0.258568 -0.096969,0.355531 -0.7110644,0.06465 -1.4221288,0.129285 -2.1008713,0.226248 -0.064646,0.323211 -0.096969,0.646422 -0.096969,1.001954 0,0.484816 0.032323,0.969632 0.1292839,1.422128 0.6787437,0.06465 1.3574862,0.129284 2.0685505,0.193926 0,0.129284 0.032323,0.258569 0.096969,0.355532 0.064646,0.29089 0.1616049,0.549459 0.2908899,0.840349 0.129284,0.226247 0.2262471,0.452495 0.387853,0.646421 -0.452496,0.549459 -0.9049912,1.066596 -1.3251647,1.616054 0.484816,0.678744 1.0665957,1.260523 1.7453387,1.74534 l 0,-0.03232 c 0.517137,-0.420175 1.066596,-0.87267 1.583733,-1.325166 l 0.03232,0 c 0.161605,0.09697 0.355532,0.193928 0.517136,0.290891 0.290891,0.129284 0.614101,0.258568 0.904991,0.32321 0.129284,0.03232 0.226248,0.06465 0.32321,0.09697 0.06465,0.678743 0.129285,1.389807 0.226249,2.100871 0.290889,0.03232 0.581779,0.06465 0.90499,0.06465 0.06465,0 0.258568,0 0.484817,0 0.355532,0 0.711064,-0.03232 1.066595,-0.09697 0.06465,-0.678742 0.129285,-1.389807 0.193926,-2.10087 0.09697,-0.03232 0.193927,-0.06465 0.29089,-0.09697 l 0,0 c 0.290891,-0.06464 0.549459,-0.161605 0.808028,-0.290889 0.226248,-0.09697 0.452495,-0.226248 0.678743,-0.387854 0,0.03232 0,0.03232 0.03232,0.03232 0.517137,0.452495 1.066596,0.904989 1.616054,1.325164 0.09697,-0.06465 0.193927,-0.129284 0.323212,-0.226247 0.193926,-0.161606 0.387852,-0.355532 0.549458,-0.549459 0.29089,-0.290889 0.58178,-0.614101 0.840348,-0.969633 -0.452495,-0.549459 -0.90499,-1.098917 -1.357486,-1.616054 0,-0.03232 0,-0.03232 0,-0.03232 0.09697,-0.161605 0.193927,-0.355531 0.29089,-0.549457 0.09696,-0.258569 0.226248,-0.517138 0.29089,-0.775707 0,-0.03232 0,-0.06465 0.03232,-0.06465 0,-0.129285 0.03232,-0.226248 0.06465,-0.290891 0.711065,-0.06465 1.422129,-0.129284 2.100872,-0.193926 0.06464,-0.323211 0.06464,-0.646422 0.09697,-0.969632 0,-0.09697 0,-0.193927 0,-0.29089 0,-0.06465 0,-0.161606 0,-0.258569 -0.03232,-0.323212 -0.03232,-0.646422 -0.09697,-0.969633 -0.678743,-0.06465 -1.389807,-0.129284 -2.100872,-0.193927 -0.03232,-0.09697 -0.06465,-0.193926 -0.06465,-0.290889 -0.09697,-0.29089 -0.193927,-0.58178 -0.323212,-0.872669 -0.09697,-0.193927 -0.226247,-0.420175 -0.32321,-0.614102 0.420173,-0.517136 0.872669,-1.066595 1.325164,-1.616054 z m -8.629731,2.682651 c 0.581779,-0.614101 1.292844,-0.904991 2.100871,-0.87267 0.840348,-0.03232 1.519091,0.258569 2.133192,0.87267 0.581779,0.581779 0.872669,1.292843 0.872669,2.10087 0,0.840348 -0.29089,1.519092 -0.872669,2.133192 -0.614101,0.58178 -1.292844,0.87267 -2.133192,0.87267 -0.808027,0 -1.519092,-0.29089 -2.100871,-0.87267 -0.581779,-0.6141 -0.872669,-1.292844 -0.872669,-2.133192 0,-0.808027 0.29089,-1.519091 0.872669,-2.10087 z"/>
4
+ <path class="normal" style="fill:#000000;" d="m 21.561187,10.184155 c 0,-0.03232 0,-0.03232 0,-0.03232 C 21.076371,9.5054099 20.494591,8.9559512 19.815848,8.4388133 l 0,0.032323 C 19.266389,8.891311 18.71693,9.3438064 18.199794,9.7963017 17.973545,9.6670167 17.779619,9.5700535 17.585693,9.4730903 17.327124,9.3438064 17.068556,9.2145213 16.777665,9.1498799 16.680695,9.1175569 16.583739,9.0852339 16.486775,9.0852339 16.422135,8.3741695 16.357491,7.6631063 16.260528,6.952042 15.937318,6.887396 15.614106,6.887396 15.258574,6.855073 c -0.09697,0 -0.193926,0 -0.258569,0 -0.09697,0 -0.193925,0 -0.258568,0 -0.323211,0.032323 -0.614101,0.032323 -0.90499,0.096969 -0.09697,0.6787425 -0.161606,1.3898068 -0.193927,2.1008712 -0.129284,0 -0.226248,0.032323 -0.355532,0.064646 -0.03232,0 -0.06465,0 -0.09697,0.032323 -0.258568,0.064646 -0.517136,0.1939264 -0.775704,0.3232103 -0.226249,0.096969 -0.420175,0.1939264 -0.614102,0.3232114 -0.549458,-0.4524953 -1.066595,-0.87267 -1.616054,-1.3251654 0,0 0,0 -0.03232,-0.032323 C 10.022552,8.5357845 9.8932693,8.6327419 9.7963053,8.7297051 9.5700583,8.8913109 9.3761314,9.0852373 9.2145262,9.2791637 8.9236366,9.5377327 8.6973883,9.8609431 8.4388194,10.184155 c 0,0 0,0 0.032323,0 0.4201747,0.549459 0.87267,1.066596 1.325166,1.616054 -0.129285,0.193927 -0.258569,0.420175 -0.355533,0.614101 -0.129285,0.258569 -0.226248,0.549459 -0.2908894,0.808028 -0.064646,0.129284 -0.096969,0.258568 -0.096969,0.355531 -0.7110644,0.06465 -1.4221288,0.129285 -2.1008713,0.226248 -0.064646,0.323211 -0.096969,0.646422 -0.096969,1.001954 0,0.484816 0.032323,0.969632 0.1292839,1.422128 0.6787437,0.06465 1.3574862,0.129284 2.0685505,0.193926 0,0.129284 0.032323,0.258569 0.096969,0.355532 0.064646,0.29089 0.1616049,0.549459 0.2908899,0.840349 0.129284,0.226247 0.2262471,0.452495 0.387853,0.646421 -0.452496,0.549459 -0.9049912,1.066596 -1.3251647,1.616054 0.484816,0.678744 1.0665957,1.260523 1.7453387,1.74534 l 0,-0.03232 c 0.517137,-0.420175 1.066596,-0.87267 1.583733,-1.325166 l 0.03232,0 c 0.161605,0.09697 0.355532,0.193928 0.517136,0.290891 0.290891,0.129284 0.614101,0.258568 0.904991,0.32321 0.129284,0.03232 0.226248,0.06465 0.32321,0.09697 0.06465,0.678743 0.129285,1.389807 0.226249,2.100871 0.290889,0.03232 0.581779,0.06465 0.90499,0.06465 0.06465,0 0.258568,0 0.484817,0 0.355532,0 0.711064,-0.03232 1.066595,-0.09697 0.06465,-0.678742 0.129285,-1.389807 0.193926,-2.10087 0.09697,-0.03232 0.193927,-0.06465 0.29089,-0.09697 l 0,0 c 0.290891,-0.06464 0.549459,-0.161605 0.808028,-0.290889 0.226248,-0.09697 0.452495,-0.226248 0.678743,-0.387854 0,0.03232 0,0.03232 0.03232,0.03232 0.517137,0.452495 1.066596,0.904989 1.616054,1.325164 0.09697,-0.06465 0.193927,-0.129284 0.323212,-0.226247 0.193926,-0.161606 0.387852,-0.355532 0.549458,-0.549459 0.29089,-0.290889 0.58178,-0.614101 0.840348,-0.969633 -0.452495,-0.549459 -0.90499,-1.098917 -1.357486,-1.616054 0,-0.03232 0,-0.03232 0,-0.03232 0.09697,-0.161605 0.193927,-0.355531 0.29089,-0.549457 0.09696,-0.258569 0.226248,-0.517138 0.29089,-0.775707 0,-0.03232 0,-0.06465 0.03232,-0.06465 0,-0.129285 0.03232,-0.226248 0.06465,-0.290891 0.711065,-0.06465 1.422129,-0.129284 2.100872,-0.193926 0.06464,-0.323211 0.06464,-0.646422 0.09697,-0.969632 0,-0.09697 0,-0.193927 0,-0.29089 0,-0.06465 0,-0.161606 0,-0.258569 -0.03232,-0.323212 -0.03232,-0.646422 -0.09697,-0.969633 -0.678743,-0.06465 -1.389807,-0.129284 -2.100872,-0.193927 -0.03232,-0.09697 -0.06465,-0.193926 -0.06465,-0.290889 -0.09697,-0.29089 -0.193927,-0.58178 -0.323212,-0.872669 -0.09697,-0.193927 -0.226247,-0.420175 -0.32321,-0.614102 0.420173,-0.517136 0.872669,-1.066595 1.325164,-1.616054 z m -8.629731,2.682651 c 0.581779,-0.614101 1.292844,-0.904991 2.100871,-0.87267 0.840348,-0.03232 1.519091,0.258569 2.133192,0.87267 0.581779,0.581779 0.872669,1.292843 0.872669,2.10087 0,0.840348 -0.29089,1.519092 -0.872669,2.133192 -0.614101,0.58178 -1.292844,0.87267 -2.133192,0.87267 -0.808027,0 -1.519092,-0.29089 -2.100871,-0.87267 -0.581779,-0.6141 -0.872669,-1.292844 -0.872669,-2.133192 0,-0.808027 0.29089,-1.519091 0.872669,-2.10087 z"/>
5
5
  </g>
6
- <circle cx="28" cy="27" r="9" class="cline rfill stand"/>
7
- <text transform="translate(28,31)" class="small">s</text>
6
+ <rect x="23" y="21" width="12" height="12" rx="2" class="cline rfill stand"/>
7
+ <text transform="translate(29,30.75)" class="small">s</text>
8
8
  </svg>
data/cockpit/themes/preset/symbols/callmanipulate_sensor.svg ADDED
@@ -0,0 +1,11 @@
1
+ <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
2
+ <path class="cline stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
3
+ <path class="cline stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>
4
+ <circle cx="27" cy="3" r="2" class="cfill cline rfill normal"/>
5
+ <g class="replace">
6
+ <rect x="1" y="1" width="28" height="28" rx="4" class="cline hfill rfill stand"/>
7
+ <path class="normal" style="fill:#000000;" d="m 21.561187,10.184155 c 0,-0.03232 0,-0.03232 0,-0.03232 C 21.076371,9.5054099 20.494591,8.9559512 19.815848,8.4388133 l 0,0.032323 C 19.266389,8.891311 18.71693,9.3438064 18.199794,9.7963017 17.973545,9.6670167 17.779619,9.5700535 17.585693,9.4730903 17.327124,9.3438064 17.068556,9.2145213 16.777665,9.1498799 16.680695,9.1175569 16.583739,9.0852339 16.486775,9.0852339 16.422135,8.3741695 16.357491,7.6631063 16.260528,6.952042 15.937318,6.887396 15.614106,6.887396 15.258574,6.855073 c -0.09697,0 -0.193926,0 -0.258569,0 -0.09697,0 -0.193925,0 -0.258568,0 -0.323211,0.032323 -0.614101,0.032323 -0.90499,0.096969 -0.09697,0.6787425 -0.161606,1.3898068 -0.193927,2.1008712 -0.129284,0 -0.226248,0.032323 -0.355532,0.064646 -0.03232,0 -0.06465,0 -0.09697,0.032323 -0.258568,0.064646 -0.517136,0.1939264 -0.775704,0.3232103 -0.226249,0.096969 -0.420175,0.1939264 -0.614102,0.3232114 -0.549458,-0.4524953 -1.066595,-0.87267 -1.616054,-1.3251654 0,0 0,0 -0.03232,-0.032323 C 10.022552,8.5357845 9.8932693,8.6327419 9.7963053,8.7297051 9.5700583,8.8913109 9.3761314,9.0852373 9.2145262,9.2791637 8.9236366,9.5377327 8.6973883,9.8609431 8.4388194,10.184155 c 0,0 0,0 0.032323,0 0.4201747,0.549459 0.87267,1.066596 1.325166,1.616054 -0.129285,0.193927 -0.258569,0.420175 -0.355533,0.614101 -0.129285,0.258569 -0.226248,0.549459 -0.2908894,0.808028 -0.064646,0.129284 -0.096969,0.258568 -0.096969,0.355531 -0.7110644,0.06465 -1.4221288,0.129285 -2.1008713,0.226248 -0.064646,0.323211 -0.096969,0.646422 -0.096969,1.001954 0,0.484816 0.032323,0.969632 0.1292839,1.422128 0.6787437,0.06465 1.3574862,0.129284 2.0685505,0.193926 0,0.129284 0.032323,0.258569 0.096969,0.355532 0.064646,0.29089 0.1616049,0.549459 0.2908899,0.840349 0.129284,0.226247 0.2262471,0.452495 0.387853,0.646421 -0.452496,0.549459 -0.9049912,1.066596 -1.3251647,1.616054 0.484816,0.678744 1.0665957,1.260523 1.7453387,1.74534 l 0,-0.03232 c 0.517137,-0.420175 1.066596,-0.87267 1.583733,-1.325166 l 0.03232,0 c 0.161605,0.09697 0.355532,0.193928 0.517136,0.290891 0.290891,0.129284 0.614101,0.258568 0.904991,0.32321 0.129284,0.03232 0.226248,0.06465 0.32321,0.09697 0.06465,0.678743 0.129285,1.389807 0.226249,2.100871 0.290889,0.03232 0.581779,0.06465 0.90499,0.06465 0.06465,0 0.258568,0 0.484817,0 0.355532,0 0.711064,-0.03232 1.066595,-0.09697 0.06465,-0.678742 0.129285,-1.389807 0.193926,-2.10087 0.09697,-0.03232 0.193927,-0.06465 0.29089,-0.09697 l 0,0 c 0.290891,-0.06464 0.549459,-0.161605 0.808028,-0.290889 0.226248,-0.09697 0.452495,-0.226248 0.678743,-0.387854 0,0.03232 0,0.03232 0.03232,0.03232 0.517137,0.452495 1.066596,0.904989 1.616054,1.325164 0.09697,-0.06465 0.193927,-0.129284 0.323212,-0.226247 0.193926,-0.161606 0.387852,-0.355532 0.549458,-0.549459 0.29089,-0.290889 0.58178,-0.614101 0.840348,-0.969633 -0.452495,-0.549459 -0.90499,-1.098917 -1.357486,-1.616054 0,-0.03232 0,-0.03232 0,-0.03232 0.09697,-0.161605 0.193927,-0.355531 0.29089,-0.549457 0.09696,-0.258569 0.226248,-0.517138 0.29089,-0.775707 0,-0.03232 0,-0.06465 0.03232,-0.06465 0,-0.129285 0.03232,-0.226248 0.06465,-0.290891 0.711065,-0.06465 1.422129,-0.129284 2.100872,-0.193926 0.06464,-0.323211 0.06464,-0.646422 0.09697,-0.969632 0,-0.09697 0,-0.193927 0,-0.29089 0,-0.06465 0,-0.161606 0,-0.258569 -0.03232,-0.323212 -0.03232,-0.646422 -0.09697,-0.969633 -0.678743,-0.06465 -1.389807,-0.129284 -2.100872,-0.193927 -0.03232,-0.09697 -0.06465,-0.193926 -0.06465,-0.290889 -0.09697,-0.29089 -0.193927,-0.58178 -0.323212,-0.872669 -0.09697,-0.193927 -0.226247,-0.420175 -0.32321,-0.614102 0.420173,-0.517136 0.872669,-1.066595 1.325164,-1.616054 z m -8.629731,2.682651 c 0.581779,-0.614101 1.292844,-0.904991 2.100871,-0.87267 0.840348,-0.03232 1.519091,0.258569 2.133192,0.87267 0.581779,0.581779 0.872669,1.292843 0.872669,2.10087 0,0.840348 -0.29089,1.519092 -0.872669,2.133192 -0.614101,0.58178 -1.292844,0.87267 -2.133192,0.87267 -0.808027,0 -1.519092,-0.29089 -2.100871,-0.87267 -0.581779,-0.6141 -0.872669,-1.292844 -0.872669,-2.133192 0,-0.808027 0.29089,-1.519091 0.872669,-2.10087 z"/>
8
+ </g>
9
+ <rect x="23" y="21" width="12" height="12" rx="2" class="cline rfill stand"/>
10
+ <text transform="translate(29,30.75)" class="small">s</text>
11
+ </svg>
data/cockpit/themes/preset/theme.js CHANGED
@@ -311,10 +311,18 @@ function WFAdaptorManifestation(adaptor) {
311
311
  },
312
312
  'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
313
313
  'resolve_symbol': function(node) {
314
- if($('> code', node).length > 0) {
315
- return 'callmanipulate';
314
+ if ($('> annotations > _context_data_analysis > probes > probe', node).length > 0) {
315
+ if ($('> code', node).length > 0) {
316
+ return 'callmanipulate_sensor';
317
+ } else {
318
+ return 'call_sensor';
319
+ }
316
320
  } else {
317
- return 'call';
321
+ if ($('> code', node).length > 0) {
322
+ return 'callmanipulate';
323
+ } else {
324
+ return 'call';
325
+ }
318
326
  }
319
327
  },
320
328
  'svg': self.adaptor.theme_dir + 'symbols/call.svg'
@@ -1242,13 +1250,25 @@ function WFAdaptorManifestation(adaptor) {
1242
1250
  // Abstract Elements
1243
1251
  // * they may only have an illustrator (or other parts)
1244
1252
  // * they HAVE TO have a parent
1253
+ this.elements.call_sensor = { /*{{{*/
1254
+ 'parent': 'call',
1255
+ 'illustrator': {//{{{
1256
+ 'svg': self.adaptor.theme_dir + 'symbols/call_sensor.svg'
1257
+ }//}}}
1258
+ }; /*}}}*/
1245
1259
  this.elements.callmanipulate = { /*{{{*/
1246
1260
  'parent': 'call',
1247
1261
  'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
1248
1262
  'illustrator': {//{{{
1249
- 'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
1250
1263
  'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
1251
- },//}}}
1264
+ }//}}}
1265
+ }; /*}}}*/
1266
+ this.elements.callmanipulate_sensor = { /*{{{*/
1267
+ 'parent': 'call',
1268
+ 'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
1269
+ 'illustrator': {//{{{
1270
+ 'svg': self.adaptor.theme_dir + 'symbols/callmanipulate_sensor.svg'
1271
+ }//}}}
1252
1272
  }; /*}}}*/
1253
1273
  this.elements.loop_head = { /*{{{*/
1254
1274
  'parent': 'loop',
data/cpee.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "2.1.35"
3
+ s.version = "2.1.36"
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."
data/lib/cpee/implementation.rb CHANGED
@@ -54,6 +54,8 @@ module CPEE
54
54
  /p:properties/p:attributes/p:*
55
55
  }
56
56
  def self::implementation(opts)
57
+ opts[:see_instances] ||= opts[:see_instances].nil? ? true : opts[:see_instances]
58
+
57
59
  opts[:instances] ||= File.expand_path(File.join(__dir__,'..','..','server','instances'))
58
60
  opts[:global_executionhandlers] ||= File.expand_path(File.join(__dir__,'..','..','server','executionhandlers'))
59
61
  opts[:executionhandlers] ||= ''
@@ -230,16 +232,21 @@ module CPEE
230
232
  class Instances < Riddl::Implementation #{{{
231
233
  def response
232
234
  opts = @a[0]
233
- Riddl::Parameter::Complex.new("wis","text/xml") do
234
- ins = XML::Smart::string('<instances/>')
235
- CPEE::Persistence::each_object(opts) do |instance|
236
- info = CPEE::Persistence::extract_item(instance,opts,'attributes/info')
237
- uuid = CPEE::Persistence::extract_item(instance,opts,'attributes/uuid')
238
- state = CPEE::Persistence::extract_item(instance,opts,'state')
239
- state_changed = CPEE::Persistence::extract_item(instance,opts,'state/@changed')
240
- ins.root.add('instance', info, 'uuid' => uuid, 'id' => instance, 'state' => state, 'state_changed' => state_changed )
235
+ pp @request[:env]['REMOTE_ADDR']
236
+ if opts[:see_instances] || @h['SEE_INSTANCES'] == 'true'
237
+ Riddl::Parameter::Complex.new("wis","text/xml") do
238
+ ins = XML::Smart::string('<instances/>')
239
+ CPEE::Persistence::each_object(opts) do |instance|
240
+ info = CPEE::Persistence::extract_item(instance,opts,'attributes/info')
241
+ uuid = CPEE::Persistence::extract_item(instance,opts,'attributes/uuid')
242
+ state = CPEE::Persistence::extract_item(instance,opts,'state')
243
+ state_changed = CPEE::Persistence::extract_item(instance,opts,'state/@changed')
244
+ ins.root.add('instance', info, 'uuid' => uuid, 'id' => instance, 'state' => state, 'state_changed' => state_changed )
245
+ end
246
+ ins.to_s
241
247
  end
242
- ins.to_s
248
+ else
249
+ Riddl::Parameter::Complex.new("wis","text/xml",'<instances><!-- instances list disabled. --></instances>')
243
250
  end
244
251
  end
245
252
  end #}}}
@@ -356,11 +363,15 @@ module CPEE
356
363
  CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,content[:attributes]['uuid'],content[:attributes]['info'],content,redis)
357
364
  end
358
365
 
359
- empt = CPEE::Persistence::keys(id,opts).to_a
360
- empt.delete_if{|e| e =~ /\/handlers/ }
361
- redis.multi do |multi|
362
- multi.del empt
363
- multi.zrem 'instances', id
366
+ EM::add_timer(30) do
367
+ empt = CPEE::Persistence::keys(id,opts).to_a
368
+ ### is there to avoid that returning calls get intro problems
369
+ ### as we have add_timer now, it should work without this
370
+ # empt.delete_if{|e| e =~ /\/handlers/ }
371
+ redis.multi do |multi|
372
+ multi.del empt
373
+ multi.zrem 'instances', id
374
+ end
364
375
  end
365
376
  end
366
377
  end #}}}