Skip to content

Commit 71cafa2

Browse files
NicoPeters.NPNicoPeters.NP
NicoPeters.NP
authored and
NicoPeters.NP
committed
merged trunk into prod (3363)
git-svn-id: http://oryx-editor.googlecode.com/svn/branches/prod@3364 d672c736-503d-0410-a38a-9366997c882b
1 parent a623bf4 commit 71cafa2

File tree

105 files changed

+10575
-8067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+10575
-8067
lines changed

.classpath

+22-33
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,6 @@
1414
<classpathentry kind="lib" path="poem-jvm/lib/asm-attrs-1.5.3.jar"/>
1515
<classpathentry kind="lib" path="poem-jvm/lib/avalon-framework-4.1.3.jar"/>
1616
<classpathentry kind="lib" path="poem-jvm/lib/backport-util-concurrent-3.0.jar"/>
17-
<classpathentry kind="lib" path="poem-jvm/lib/batik-awt-util-1.6-1.jar"/>
18-
<classpathentry kind="lib" path="poem-jvm/lib/batik-bridge-1.6-1.jar"/>
19-
<classpathentry kind="lib" path="poem-jvm/lib/batik-css-1.6-1.jar"/>
20-
<classpathentry kind="lib" path="poem-jvm/lib/batik-dom-1.6-1.jar"/>
21-
<classpathentry kind="lib" path="poem-jvm/lib/batik-ext-1.6-1.jar"/>
22-
<classpathentry kind="lib" path="poem-jvm/lib/batik-extension-1.6-1.jar"/>
23-
<classpathentry kind="lib" path="poem-jvm/lib/batik-gvt-1.6-1.jar"/>
24-
<classpathentry kind="lib" path="poem-jvm/lib/batik-parser-1.6-1.jar"/>
25-
<classpathentry kind="lib" path="poem-jvm/lib/batik-rasterizer-1.6-1.jar"/>
26-
<classpathentry kind="lib" path="poem-jvm/lib/batik-rasterizer-ext-1.6-1.jar"/>
27-
<classpathentry kind="lib" path="poem-jvm/lib/batik-script-1.6-1.jar"/>
28-
<classpathentry kind="lib" path="poem-jvm/lib/batik-svg-dom-1.6-1.jar"/>
29-
<classpathentry kind="lib" path="poem-jvm/lib/batik-transcoder-1.6-1.jar"/>
30-
<classpathentry kind="lib" path="poem-jvm/lib/batik-util-1.6-1.jar"/>
31-
<classpathentry kind="lib" path="poem-jvm/lib/batik-xml-1.6-1.jar"/>
3217
<classpathentry kind="lib" path="poem-jvm/lib/cglib-2.1_3.jar"/>
3318
<classpathentry kind="lib" path="poem-jvm/lib/commons-codec-1.2.jar"/>
3419
<classpathentry kind="lib" path="poem-jvm/lib/commons-collections-2.1.1.jar"/>
@@ -79,24 +64,6 @@
7964
<classpathentry kind="lib" path="poem-jvm/lib/xmlsec-1.3.0.jar"/>
8065
<classpathentry kind="lib" path="buildApps/lib/commons-codec-1.3.jar"/>
8166
<classpathentry kind="lib" path="buildApps/lib/org.json.jar"/>
82-
<classpathentry kind="lib" path="editor/lib/batik-anim.jar"/>
83-
<classpathentry kind="lib" path="editor/lib/batik-awt-util.jar"/>
84-
<classpathentry kind="lib" path="editor/lib/batik-bridge.jar"/>
85-
<classpathentry kind="lib" path="editor/lib/batik-codec.jar"/>
86-
<classpathentry kind="lib" path="editor/lib/batik-css.jar"/>
87-
<classpathentry kind="lib" path="editor/lib/batik-dom.jar"/>
88-
<classpathentry kind="lib" path="editor/lib/batik-ext.jar"/>
89-
<classpathentry kind="lib" path="editor/lib/batik-extension.jar"/>
90-
<classpathentry kind="lib" path="editor/lib/batik-gui-util.jar"/>
91-
<classpathentry kind="lib" path="editor/lib/batik-gvt.jar"/>
92-
<classpathentry kind="lib" path="editor/lib/batik-parser.jar"/>
93-
<classpathentry kind="lib" path="editor/lib/batik-script.jar"/>
94-
<classpathentry kind="lib" path="editor/lib/batik-svg-dom.jar"/>
95-
<classpathentry kind="lib" path="editor/lib/batik-svggen.jar"/>
96-
<classpathentry kind="lib" path="editor/lib/batik-swing.jar"/>
97-
<classpathentry kind="lib" path="editor/lib/batik-transcoder.jar"/>
98-
<classpathentry kind="lib" path="editor/lib/batik-util.jar"/>
99-
<classpathentry kind="lib" path="editor/lib/batik-xml.jar"/>
10067
<classpathentry kind="lib" path="editor/lib/commons-codec-1.3.jar"/>
10168
<classpathentry kind="lib" path="editor/lib/commons-collections-3.2.jar"/>
10269
<classpathentry kind="lib" path="editor/lib/commons-configuration-1.5.jar"/>
@@ -171,5 +138,27 @@
171138
<classpathentry kind="lib" path="editor/lib/jaxb1-impl.jar"/>
172139
<classpathentry kind="lib" path="editor/lib/jsr173_1.0_api.jar"/>
173140
<classpathentry kind="lib" path="buildApps/lib/yuicompressor-2.4.2.jar"/>
141+
<classpathentry kind="lib" path="poem-jvm/lib/batik-anim.jar"/>
142+
<classpathentry kind="lib" path="poem-jvm/lib/batik-awt-util.jar"/>
143+
<classpathentry kind="lib" path="poem-jvm/lib/batik-bridge.jar"/>
144+
<classpathentry kind="lib" path="poem-jvm/lib/batik-codec.jar"/>
145+
<classpathentry kind="lib" path="poem-jvm/lib/batik-css.jar"/>
146+
<classpathentry kind="lib" path="poem-jvm/lib/batik-dom.jar"/>
147+
<classpathentry kind="lib" path="poem-jvm/lib/batik-ext.jar"/>
148+
<classpathentry kind="lib" path="poem-jvm/lib/batik-extension.jar"/>
149+
<classpathentry kind="lib" path="poem-jvm/lib/batik-gui-util.jar"/>
150+
<classpathentry kind="lib" path="poem-jvm/lib/batik-gvt.jar"/>
151+
<classpathentry kind="lib" path="poem-jvm/lib/batik-parser.jar"/>
152+
<classpathentry kind="lib" path="poem-jvm/lib/batik-rasterizer.jar"/>
153+
<classpathentry kind="lib" path="poem-jvm/lib/batik-script.jar"/>
154+
<classpathentry kind="lib" path="poem-jvm/lib/batik-svg-dom.jar"/>
155+
<classpathentry kind="lib" path="poem-jvm/lib/batik-svggen.jar"/>
156+
<classpathentry kind="lib" path="poem-jvm/lib/batik-swing.jar"/>
157+
<classpathentry kind="lib" path="poem-jvm/lib/batik-transcoder.jar"/>
158+
<classpathentry kind="lib" path="poem-jvm/lib/batik-util.jar"/>
159+
<classpathentry kind="lib" path="poem-jvm/lib/batik-xml.jar"/>
160+
<classpathentry kind="lib" path="poem-jvm/lib/batik.jar"/>
161+
<classpathentry kind="lib" path="poem-jvm/lib/jcip-annotations-1.0.jar"/>
162+
<classpathentry kind="lib" path="poem-jvm/lib/js.jar"/>
174163
<classpathentry kind="output" path="bin"/>
175164
</classpath>

