cpee 1.3.228 → 1.3.230

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/css/wfadaptor.css +11 -0
  3. data/cockpit/graph.html +2 -1
  4. data/cockpit/index.html +1 -1
  5. data/cockpit/js/instance.js +50 -56
  6. data/cockpit/js/ui.js +2 -0
  7. data/cockpit/js/wfadaptor.js +21 -9
  8. data/cockpit/themes/compact/theme.js +12 -71
  9. data/cockpit/themes/default/rngs/choose.rng +4 -0
  10. data/cockpit/themes/default/rngs/parallel.rng +8 -0
  11. data/cockpit/themes/default/rngs/stop.rng +5 -0
  12. data/cockpit/themes/default/rngs/terminate.rng +1 -0
  13. data/cockpit/themes/default/symbols/stop.svg +5 -0
  14. data/cockpit/themes/default/symbols/terminate.svg +4 -0
  15. data/cockpit/themes/default/theme.js +104 -3
  16. data/cpee.gemspec +1 -1
  17. data/lib/cpee/instantiation.rb +116 -56
  18. data/lib/instantiation.xml +55 -15
  19. data/log/log.xml +1 -15
  20. data/log/template.xes_xml +23 -0
  21. data/log/template.xes_yaml +26 -0
  22. data/log/{server.rb → xes_xml.rb} +11 -42
  23. data/log/xes_yaml.rb +111 -0
  24. data/server/handlerwrappers/default.rb +19 -10
  25. data/server/resources/properties.schema.active +18 -17
  26. data/server/resources/properties.schema.finished +18 -17
  27. data/server/resources/properties.schema.inactive +18 -17
  28. data/server/resources/transformation_dslx.xsl +29 -5
  29. data/server/server.rb +1 -1
  30. data/tools/instantiation/instantiation +1 -1
  31. data/tools/server/server.rb +1 -1
  32. metadata +10 -19
  33. data/cockpit/themes/default/rngs/callmanipulateworkqueue.rng +0 -122
  34. data/cockpit/themes/default/rngs/callworkqueue.rng +0 -107
  35. data/cockpit/themes/default/symbols/callcorrelationreceive.svg +0 -6
  36. data/cockpit/themes/default/symbols/callcorrelationsend.svg +0 -6
  37. data/cockpit/themes/default/symbols/callinstantiation.svg +0 -3
  38. data/cockpit/themes/default/symbols/callmanipulateworklist.svg +0 -6
  39. data/cockpit/themes/default/symbols/callmanipulateworkqueue.svg +0 -6
  40. data/cockpit/themes/default/symbols/callworklist.svg +0 -4
  41. data/cockpit/themes/default/symbols/callworkqueue.svg +0 -4
  42. data/log/logoverlay.xml +0 -10
  43. data/log/template.xes +0 -6
  44. data/log/yaml/log.xml +0 -27
  45. data/log/yaml/logoverlay.xml +0 -10
  46. data/log/yaml/server.rb +0 -128
  47. data/log/yaml/topics.xml +0 -22
  48. data/log/yaml/yaml.rb +0 -19
data/server/resources/properties.schema.finished CHANGED
@@ -18,12 +18,12 @@
18
18
  <attributes type="complex" modifiable="false" mutable="false">
19
19
  <zeroOrMore>
20
20
  <element><anyName/><text/></element>
21
- </zeroOrMore>
22
- </attributes>
21
+ </zeroOrMore>
22
+ </attributes>
23
23
  <handlerwrapper type="simple" modifiable="false" mutable="false">
24
24
  <data type="string">
25
25
  <param name="pattern">[A-Z][a-zA-Z]*</param>
26
- </data>
26
+ </data>
27
27
  </handlerwrapper>
28
28
  <dsl type="simple" modifiable="false" mutable="false">
29
29
  <text/>
@@ -39,7 +39,7 @@
39
39
  <value>xslt</value>
40
40
  <value>clean</value>
41
41
  <value>none</value>
42
- </choice>
42
+ </choice>
43
43
  </attribute>
44
44
  <data type="anyURI"/>
