cpee 1.3.228 → 1.3.230
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/css/wfadaptor.css +11 -0
- data/cockpit/graph.html +2 -1
- data/cockpit/index.html +1 -1
- data/cockpit/js/instance.js +50 -56
- data/cockpit/js/ui.js +2 -0
- data/cockpit/js/wfadaptor.js +21 -9
- data/cockpit/themes/compact/theme.js +12 -71
- data/cockpit/themes/default/rngs/choose.rng +4 -0
- data/cockpit/themes/default/rngs/parallel.rng +8 -0
- data/cockpit/themes/default/rngs/stop.rng +5 -0
- data/cockpit/themes/default/rngs/terminate.rng +1 -0
- data/cockpit/themes/default/symbols/stop.svg +5 -0
- data/cockpit/themes/default/symbols/terminate.svg +4 -0
- data/cockpit/themes/default/theme.js +104 -3
- data/cpee.gemspec +1 -1
- data/lib/cpee/instantiation.rb +116 -56
- data/lib/instantiation.xml +55 -15
- data/log/log.xml +1 -15
- data/log/template.xes_xml +23 -0
- data/log/template.xes_yaml +26 -0
- data/log/{server.rb → xes_xml.rb} +11 -42
- data/log/xes_yaml.rb +111 -0
- data/server/handlerwrappers/default.rb +19 -10
- data/server/resources/properties.schema.active +18 -17
- data/server/resources/properties.schema.finished +18 -17
- data/server/resources/properties.schema.inactive +18 -17
- data/server/resources/transformation_dslx.xsl +29 -5
- data/server/server.rb +1 -1
- data/tools/instantiation/instantiation +1 -1
- data/tools/server/server.rb +1 -1
- metadata +10 -19
- data/cockpit/themes/default/rngs/callmanipulateworkqueue.rng +0 -122
- data/cockpit/themes/default/rngs/callworkqueue.rng +0 -107
- data/cockpit/themes/default/symbols/callcorrelationreceive.svg +0 -6
- data/cockpit/themes/default/symbols/callcorrelationsend.svg +0 -6
- data/cockpit/themes/default/symbols/callinstantiation.svg +0 -3
- data/cockpit/themes/default/symbols/callmanipulateworklist.svg +0 -6
- data/cockpit/themes/default/symbols/callmanipulateworkqueue.svg +0 -6
- data/cockpit/themes/default/symbols/callworklist.svg +0 -4
- data/cockpit/themes/default/symbols/callworkqueue.svg +0 -4
- data/log/logoverlay.xml +0 -10
- data/log/template.xes +0 -6
- data/log/yaml/log.xml +0 -27
- data/log/yaml/logoverlay.xml +0 -10
- data/log/yaml/server.rb +0 -128
- data/log/yaml/topics.xml +0 -22
- data/log/yaml/yaml.rb +0 -19
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a42c601b7e85d421eba4b6a6720f0d9ad685ad5e
|
|
4
|
+
data.tar.gz: 81cd4eb173c56c56424d766353200f0781b846e6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: afd9b2950af36b839ecdc2bfd0ff858c07bf86fc5103ac9ede1f3a1f9f1e84f6b7783f7f29aa48507941462c31f31198f33dc5d960f6c5a4f5236b94ffa2c2c0
|
|
7
|
+
data.tar.gz: 54748f688eec3b116b3a6bde4c0d5c37fd330f1a39e6d19098f6f4d1391d44e220dd5613c5afcf0284fd79012c51f0a977ff545ae6713ff22c5ece911e8e1305
|
data/cockpit/css/wfadaptor.css
CHANGED
|
@@ -77,6 +77,17 @@ svg .stand {
|
|
|
77
77
|
stroke-opacity:1;
|
|
78
78
|
stroke-dasharray:none;
|
|
79
79
|
}
|
|
80
|
+
svg .standthin {
|
|
81
|
+
fill:#ffffff;
|
|
82
|
+
fill-opacity:1;
|
|
83
|
+
stroke:#000000;
|
|
84
|
+
stroke-width:1.7;
|
|
85
|
+
stroke-linecap:round;
|
|
86
|
+
stroke-linejoin:round;
|
|
87
|
+
stroke-miterlimit:4;
|
|
88
|
+
stroke-opacity:1;
|
|
89
|
+
stroke-dasharray:none;
|
|
90
|
+
}
|
|
80
91
|
svg .normal {
|
|
81
92
|
fill:#000000;
|
|
82
93
|
fill-opacity:1;
|
data/cockpit/graph.html
CHANGED
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
<!DOCTYPE html>
|
|
18
18
|
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
|
19
19
|
<head>
|
|
20
|
+
<meta charset="utf-8"/>
|
|
20
21
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
|
21
22
|
<title>CPEE Cockpit</title>
|
|
22
23
|
|
|
@@ -55,7 +56,7 @@
|
|
|
55
56
|
<script type="text/javascript" src="js/parameters.js"></script>
|
|
56
57
|
<link rel="stylesheet" href="css/ui.css" type="text/css"/>
|
|
57
58
|
</head>
|
|
58
|
-
<body data-base-port="
|
|
59
|
+
<body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui">
|
|
59
60
|
<div class='hidden'>
|
|
60
61
|
<input name="repo-url" type="text" value=""/>
|
|
61
62
|
<input name="base-url" type="text" value=""/>
|
data/cockpit/index.html
CHANGED
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
/* shit balls, no elegance is left in this world */
|
|
60
60
|
</style>
|
|
61
61
|
</head>
|
|
62
|
-
<body data-base-port="
|
|
62
|
+
<body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui">
|
|
63
63
|
<div id='disclaimer' class='hidden'> <!--{{{-->
|
|
64
64
|
<h1>Disclaimer</h1>
|
|
65
65
|
|
data/cockpit/js/instance.js
CHANGED
|
@@ -74,7 +74,7 @@ function cockpit() { //{{{
|
|
|
74
74
|
$("input[name=modelfile]").change(load_modelfile_after);
|
|
75
75
|
|
|
76
76
|
$.ajax({
|
|
77
|
-
url: "testsets
|
|
77
|
+
url: $('body').attr('current-testsets') + "testsets.xml",
|
|
78
78
|
dataType: 'xml',
|
|
79
79
|
success: function(res){
|
|
80
80
|
$('testset',res).each(function(){
|
|
@@ -116,7 +116,7 @@ function cockpit() { //{{{
|
|
|
116
116
|
}
|
|
117
117
|
});
|
|
118
118
|
$.ajax({
|
|
119
|
-
url: "
|
|
119
|
+
url: $('body').attr('current-testsets') + "transformations.xml",
|
|
120
120
|
dataType: 'xml',
|
|
121
121
|
success: function(res){
|
|
122
122
|
$('transformation',res).each(function(){
|
|
@@ -191,7 +191,7 @@ function create_instance(ask,exec) {// {{{
|
|
|
191
191
|
}
|
|
192
192
|
}// }}}
|
|
193
193
|
|
|
194
|
-
function websocket() {
|
|
194
|
+
function websocket() { //{{{
|
|
195
195
|
var url = $('body').attr('current-instance');
|
|
196
196
|
var Socket = "MozWebSocket" in window ? MozWebSocket : WebSocket;
|
|
197
197
|
if (ws) ws.close();
|
|
@@ -252,12 +252,14 @@ function websocket() {
|
|
|
252
252
|
monitor_instance_transformation();
|
|
253
253
|
monitor_instance_dsl();
|
|
254
254
|
monitor_instance_state();
|
|
255
|
-
}
|
|
255
|
+
} //}}}
|
|
256
256
|
|
|
257
257
|
function monitor_instance(load,exec) {// {{{
|
|
258
258
|
var url = sanitize_url($("input[name=instance-url]"));
|
|
259
|
+
sanitize_url($("input[name=base-url]"));
|
|
259
260
|
var rep = sanitize_url($("input[name=repo-url]"));
|
|
260
261
|
|
|
262
|
+
|
|
261
263
|
$('.tabbehind button').hide();
|
|
262
264
|
$('#dat_details').empty();
|
|
263
265
|
|
|
@@ -315,6 +317,7 @@ function monitor_instance(load,exec) {// {{{
|
|
|
315
317
|
|
|
316
318
|
function monitor_instance_values(val) {// {{{
|
|
317
319
|
var url = $('body').attr('current-instance');
|
|
320
|
+
var rep = $('body').attr('current-repo');
|
|
318
321
|
$.ajax({
|
|
319
322
|
type: "GET",
|
|
320
323
|
url: url + "/properties/values/" + val + "/",
|
|
@@ -324,26 +327,26 @@ function monitor_instance_values(val) {// {{{
|
|
|
324
327
|
var tmp = {};
|
|
325
328
|
$(res).find(" > value > *").each(function(k,v) {
|
|
326
329
|
$.ajax({
|
|
327
|
-
url:
|
|
330
|
+
url: rep + encodeURIComponent($(v).text()),
|
|
328
331
|
success: function() {
|
|
329
332
|
tmp[v.tagName] = {};
|
|
330
|
-
var deferreds = [];
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
)
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
)
|
|
333
|
+
var deferreds = [new $.Deferred(), new $.Deferred()];
|
|
334
|
+
$.ajax({
|
|
335
|
+
url: rep + encodeURIComponent($(v).text()) + "/symbol.svg",
|
|
336
|
+
success: function(res) {
|
|
337
|
+
tmp[v.tagName]['symbol'] = res;
|
|
338
|
+
deferreds[0].resolve(true);
|
|
339
|
+
},
|
|
340
|
+
error: deferreds[0].resolve
|
|
341
|
+
})
|
|
342
|
+
$.ajax({
|
|
343
|
+
url: rep + encodeURIComponent($(v).text()) + "/schema.rng",
|
|
344
|
+
success: function(res) {
|
|
345
|
+
tmp[v.tagName]['schema'] = res;
|
|
346
|
+
deferreds[1].resolve(true);
|
|
347
|
+
},
|
|
348
|
+
error: deferreds[1].resolve
|
|
349
|
+
})
|
|
347
350
|
$.when.apply($, deferreds).then(function(x) {
|
|
348
351
|
save['endpoints_cache'] = tmp;
|
|
349
352
|
// when updating attributes clear the attributes, because they might change as well. New arguments are possible.
|
|
@@ -353,22 +356,23 @@ function monitor_instance_values(val) {// {{{
|
|
|
353
356
|
}
|
|
354
357
|
});
|
|
355
358
|
});
|
|
359
|
+
} else if(val == "attributes") {
|
|
360
|
+
document.title = $(" > value > info",res).text() + " (" + url.replace(/\/$/,'').split(/[\\/]/).pop() + ")";
|
|
356
361
|
}
|
|
357
362
|
}
|
|
358
363
|
});
|
|
359
364
|
} // }}}
|
|
360
365
|
|
|
361
|
-
function adaptor_update() {
|
|
366
|
+
function adaptor_update() { //{{{
|
|
362
367
|
$('g.element[element-endpoint]').each(function(k,ele){
|
|
363
|
-
if (save['endpoints_cache'][$(ele).attr('element-endpoint')]) {
|
|
368
|
+
if (save['endpoints_cache'][$(ele).attr('element-endpoint')] && save['endpoints_cache'][$(ele).attr('element-endpoint')]) {
|
|
364
369
|
var c = $(ele).find('g.replace');
|
|
365
370
|
var symbol = save['endpoints_cache'][$(ele).attr('element-endpoint')].symbol.documentElement;
|
|
366
371
|
c.replaceWith($(symbol).clone());
|
|
367
372
|
}
|
|
368
373
|
});
|
|
369
|
-
}
|
|
370
|
-
|
|
371
|
-
function adaptor_init(url,theme,dslx) {
|
|
374
|
+
} //}}}
|
|
375
|
+
function adaptor_init(url,theme,dslx) { //{{{
|
|
372
376
|
if (save['graph_theme'] != theme) {
|
|
373
377
|
save['graph_theme'] = theme;
|
|
374
378
|
save['graph_adaptor'] = new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
|
|
@@ -392,14 +396,14 @@ function adaptor_init(url,theme,dslx) {
|
|
|
392
396
|
});
|
|
393
397
|
} else {
|
|
394
398
|
save['graph_adaptor'].update(function(graphrealization){
|
|
395
|
-
adaptor_update();
|
|
396
399
|
var svgid = manifestation.clicked();
|
|
397
400
|
graphrealization.set_description($(dslx));
|
|
401
|
+
adaptor_update();
|
|
398
402
|
manifestation.events.click(svgid);
|
|
399
403
|
monitor_instance_pos();
|
|
400
404
|
});
|
|
401
405
|
}
|
|
402
|
-
}
|
|
406
|
+
} //}}}
|
|
403
407
|
|
|
404
408
|
function monitor_graph_change(force) { //{{{
|
|
405
409
|
var url = $('body').attr('current-instance');
|
|
@@ -619,36 +623,26 @@ function save_testset() {// {{{
|
|
|
619
623
|
testset.append(pars);
|
|
620
624
|
$.ajax({
|
|
621
625
|
type: "GET",
|
|
622
|
-
url: url + "/properties/values/
|
|
626
|
+
url: url + "/properties/values/dslx/",
|
|
623
627
|
success: function(res){
|
|
624
|
-
var pars = $X('<
|
|
625
|
-
pars.append($(res.documentElement)
|
|
628
|
+
var pars = $X('<description/>');
|
|
629
|
+
pars.append($(res.documentElement));
|
|
630
|
+
testset.append(pars);
|
|
631
|
+
pars = $X("<transformation><description type='copy'/><dataelements type='none'/><endpoints type='none'/></transformation>");
|
|
626
632
|
testset.append(pars);
|
|
627
633
|
$.ajax({
|
|
628
634
|
type: "GET",
|
|
629
|
-
url: url + "/properties/values/
|
|
635
|
+
url: url + "/properties/values/attributes/",
|
|
630
636
|
success: function(res){
|
|
631
|
-
var
|
|
632
|
-
pars
|
|
633
|
-
|
|
634
|
-
pars
|
|
637
|
+
var name = $("value > info",res).text();
|
|
638
|
+
var pars = $X('<attributes/>');
|
|
639
|
+
pars.append($(res.documentElement).children());
|
|
640
|
+
pars.find('uuid').remove();
|
|
635
641
|
testset.append(pars);
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
var name = $("value > info",res).text();
|
|
641
|
-
var pars = $X('<attributes/>');
|
|
642
|
-
pars.append($(res.documentElement).children());
|
|
643
|
-
pars.find('uuid').remove();
|
|
644
|
-
testset.append(pars);
|
|
645
|
-
var ct = new Date();
|
|
646
|
-
$('#savetestset').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
|
|
647
|
-
$('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
|
|
648
|
-
document.getElementById('savetestset').click();
|
|
649
|
-
},
|
|
650
|
-
error: report_failure
|
|
651
|
-
});
|
|
642
|
+
var ct = new Date();
|
|
643
|
+
$('#savetestset').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
|
|
644
|
+
$('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
|
|
645
|
+
document.getElementById('savetestset').click();
|
|
652
646
|
},
|
|
653
647
|
error: report_failure
|
|
654
648
|
});
|
|
@@ -806,13 +800,13 @@ function load_testset(exec) {// {{{
|
|
|
806
800
|
$.ajax({
|
|
807
801
|
cache: false,
|
|
808
802
|
dataType: 'xml',
|
|
809
|
-
url:
|
|
803
|
+
url: $('body').attr('current-testsets') + name + ".xml",
|
|
810
804
|
success: function(res){
|
|
811
805
|
save['dsl'] = null; // reload dsl and position under all circumstances
|
|
812
806
|
$('#main .tabbehind button').hide();
|
|
813
807
|
$('#dat_details').empty();
|
|
814
808
|
|
|
815
|
-
document.title =
|
|
809
|
+
document.title = "Untitled";
|
|
816
810
|
set_testset(res,exec);
|
|
817
811
|
},
|
|
818
812
|
complete: function() {
|
|
@@ -829,7 +823,7 @@ function load_modeltype() {// {{{
|
|
|
829
823
|
$.ajax({
|
|
830
824
|
cache: false,
|
|
831
825
|
dataType: 'xml',
|
|
832
|
-
url:
|
|
826
|
+
url: $('body').attr('current-testsets') + name + ".xml",
|
|
833
827
|
success: function(res){
|
|
834
828
|
$.ajax({
|
|
835
829
|
type: "PUT",
|
data/cockpit/js/ui.js
CHANGED
|
@@ -20,9 +20,11 @@ $(document).ready(function() {
|
|
|
20
20
|
success: function(res){
|
|
21
21
|
$("input[name=repo-url]").val(res['repo-url']);
|
|
22
22
|
$("input[name=base-url]").val(res['base-url']);
|
|
23
|
+
$("body").attr('current-testsets',res['testsets-url']);
|
|
23
24
|
cockpit();
|
|
24
25
|
},
|
|
25
26
|
error: function(){
|
|
27
|
+
$("body").attr('current-testsets','testsets/');
|
|
26
28
|
if (location.protocol.match(/^file/)) {
|
|
27
29
|
$("input[name=base-url]").val("http://localhost:" + $('body').data('base-port'));
|
|
28
30
|
$("input[name=repo-url]").val("http://localhost:" + $('body').data('res-port'));
|
data/cockpit/js/wfadaptor.js
CHANGED
|
@@ -181,7 +181,7 @@ function WfIllustrator(wf_adaptor) { // View {{{
|
|
|
181
181
|
this.set_svg = function(graph) { // {{{
|
|
182
182
|
if(graph.max.row < 1) graph.max.row = 1;
|
|
183
183
|
if(graph.max.col < 1) graph.max.col = 1;
|
|
184
|
-
self.svg.container.attr({'height': (graph.max.row+0.3)*self.height, 'style': "min-width: " + (graph.max.col+0.
|
|
184
|
+
self.svg.container.attr({'height': (graph.max.row+0.3)*self.height, 'style': "min-width: " + (graph.max.col+0.55)*self.width + "px"});
|
|
185
185
|
self.svg.container.append(graph.svg);
|
|
186
186
|
} // }}}
|
|
187
187
|
this.get_node_by_svg_id = function(svg_id) { // {{{
|
|
@@ -326,7 +326,6 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
326
326
|
_.each(labels,function(a,key) {
|
|
327
327
|
illustrator.draw.draw_label(a.tname, a.element_id, a.label, a.row, graph.max.col + 1, graph.svg);
|
|
328
328
|
});
|
|
329
|
-
graph.max.col += 4;
|
|
330
329
|
}
|
|
331
330
|
}
|
|
332
331
|
} //}}}
|
|
@@ -345,7 +344,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
345
344
|
id_counter = {};
|
|
346
345
|
labels = [];
|
|
347
346
|
illustrator.clear();
|
|
348
|
-
var graph = parse(description.children('description').get(0), {'row':0,'col':0});
|
|
347
|
+
var graph = parse(description.children('description').get(0), {'row':0,'col':0,final:false});
|
|
349
348
|
self.set_labels(graph);
|
|
350
349
|
// set labels
|
|
351
350
|
illustrator.set_svg(graph);
|
|
@@ -354,6 +353,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
354
353
|
var serxml = $(description.get(0).documentElement).clone(true);
|
|
355
354
|
serxml.removeAttr('svg-id');
|
|
356
355
|
serxml.removeAttr('svg-type');
|
|
356
|
+
serxml.removeAttr('svg-subtype');
|
|
357
357
|
serxml.removeAttr('svg-label');
|
|
358
358
|
$('*[svg-id]',serxml).each(function(){
|
|
359
359
|
$(this).removeAttr('svg-id');
|
|
@@ -361,6 +361,9 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
361
361
|
$('*[svg-type]',serxml).each(function(){
|
|
362
362
|
$(this).removeAttr('svg-type');
|
|
363
363
|
});
|
|
364
|
+
$('*[svg-subtype]',serxml).each(function(){
|
|
365
|
+
$(this).removeAttr('svg-subtype');
|
|
366
|
+
});
|
|
364
367
|
$('*[svg-label]',serxml).each(function(){
|
|
365
368
|
$(this).removeAttr('svg-label');
|
|
366
369
|
});
|
|
@@ -498,6 +501,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
498
501
|
|
|
499
502
|
$(root).children().each(function() {
|
|
500
503
|
var tname = this.tagName;
|
|
504
|
+
pos.final = illustrator.elements[tname].final ? true : false;
|
|
501
505
|
|
|
502
506
|
// Calculate next position {{{
|
|
503
507
|
if($(this).attr('collapsed') == undefined || $(this).attr('collapsed') == 'false') { collapsed = false; }
|
|
@@ -547,7 +551,8 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
547
551
|
else if(typeof illustrator.elements[tname].resolve_symbol == 'function') {sym_name = illustrator.elements[tname].resolve_symbol(this);}
|
|
548
552
|
else if(typeof illustrator.elements[tname].resolve_symbol == 'string') {sym_name = illustrator.elements[tname].resolve_symbol;}
|
|
549
553
|
else {sym_name = tname;}
|
|
550
|
-
$(this).attr('svg-type',
|
|
554
|
+
$(this).attr('svg-type',tname);
|
|
555
|
+
$(this).attr('svg-subtype',sym_name);
|
|
551
556
|
if((illustrator.elements[tname] && illustrator.elements[tname].svg) || sym_name == 'unknown') {
|
|
552
557
|
var g = illustrator.draw.draw_symbol(tname, sym_name, $(this).attr('svg-id'), $(this).attr('svg-label'), pos.row, pos.col, block.svg).addClass(illustrator.elements[tname] ? illustrator.elements[tname].type : 'primitive unknown');
|
|
553
558
|
if (illustrator.elements[sym_name].info) {
|
|
@@ -566,14 +571,21 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
|
|
|
566
571
|
}
|
|
567
572
|
if(illustrator.elements[tname] != undefined && illustrator.elements[tname].endnodes != 'this') {
|
|
568
573
|
for(i in block.endnodes) endnodes.push(block.endnodes[i]); // collects all endpoints from different childs e.g. alternatives from choose
|
|
569
|
-
} else { endnodes = [jQuery.extend(true, {}, pos)]; } // sets this element as only endpoint (
|
|
574
|
+
} else { endnodes = [jQuery.extend(true, {}, pos)]; } // sets this element as only endpoint (aggregate)
|
|
570
575
|
if(prev[0].row == 0 || prev[0].col == 0) { // this enforces the connection from description to the first element
|
|
571
576
|
illustrator.draw.draw_connection(group, { row: 1, col: 1 }, pos, null, null, true);
|
|
572
577
|
} else {
|
|
573
|
-
if ($.inArray(tname,illustrator.noarrow) == -1)
|
|
574
|
-
for(node in prev)
|
|
575
|
-
|
|
576
|
-
|
|
578
|
+
if ($.inArray(tname,illustrator.noarrow) == -1) {
|
|
579
|
+
for (node in prev) {
|
|
580
|
+
if (!prev[node].final)
|
|
581
|
+
illustrator.draw.draw_connection(group, prev[node], pos, null, null, true);
|
|
582
|
+
}
|
|
583
|
+
} else {
|
|
584
|
+
for(node in prev) {
|
|
585
|
+
if (!prev[node].final)
|
|
586
|
+
illustrator.draw.draw_connection(group, prev[node], pos, null, null, false);
|
|
587
|
+
}
|
|
588
|
+
}
|
|
577
589
|
}
|
|
578
590
|
// }}}
|
|
579
591
|
// Prepare next iteration {{{
|
|
@@ -6,6 +6,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
6
6
|
this.elements = {};
|
|
7
7
|
this.events = {};
|
|
8
8
|
this.compact = true;
|
|
9
|
+
this.endpoints = {};
|
|
9
10
|
|
|
10
11
|
this.noarrow = ['alternative', 'otherwise'];
|
|
11
12
|
|
|
@@ -60,7 +61,12 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
60
61
|
tab.empty();
|
|
61
62
|
if (self.adaptor.description.elements[$(node).attr('svg-type')]) {
|
|
62
63
|
save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
|
|
63
|
-
|
|
64
|
+
var rng = self.adaptor.description.elements[$(node).attr('svg-type')].clone();
|
|
65
|
+
if (save['endpoints_cache'][$(node).attr('endpoint')] && save['endpoints_cache'][$(node).attr('endpoint')].schema) {
|
|
66
|
+
var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
|
|
67
|
+
$(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
|
|
68
|
+
}
|
|
69
|
+
save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval);
|
|
64
70
|
save['details'].content(node);
|
|
65
71
|
}
|
|
66
72
|
}; //}}}
|
|
@@ -202,28 +208,13 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
202
208
|
'type': 'primitive',
|
|
203
209
|
'illustrator': {//{{{
|
|
204
210
|
'endnodes': 'this',
|
|
205
|
-
'label': function(node){return $('label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'')},
|
|
211
|
+
'label': function(node){ return $('label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,''); },
|
|
212
|
+
'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
|
|
206
213
|
'resolve_symbol': function(node) {
|
|
207
|
-
if($(
|
|
208
|
-
return 'callinstantiation';
|
|
209
|
-
} else if($(node).attr('endpoint').match(/^correlation_send/)) {
|
|
210
|
-
return 'callcorrelationsend';
|
|
211
|
-
} else if($(node).attr('endpoint').match(/^correlation_receive/)) {
|
|
212
|
-
return 'callcorrelationreceive';
|
|
213
|
-
} else if($(node).attr('endpoint').match(/^worklist/) && $('finalize,update', node).length > 0) {
|
|
214
|
-
return 'callmanipulateworklist';
|
|
215
|
-
} else if($(node).attr('endpoint').match(/^worklist/)) {
|
|
216
|
-
return 'callworklist';
|
|
217
|
-
} else if($(node).attr('endpoint').match(/^workqueue/) && $('finalize,update', node).length > 0) {
|
|
218
|
-
return 'callmanipulateworkqueue';
|
|
219
|
-
} else if($(node).attr('endpoint').match(/^workqueue/)) {
|
|
220
|
-
return 'callworkqueue';
|
|
221
|
-
} else if($('parameters > service', node).length > 0) {
|
|
222
|
-
return 'callinjection';
|
|
223
|
-
} else if($('finalize,update', node).length > 0) {
|
|
214
|
+
if($('finalize,update', node).length > 0) {
|
|
224
215
|
return 'callmanipulate';
|
|
225
216
|
} else {
|
|
226
|
-
return'call';
|
|
217
|
+
return 'call';
|
|
227
218
|
}
|
|
228
219
|
},
|
|
229
220
|
'svg': self.adaptor.theme_dir + 'symbols/call.svg'
|
|
@@ -892,6 +883,7 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
892
883
|
'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
|
|
893
884
|
'illustrator': {//{{{
|
|
894
885
|
'label': function(node){return $('label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'')},
|
|
886
|
+
'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
|
|
895
887
|
'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
|
|
896
888
|
},//}}}
|
|
897
889
|
}; /*}}}*/
|
|
@@ -913,55 +905,4 @@ function WFAdaptorManifestation(adaptor) {
|
|
|
913
905
|
'type': 'abstract',
|
|
914
906
|
'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
|
|
915
907
|
}; /*}}}*/
|
|
916
|
-
this.elements.callinstantiation = { /*{{{*/
|
|
917
|
-
'type': 'abstract',
|
|
918
|
-
'parent': 'call',
|
|
919
|
-
'illustrator': {//{{{
|
|
920
|
-
'svg': self.adaptor.theme_dir + 'symbols/callinstantiation.svg'
|
|
921
|
-
},//}}}
|
|
922
|
-
}; /*}}}*/
|
|
923
|
-
this.elements.callcorrelationsend = { /*{{{*/
|
|
924
|
-
'type': 'abstract',
|
|
925
|
-
'parent': 'call',
|
|
926
|
-
'illustrator': {//{{{
|
|
927
|
-
'svg': self.adaptor.theme_dir + 'symbols/callcorrelationsend.svg'
|
|
928
|
-
},//}}}
|
|
929
|
-
}; /*}}}*/
|
|
930
|
-
this.elements.callcorrelationreceive = { /*{{{*/
|
|
931
|
-
'type': 'abstract',
|
|
932
|
-
'parent': 'call',
|
|
933
|
-
'illustrator': {//{{{
|
|
934
|
-
'svg': self.adaptor.theme_dir + 'symbols/callcorrelationreceive.svg'
|
|
935
|
-
},//}}}
|
|
936
|
-
}; /*}}}*/
|
|
937
|
-
this.elements.callworklist = { /*{{{*/
|
|
938
|
-
'type': 'abstract',
|
|
939
|
-
'parent': 'call',
|
|
940
|
-
'illustrator': {//{{{
|
|
941
|
-
'svg': self.adaptor.theme_dir + 'symbols/callworklist.svg'
|
|
942
|
-
},//}}}
|
|
943
|
-
}; /*}}}*/
|
|
944
|
-
this.elements.callmanipulateworklist = { /*{{{*/
|
|
945
|
-
'type': 'abstract',
|
|
946
|
-
'parent': 'call',
|
|
947
|
-
'illustrator': {//{{{
|
|
948
|
-
'svg': self.adaptor.theme_dir + 'symbols/callmanipulateworklist.svg'
|
|
949
|
-
},//}}}
|
|
950
|
-
}; /*}}}*/
|
|
951
|
-
this.elements.callworkqueue = { /*{{{*/
|
|
952
|
-
'type': 'abstract',
|
|
953
|
-
'parent': 'call',
|
|
954
|
-
'description': self.adaptor.theme_dir + 'rngs/callworkqueue.rng',
|
|
955
|
-
'illustrator': {//{{{
|
|
956
|
-
'svg': self.adaptor.theme_dir + 'symbols/callworkqueue.svg'
|
|
957
|
-
},//}}}
|
|
958
|
-
}; /*}}}*/
|
|
959
|
-
this.elements.callmanipulateworkqueue = { /*{{{*/
|
|
960
|
-
'type': 'abstract',
|
|
961
|
-
'parent': 'call',
|
|
962
|
-
'description': self.adaptor.theme_dir + 'rngs/callmanipulateworkqueue.rng',
|
|
963
|
-
'illustrator': {//{{{
|
|
964
|
-
'svg': self.adaptor.theme_dir + 'symbols/callmanipulateworkqueue.svg'
|
|
965
|
-
},//}}}
|
|
966
|
-
}; /*}}}*/
|
|
967
908
|
}
|