LIBRARIES

+49-52
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,61 @@
11
This file lists all used libraries (in alphabetical order) and their licenses this project uses.
22

33
**Java Libraries**
4-
5-
Library License License File
6-
----------------------------------------------------------------------------
7-
batik-anim.jar Apache 2.0 included in jar file
8-
batik-awt-util.jar Apache 2.0 included in jar file
9-
batik-bridge.jar Apache 2.0 included in jar file
10-
batik-codec.jar Apache 2.0 included in jar file
11-
batik-css.jar Apache 2.0 included in jar file
12-
batik-dom.jar Apache 2.0 included in jar file
13-
batik-ext.jar W3C Notice and License included in jar file
14-
batik-extension.jar Apache 2.0 included in jar file
15-
batik-gui-util.jar Apache 2.0 included in jar file
16-
batik-gvt.jar Apache 2.0 included in jar file
17-
batik-parser.jar Apache 2.0 included in jar file
18-
batik-script.jar Apache 2.0 included in jar file
19-
batik-svg-dom.jar Apache 2.0 included in jar file
20-
batik-svggen.jar Apache 2.0 included in jar file
21-
batik-swing.jar Apache 2.0 included in jar file
22-
batik-transcoder.jar Apache 2.0 included in jar file
23-
batik-util.jar Apache 2.0 included in jar file
24-
batik-xml.jar Apache 2.0 included in jar file
25-
commons-codec-1.3.jar Apache 2.0 included in jar file
26-
commons-collections-3.2.jar Apache 2.0 included in jar file
27-
commons-configuration-1.5.jar Apache 2.0 included in jar file
28-
commons-fileupload-1.2.jar Apache 2.0 included in jar file
29-
commons-httpclient-3.0.jar Apache 2.0 included in jar file
30-
commons-io-1.4.jar Apache 2.0 included in jar file
31-
commons-lang-2.3.jar Apache 2.0 included in jar file
32-
commons-logging-1.1.1.jar Apache 2.0 included in jar file
33-
custom_rhino.jar MPL 1.1 licenses/LICENSE.custom_rhino.jar
34-
licenses/LICENSE.custom_rhino.jar.MPL-1.1.html
35-
dom3-xml-apis.jar W3C Notice and License included in jar file
36-
Own Public Domain License
37-
fop.jar Apache 2.0 included in jar file
38-
js.jar MPL 1.1 and GPL 2.0 licenses/LICENSE.js.txt
39-
openid4java.jar ? -
40-
oryxAtlas.jar NO LICENSE!!! -
41-
pdf-transcoder.jar Apache 2.0 licenses/LICENSE.pdf-transcoder.txt
42-
licenses/LICENSE.apache-2.0
43-
servlet-api.jar ? - (part of J2EE)
44-
xml-apis.ext.jar Apache 2.0 included in jar file
45-
xmlgraphics-commons-1.1.jar Apache 2.0 included in jar file
4+
Library License License File
5+
---------------------------------------------------------------------------------------------------------
6+
batik-anim.jar Apache 2.0 included in jar file
7+
batik-awt-util.jar Apache 2.0 included in jar file
8+
batik-bridge.jar Apache 2.0 included in jar file
9+
batik-codec.jar Apache 2.0 included in jar file
10+
batik-css.jar Apache 2.0 included in jar file
11+
batik-dom.jar Apache 2.0 included in jar file
12+
batik-ext.jar W3C Notice and License included in jar file
13+
batik-extension.jar Apache 2.0 included in jar file
14+
batik-gui-util.jar Apache 2.0 included in jar file
15+
batik-gvt.jar Apache 2.0 included in jar file
16+
batik-parser.jar Apache 2.0 included in jar file
17+
batik-script.jar Apache 2.0 included in jar file
18+
batik-svg-dom.jar Apache 2.0 included in jar file
19+
batik-svggen.jar Apache 2.0 included in jar file
20+
batik-swing.jar Apache 2.0 included in jar file
21+
batik-transcoder.jar Apache 2.0 included in jar file
22+
batik-util.jar Apache 2.0 included in jar file
23+
batik-xml.jar Apache 2.0 included in jar file
24+
commons-codec-1.3.jar Apache 2.0 included in jar file
25+
commons-collections-3.2.jar Apache 2.0 included in jar file
26+
commons-configuration-1.5.jar Apache 2.0 included in jar file
27+
commons-fileupload-1.2.jar Apache 2.0 included in jar file
28+
commons-httpclient-3.0.jar Apache 2.0 included in jar file
29+
commons-io-1.4.jar Apache 2.0 included in jar file
30+
commons-lang-2.3.jar Apache 2.0 included in jar file
31+
commons-logging-1.1.1.jar Apache 2.0 included in jar file
32+
custom_rhino.jar MPL 1.1 licenses/LICENSE.custom_rhino.jar
33+
licenses/LICENSE.custom_rhino.jar.MPL-1.1.html
34+
dom3-xml-apis.jar W3C Notice and License included in jar file
35+
fop.jar Apache 2.0 included in jar file
36+
js.jar MPL 1.1 and GPL 2.0 licenses/LICENSE.js.txt
37+
openid4java.jar Apache 2.0 -
38+
oryxAtlas.jar NO LICENSE!!! -
39+
pdf-transcoder.jar Apache 2.0 licenses/LICENSE.pdf-transcoder.txt
40+
licenses/LICENSE.apache-2.0
41+
servlet-api.jar ? - (part of J2EE)
42+
xml-apis.ext.jar Apache 2.0 included in jar file
43+
xmlgraphics-commons-1.1.jar Apache 2.0 included in jar file
4644