45
45
  </element>
@@ -50,7 +50,7 @@
50
50
  <value>xslt</value>
51
51
  <value>clean</value>
52
52
  <value>none</value>
53
- </choice>
53
+ </choice>
54
54
  </attribute>
55
55
  <data type="anyURI"/>
56
56
  </element>
@@ -61,7 +61,7 @@
61
61
  <value>xslt</value>
62
62
  <value>clean</value>
63
63
  <value>none</value>
64
- </choice>
64
+ </choice>
65
65
  </attribute>
66
66
  <data type="anyURI"/>
67
67
  </element>
@@ -71,9 +71,10 @@
71
71
  <ready putable="true"/>
72
72
  <running putable="true"/>
73
73
  <simulating putable="true"/>
74
- </ready>
74
+ </ready>
75
75
  <running>
76
76
  <stopping putable="true"/>
77
+ <finishing putable="false"/>
77
78
  <finished putable="false"/>
78
79
  </running>
79
80
  <simulating>
@@ -87,9 +88,9 @@
87
88
  <stopped putable="true"/>
88
89
  <running putable="true"/>
89
90
  <simulating putable="true"/>
90
- </stopped>
91
+ </stopped>
91
92
  <finished/>
92
- </state>
93
+ </state>
93
94
  <status type="complex" modifiable="false" mutable="false">
94
95
  <optional>
95
96
  <element name='id'>
@@ -98,26 +99,26 @@
98
99
  <element name='message'>
99
100
  <data type="string"/>
100
101
  </element>
101
- </optional>
102
- </status>
102
+ </optional>
103
+ </status>
103
104
  <positions type="complex" modifiable="false" mutable="false">
104
105
  <zeroOrMore>
105
106
  <element>
106
107
  <anyName/>
107
108
  <data type="string">
108
109
  <param name="pattern">(at|after)(;[A-Za-z0-9]+)?</param>
109
- </data>
110
+ </data>
110
111
  </element>
111
- </zeroOrMore>
112
- </positions>
112
+ </zeroOrMore>
113
+ </positions>
113
114
  <dataelements type="complex" modifiable="false" mutable="false">
114
115
  <zeroOrMore>
115
116
  <element><anyName/><text/></element>
116
- </zeroOrMore>
117
- </dataelements>
117
+ </zeroOrMore>
118
+ </dataelements>
118
119
  <endpoints type="complex" modifiable="false" mutable="false">
119
120
  <zeroOrMore>
120
121
  <element><anyName/><text/></element>
121
- </zeroOrMore>
122
+ </zeroOrMore>
122
123
  </endpoints>
123
124
  </properties>
data/server/resources/properties.schema.inactive CHANGED
@@ -18,12 +18,12 @@
18
18
  <attributes type="complex" modifiable="true">
19
19
  <zeroOrMore>
20
20
  <element><anyName/><text/></element>
21
- </zeroOrMore>
22
- </attributes>
21
+ </zeroOrMore>
22
+ </attributes>
23
23
  <handlerwrapper type="simple" modifiable="true">
24
24
  <data type="string">
25
25
  <param name="pattern">[A-Z][a-zA-Z]*</param>
26
- </data>
26
+ </data>
27
27
  </handlerwrapper>
28
28
  <dsl type="simple" modifiable="false" mutable="false">
29
29
  <text/>
@@ -39,7 +39,7 @@
39
39
  <value>xslt</value>
40
40
  <value>clean</value>
41
41
  <value>none</value>
42
- </choice>
42
+ </choice>
43
43
  </attribute>
44
44
  <data type="anyURI"/>
45
45
  </element>
@@ -50,7 +50,7 @@
50
50
  <value>xslt</value>
51
51
  <value>clean</value>
52
52
  <value>none</value>
53
- </choice>
53
+ </choice>
54
54
  </attribute>
55
55
  <data type="anyURI"/>
56
56
  </element>
@@ -61,7 +61,7 @@
61
61
  <value>xslt</value>
62
62
  <value>clean</value>
63
63
  <value>none</value>
64
- </choice>
64
+ </choice>
65
65
  </attribute>
66
66
  <data type="anyURI"/>
67
67
  </element>
@@ -71,9 +71,10 @@
71
71
  <running putable="true"/>
72
72
  <ready putable="true"/>
73
73
  <simulating putable="true"/>
74
- </ready>
74
+ </ready>
75
75
  <running>
76
76
  <stopping putable="true"/>
77
+ <finishing putable="false"/>
77
78
  <finished putable="false"/>
78
79
  </running>
79
80
  <simulating>
@@ -87,9 +88,9 @@
87
88
  <stopped putable="true"/>
88
89
  <running putable="true"/>
89
90
  <simulating putable="true"/>
90
- </stopped>
91
+ </stopped>
91
92
  <finished/>
92
- </state>
93
+ </state>
93
94
  <status type="complex" modifiable="false" mutable="false">
94
95
  <optional>
95
96
  <element name='id'>
@@ -98,26 +99,26 @@
98
99
  <element name='message'>
99
100
  <data type="string"/>
100
101
  </element>
101
- </optional>
102
- </status>
102
+ </optional>
103
+ </status>
103
104
  <positions type="complex" modifiable="true">
104
105
  <zeroOrMore>
105
106
  <element>
106
107
  <anyName/>
107
108
  <data type="string">
108
109
  <param name="pattern">(at|after)(;[A-Za-z0-9]+)?</param>
109
- </data>
110
+ </data>
110
111
  </element>
111
- </zeroOrMore>
112
- </positions>
112
+ </zeroOrMore>
113
+ </positions>
113
114
  <dataelements type="complex" modifiable="true">
114
115
  <zeroOrMore>
115
116
  <element><anyName/><text/></element>
116
- </zeroOrMore>
117
- </dataelements>
117
+ </zeroOrMore>
118
+ </dataelements>
118
119
  <endpoints type="complex" modifiable="true">
119
120
  <zeroOrMore>
120
121
  <element><anyName/><text/></element>
121
- </zeroOrMore>
122
+ </zeroOrMore>
122
123
  </endpoints>
123
124
  </properties>
data/server/resources/transformation_dslx.xsl CHANGED
@@ -68,6 +68,11 @@
68
68
  <xsl:call-template name="print-newline"/>
69
69
  </xsl:if>
70
70
  <xsl:if test="name()='manipulate'">
71
+ <xsl:if test="@label">
72
+ <xsl:text>, { :label => "</xsl:text>
73
+ <xsl:value-of select="@label"/>
74
+ <xsl:text>" }</xsl:text>
75
+ </xsl:if>
71
76
  <xsl:call-template name="print-mcontent">
72
77
  <xsl:with-param name="myspace">
73
78
  <xsl:value-of select="$myspace"/>
@@ -75,6 +80,15 @@
75
80
  </xsl:call-template>
76
81
  <xsl:call-template name="print-newline"/>
77
82
  </xsl:if>
83
+ <xsl:if test="name()='terminate'">
84
+ <xsl:text>terminate</xsl:text>
85
+ <xsl:call-template name="print-newline"/>
86
+ </xsl:if>
87
+ <xsl:if test="name()='stop'">
88
+ <xsl:text>stop :</xsl:text>
89
+ <xsl:value-of select="@id"/>
90
+ <xsl:call-template name="print-newline"/>
91
+ </xsl:if>
78
92
  <xsl:if test="name()='escape'">
79
93
  <xsl:text>escape</xsl:text>
80
94
  <xsl:call-template name="print-newline"/>
@@ -377,9 +391,19 @@
377
391
  <xsl:text>nil</xsl:text>
378
392
  </xsl:when>
379
393
  <xsl:when test="child::node()[not(self::text())]">
380
- <xsl:text>"[ </xsl:text>
381
- <xsl:apply-templates select="*" mode="JSON"/>
382
- <xsl:text>]"</xsl:text>
394
+ <!-- FUUUU, there is probably much more TODO -->
395
+ <xsl:choose>
396
+ <xsl:when test="child::*/child::* and count(child::*[not(name()=name(../child::*[1]))])=0">
397
+ <xsl:text>"[ </xsl:text>
398
+ <xsl:apply-templates select="*" mode="JSON"/>
399
+ <xsl:text>]"</xsl:text>
400
+ </xsl:when>
401
+ <xsl:otherwise>
402
+ <xsl:text>"{ </xsl:text>
403
+ <xsl:apply-templates select="*" mode="JSONSUB"/>
404
+ <xsl:text>}"</xsl:text>
405
+ </xsl:otherwise>
406
+ </xsl:choose>
383
407
  </xsl:when>