4745

4846

4947
**Javascript Libraries**
50-
Library License License File
51-
----------------------------------------------------------------------------
52-
ext-2.0.2 LGPL 3.0 /ext-2.0.2/LICENSE.txt
53-
path_parser.js ? -
54-
prototype-1.5.1.js MIT License /licenses/LICENSE.prototype-1.5.1
55-
48+
Library License License File
49+
---------------------------------------------------------------------------------------------------------
50+
ext-2.0.2 LGPL 3.0 ext-2.0.2/LICENSE.txt
51+
path_parser.js ? -
52+
prototype-1.5.1.js MIT License licenses/LICENSE.prototype-1.5.1
5653

5754

5855

5956
**Other**
60-
Library License License File
61-
----------------------------------------------------------------------------
62-
ARIS-Export.dtd ? -
63-
extract-rdf.xsl Public Domain by Owner included in file
57+
Library License License File
58+
---------------------------------------------------------------------------------------------------------
59+
ARIS-Export.dtd ? -
60+
extract-rdf.xsl Public Domain by Owner included in file
6461

617 Bytes
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
/**
2+
* Copyright (c) 2008
3+
* Changhua Li
4+
*
5+
* Permission is hereby granted, free of charge, to any person obtaining a
6+
* copy of this software and associated documentation files (the "Software"),
7+
* to deal in the Software without restriction, including without limitation
8+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
9+
* and/or sell copies of the Software, and to permit persons to whom the
10+
* Software is furnished to do so, subject to the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included in
13+
* all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21+
* DEALINGS IN THE SOFTWARE.
22+
**/
23+
24+
if(!ORYX.Plugins)
25+
ORYX.Plugins = new Object();
26+
27+
ORYX.Plugins.BPEL4Chor2BPELSupport = ORYX.Plugins.AbstractPlugin.extend({
28+
29+
/**
30+
* Offers the plugin functionality:
31+
*/
32+
construct: function(){
33+
// Call super class constructor
34+
arguments.callee.$.construct.apply(this, arguments);
35+
36+
this.dialog2BPELSupport = new ORYX.Plugins.TransformationDownloadDialogForBPEL4Chor();
37+
38+
this.facade.offer({
39+
'name':ORYX.I18N.BPEL4Chor2BPELSupport.exp,
40+
'functionality': this.exportProcess.bind(this),
41+
'group': ORYX.I18N.JSONSupport.exp.group,
42+
dropDownGroupIcon: ORYX.PATH + "images/export2.png",
43+
'icon': ORYX.PATH + "images/bpel4chor2bpel_export_icon.png",
44+
'description': ORYX.I18N.BPEL4Chor2BPELSupport.expDesc,
45+
'index': 0,
46+
'minShape': 0,
47+
'maxShape': 0
48+
});
49+
},
50+
51+
/***************************** export **********************************/
52+
53+
exportProcess: function(){
54+
55+
// raise loading enable event
56+
this.facade.raiseEvent({
57+
type: ORYX.CONFIG.EVENT_LOADING_ENABLE
58+
});
59+
60+
// asynchronously ...
61+
window.setTimeout((function(){
62+
63+
// ... save synchronously
64+
this.exportSynchronously();
65+
66+
// raise loading disable event.
67+
this.facade.raiseEvent({
68+
type: ORYX.CONFIG.EVENT_LOADING_DISABLE
69+
});
70+
71+
}).bind(this), 10);
72+
73+
return true;
74+
},
75+
76+
exportSynchronously: function() {
77+
78+
var resource = location.href;
79+
80+
81+
try {
82+
var serialized_rdf = this.getRDFFromDOM();
83+
84+
Ext.Msg.show({
85+
title:'RDF Information',
86+
msg: serialized_rdf, // rdf information of this Dom.
87+
buttons: Ext.Msg.YESNOCANCEL,
88+
icon: Ext.MessageBox.QUESTION
89+
});
90+
91+
if (!serialized_rdf.startsWith("<?xml")) {
92+
serialized_rdf = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + serialized_rdf;
93+
}
94+
95+
// Send the request to the server.
96+
new Ajax.Request(ORYX.CONFIG.BPEL4CHOR2BPEL_EXPORT_URL, {
97+
method: 'POST',
98+
asynchronous: false,
99+
parameters: {
100+
resource: resource,
101+
data: serialized_rdf
102+
},
103+
onSuccess: function(response){
104+
this.displayResult(response.responseText);
105+
}.bind(this)
106+
});
107+
108+
109+
} catch (error){
110+
this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_LOADING_DISABLE});
111+
Ext.Msg.alert(ORYX.I18N.Oryx.title, error);
112+
}
113+
114+
},
115+
116+
117+
/**
118+
* Builds up the data that will be shown in the result dialog of
119+
* the BPEL4Chor to BPEL transformation.
120+
* For this purpose the process and wsdl names are determined
121+
* it is checked if them were generated successfully.
122+
*
123+
* @param {String[]} bpelArray The generated process array of bpel processes
124+
* @param {String[]} wsdlArray The generated wsdl array of bpel processes
125+
*/
126+
buildTransData: function(bpelArray, wsdlArray) {
127+
var data = new Array();
128+
for(var i = 0; i < bpelArray.length; i++){
129+
var name = this.dialog2BPELSupport.getBPELName(bpelArray[i]);
130+
if(name == undefined){
131+
name = "Process " + (i+1);
132+
}
133+
data[i] = [name, bpelArray[i], this.dialog2BPELSupport.getResultInfo(bpelArray[i])];
134+
}
135+
136+
for(var i = 0; i < wsdlArray.length; i++){
137+
var name = this.dialog2BPELSupport.getBPELName(bpelArray[i]); // name of wsdl file should be same with bpel file
138+
name = name + "-wsdl";
139+
if(name == undefined){
140+
name = "WSDL " + (i+1);
141+
}
142+
data[i+bpelArray.length] = [name, wsdlArray[i], this.dialog2BPELSupport.getResultInfo(wsdlArray[i])];
143+
}
144+
return data;
145+
},
146+
147+
/**
148+
* Analyzes the result of the servlet call.
149+
*
150+
* If an fault occured or the answer is undefined, the error is shown
151+
* using a message dialog.
152+
*
153+
* If the first result starts with "ParserError" the error is shown using an
154+
* error dialog. Otherwise the result is shown using the result dialog.
155+
*
156+
* @param {Object} result - the result of the transformation servlet (JSON)
157+
*/
158+
displayResult: function(result) {
159+
this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_LOADING_DISABLE});
160+
161+
var resultString = '(' + result + ')';
162+
163+
alert (resultString);
164+
165+
var resultObject;
166+
167+
try {
168+
resultObject = eval(resultString);
169+
} catch (e1) {
170+
alert("Error during evaluation of result: " + e1 + "\r\n" + resultString);
171+
}
172+
173+
if ((!resultObject.res) || (resultObject.res.length == 0)) {
174+
this.dialog2BPELSupport.openMessageDialog(ORYX.I18N.TransformationDownloadDialog.error,ORYX.I18N.TransformationDownloadDialog.noResult);
175+
} else if (resultObject.res[0].contentBPEL.indexOf("Parser Error")>0) {
176+
this.dialog2BPELSupport.openErrorDialog(resultObject.res[0].contentBPEL);
177+
} else {
178+
var bpelArray = new Array();
179+
var wsdlArray = new Array();
180+
for (var i = 0; i < resultObject.res.length; i++) {
181+
bpelArray[i] = resultObject.res[i].contentBPEL;
182+
wsdlArray[i] = resultObject.res[i].contentWSDL;
183+
}
184+
var data = this.buildTransData(bpelArray, wsdlArray);
185+
186+
alert(data);
187+
188+
this.dialog2BPELSupport.openResultDialog(data);
189+
}
190+
}
191+
});
192+

editor/client/scripts/Plugins/bpmn2.0/bpmn2.0serialization.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ ORYX.Plugins.BPMN2_0Serialization = {
8686
});
8787

8888
this.facade.offer({
89-
'name' : ORYX.I18N.Bpmn2_0Serialization.download,
89+
'name' : ORYX.I18N.Bpmn2_0Serialization.xpdlDownload,
9090
'functionality' : this.downloadXpdl.bind(this),
9191
'group' : 'Export',
9292
dropDownGroupIcon : ORYX.PATH + "images/export2.png",

0 commit comments

Comments
 (0)