384
408
  <xsl:otherwise>
385
409
  <xsl:choose>
@@ -563,7 +587,7 @@
563
587
  <xsl:text>[ </xsl:text>
564
588
  </xsl:if>
565
589
  <xsl:text>{ </xsl:text>
566
- <xsl:apply-templates select="@*" mode="JSON"/>
590
+ <xsl:apply-templates select="@*" mode="JSONSUB"/>
567
591
  <xsl:apply-templates select="*" mode="JSONSUB"/>
568
592
  <xsl:text>}</xsl:text>
569
593
  <xsl:if test="text()[normalize-space(.)]">
@@ -578,7 +602,7 @@
578
602
  </xsl:template>
579
603
 
580
604
  <!-- JSON Attribute Property -->
581
- <xsl:template match="@*" mode="JSON">
605
+ <xsl:template match="@*" mode="JSONSUB">
582
606
  <xsl:text>\"@</xsl:text>
583
607
  <xsl:value-of select="name()"/>
584
608
  <xsl:text>\": </xsl:text>
data/server/server.rb CHANGED
@@ -18,7 +18,7 @@ require 'rubygems'
18
18
  gem 'nokogiri'
19
19
  require File.expand_path(File.dirname(__FILE__) + '/../lib/cpee/implementation')
20
20
 
21
- Riddl::Server.new(CPEE::SERVER, :port => 9298) do
21
+ Riddl::Server.new(CPEE::SERVER, :port => 8298) do
22
22
  accessible_description true
23
23
  cross_site_xhr true
24
24
 
data/tools/instantiation/instantiation CHANGED
@@ -17,7 +17,7 @@ Riddl::Server.new(CPEE::Instantiation::SERVER, options) do
17
17
  accessible_description true
18
18
  cross_site_xhr true
19
19
 
20
- @riddl_opts[:cpee] ||= 'http://localhost:9298/'
20
+ @riddl_opts[:cpee] ||= 'http://localhost:8298/'
21
21
 
22
22
  use CPEE::Instantiation::implementation(@riddl_opts)
23
23
  end.loop!
data/tools/server/server.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  require 'rubygems'
3
3
  require 'cpee/implementation'
4
4
 
5
- Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 9298) do
5
+ Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 8298) do
6
6
  @riddl_opts[:instances] = ::File.dirname(__FILE__) + '/instances'
7
7
  @riddl_opts[:handlerwrappers] = ::File.dirname(__FILE__) + '/handlerwrappers'
8
8
  @riddl_opts[:notifications_init] = ::File.dirname(__FILE__) + '/resources/notifications'
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.228
4
+ version: 1.3.230
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-03-08 00:00:00.000000000 Z
14
+ date: 2018-03-29 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: riddl
@@ -157,8 +157,6 @@ files:
157
157
  - cockpit/themes/default/rngs/alternative.rng
158
158
  - cockpit/themes/default/rngs/call.rng
159
159
  - cockpit/themes/default/rngs/callmanipulate.rng
160
- - cockpit/themes/default/rngs/callmanipulateworkqueue.rng
161
- - cockpit/themes/default/rngs/callworkqueue.rng
162
160
  - cockpit/themes/default/rngs/choose.rng
163
161
  - cockpit/themes/default/rngs/critical.rng
164
162
  - cockpit/themes/default/rngs/escape.rng
@@ -169,18 +167,13 @@ files:
169
167
  - cockpit/themes/default/rngs/otherwise.rng
170
168
  - cockpit/themes/default/rngs/parallel.rng
171
169
  - cockpit/themes/default/rngs/parallel_branch.rng
170
+ - cockpit/themes/default/rngs/stop.rng
171
+ - cockpit/themes/default/rngs/terminate.rng
172
172
  - cockpit/themes/default/rngs/update.rng
173
173
  - cockpit/themes/default/symbols/alternative.svg
174
174
  - cockpit/themes/default/symbols/arrow.svg
175
175
  - cockpit/themes/default/symbols/call.svg
176
- - cockpit/themes/default/symbols/callcorrelationreceive.svg
177
- - cockpit/themes/default/symbols/callcorrelationsend.svg
178
- - cockpit/themes/default/symbols/callinstantiation.svg
179
176
  - cockpit/themes/default/symbols/callmanipulate.svg
180
- - cockpit/themes/default/symbols/callmanipulateworklist.svg
181
- - cockpit/themes/default/symbols/callmanipulateworkqueue.svg
182
- - cockpit/themes/default/symbols/callworklist.svg
183
- - cockpit/themes/default/symbols/callworkqueue.svg
184
177
  - cockpit/themes/default/symbols/choose.svg
185
178
  - cockpit/themes/default/symbols/choose_exclusive.svg
186
179
  - cockpit/themes/default/symbols/choose_inclusive.svg
@@ -193,6 +186,8 @@ files:
193
186
  - cockpit/themes/default/symbols/parallel_branch.svg
194
187
  - cockpit/themes/default/symbols/scripts.svg
195
188
  - cockpit/themes/default/symbols/start.svg
189
+ - cockpit/themes/default/symbols/stop.svg
190
+ - cockpit/themes/default/symbols/terminate.svg
196
191
  - cockpit/themes/default/theme.js
197
192
  - cockpit/themes/lego/rngs/alternative.rng
198
193
  - cockpit/themes/lego/rngs/call.rng
@@ -280,17 +275,13 @@ files:
280
275
  - lib/instantiation.xml
281
276
  - log/chain.xml
282
277
  - log/log.xml
283
- - log/logoverlay.xml
284
278
  - log/logs/1/test
285
279
  - log/non_tamp.rb
286
- - log/server.rb
287
- - log/template.xes
280
+ - log/template.xes_xml
281
+ - log/template.xes_yaml
288
282
  - log/topics.xml
289
- - log/yaml/log.xml
290
- - log/yaml/logoverlay.xml
291
- - log/yaml/server.rb
292
- - log/yaml/topics.xml
293
- - log/yaml/yaml.rb
283
+ - log/xes_xml.rb
284
+ - log/xes_yaml.rb
294
285
  - server/handlerwrappers/default.rb
295
286
  - server/handlerwrappers/soap.rb
296
287
  - server/instances/1/properties.xml
data/cockpit/themes/default/rngs/callmanipulateworkqueue.rng DELETED
@@ -1,122 +0,0 @@
1
- <element rngui:version="1.2" name="call" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
2
- <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
3
- <data type="string" rngui:readonly="true"/>
4
- </attribute>
5
- <attribute name="endpoint" rngui:label="Endpoint">
6
- <data type="string"/>
7
- </attribute>
8
- <element name='parameters' rngui:header="Parameters">
9
- <element name="label" rngui:label="Label">
10
- <data type="string" rngui:label="Short description of the task"/>
11
- </element>
12
- <element name="method" rngui:label="Method">
13
- <choice>
14
- <value>:post</value>
15
- <value>:get</value>
16
- <value>:put</value>
17
- <value>:delete</value>
18
- </choice>
19
- </element>
20
- <element name="arguments" rngui:header="Arguments">
21
- <element name="nc-program" rngui:label="NC Program">
22
- <data type="string" rngui:label="Unique ID of the NC Program"/>
23
- </element>
24
- <element name="material-name" rngui:label="Material Name">
25
- <data type="string" rngui:label="Name of the raw material"/>
26
- </element>
27
- <element name="material-pic" rngui:label="Material Picture">
28
- <data type="string" rngui:label="Picture of the raw material"/>
29
- </element>
30
- <element name="result-pic" rngui:label="Result Picture">
31
- <data type="string" rngui:label="Picture of the result"/>
32
- </element>
33
- <element name="comment" rngui:label="Comment">
34
- <text rngui:wrap='true' rngui:label='Additional comments for the operator'/>
35
- </element>
36
- <element name="tools" rngui:header="Tools">
37
- <zeroOrMore rngui:label="Add Tool">
38
- <element name="tool">
39
- <element name="place" rngui:label="Position">
40
- <data type="integer" rngui:label="Position in Tool Magazine"/>
41
- </element>
42
- <element name="tool-name" rngui:label="Tool">
43
- <data type="string" rngui:label="Name of Tool"/>
44
- </element>
45
- <element name="tool-holder" rngui:label="Holder">
46
- <data type="string" rngui:label="Name of Tool Holder"/>
47
- </element>
48
- <element name="tool-orientation" rngui:label="Orientation">
49
- <data type="string" rngui:label="Orientation in Tool Holder"/>
50
- </element>
51
- <element name="corrections" rngui:header="Corrections">
52
- <zeroOrMore rngui:label="Add Correction">
53
- <element name="correction">
54
- <attribute name="length-x" rngui:label="Length X">
55
- <data type="float"/>
56
- </attribute>
57
- <attribute name="length-z" rngui:label="Length Y">
58
- <data type="float"/>
59
- </attribute>
60
- <attribute name="radius" rngui:label="Radius">
61
- <data type="float"/>
62
- </attribute>
63
- </element>
64
- </zeroOrMore>
65
- </element>
66
- <element name="attachments" rngui:header="Attachments">
67
- <zeroOrMore rngui:label="Add Attachment">
68
- <element name="attachment" rngui:label="URL">
69
- <attribute name="label" rngui:label="Label">
70
- <data type="string" rngui:label="Label"/>
71
- </attribute>
72
- <data type="string" rngui:label="URL"/>
73
- </element>
74
- </zeroOrMore>
75
- </element>
76
- </element>
77
- </zeroOrMore>
78
- </element>
79
- </element>
80
- </element>
81
- <element name="finalize" rngui:header="Finalize" rngui:label="Code">
82
- <attribute name="output" rngui:label="Access Variable" rngui:default="result">
83
- <data type="string" rngui:readonly="true"/>
84
- </attribute>
85
- <text rngui:label='Script that is executed, when a service returns data'/>
86
- </element>
87
- <element name="update" rngui:header="Update" rngui:label="Code">
88
- <attribute name="output" rngui:label="Access Variable" rngui:default="result">
89
- <data type="string" rngui:readonly="true"/>
90
- </attribute>
91
- <text rngui:label='Script that is executed, when a service sends intermediate data'/>
92
- </element>
93
- <element name="_timing" rngui:header="Timing">
94
- <element name="_timing_min" rngui:label='Min in m'>
95
- <data type='float' rngui:label='Minutes'/>
96
- </element>
97
- <element name="_timing_max" rngui:label='Max in m'>
98
- <data type='float' rngui:label='Minutes'/>
99
- </element>
100
- <element name="_timing_avg" rngui:label='Avg in m'>
101
- <data type='float' rngui:label='Minutes'/>
102
- </element>
103
- </element>
104
- <element name="_notes" rngui:header="Notes">
105
- <element name="_notes_general" rngui:label='General'>
106
- <text rngui:wrap='true' rngui:label='Notes'/>
107
- </element>
108
- <element name="_notes_output" rngui:label='Output'>
109
- <text rngui:wrap='true' rngui:label='Notes'/>
110
- </element>
111
- <element name="_attachments">
112
- <zeroOrMore rngui:label="Create Attachment">
113
- <element name='_attachment' rngui:label='Attachment'>
114
- <attribute name="label" rngui:label="Note">
115
- <data type="string"/>
116
- </attribute>
117
- <data type="string" rngui:label="Url"/>
118
- </element>
119
- </zeroOrMore>
120
- </element>
121
- </element>
122
- </element>