merged trunk into prod (3409)

git-svn-id: http://oryx-editor.googlecode.com/svn/branches/prod@3410 d672c736-503d-0410-a38a-9366997c882b

Author: NicoPeters.NP

.classpath

@@ -6,6 +6,7 @@
 	<classpathentry kind="src" path="poem-jvm/test/selenium"/>
 	<classpathentry kind="src" path="poem-jvm/test/java"/>
 	<classpathentry kind="src" path="buildApps/src"/>
+	<classpathentry excluding="src/" kind="src" path="editor/server"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="poem-jvm/lib/antlr-2.7.6.jar"/>
@@ -161,5 +162,6 @@
 	<classpathentry kind="lib" path="poem-jvm/lib/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="poem-jvm/lib/js.jar"/>
 	<classpathentry kind="lib" path="editor/lib/xstream-1.3.1.jar"/>
+	<classpathentry kind="lib" path="editor/lib/xmappr-0.9.2-serializable.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

editor/client/scripts/Plugins/Layouter/containerLayouter.js

@@ -30,7 +30,7 @@
 
 
 /**
- * This plugin provides methodes to layout elements that typically contains 
+ * This plugin provides methods to layout elements that typically contain 
  * a bunch of child elements, such as subprocesses or lanes.
  * 
  * @class ORYX.Plugins.ContainerLayouter
@@ -126,9 +126,9 @@ ORYX.Plugins.ContainerLayouter = {
 	 * @param {Object} shape
 	 * 		The container.
 	 * @param {Object} childsBounds
-	 * 		The bounds including all childs
+	 * 		The bounds including all children
 	 * @param {Object} ulChildAbsBounds
-	 * 		The absolute bounds including all childs
+	 * 		The absolute bounds including all children
 	 */
 	ensureContainersMinimumSize: function(shape, childsBounds, ulChildAbsBounds, ignoreList, options) {
 		var bounds = shape.bounds;
@@ -142,7 +142,7 @@ ORYX.Plugins.ContainerLayouter = {
 		}
 
 		if(!shape.isResized) {
-			/* Childs movement after widen the conatiner */
+			/* Childs movement after widening the conatiner */
 			var yMovement = 0;
 			var xMovement = 0;
 			var changeBounds = false;
@@ -188,7 +188,7 @@ ORYX.Plugins.ContainerLayouter = {
 
 			this.moveChildsBy(shape, {x: xMovement, y: yMovement}, ignoreList);
 
-			/* Signals that child are already move to correct position */
+			/* Signals that children are already move to correct position */
 			return true;
 		}
 
@@ -382,7 +382,7 @@ ORYX.Plugins.ContainerLayouter = {
 	},
 
 	/**
-	 * Returns the direct child shapes that are not on the irgnore list.
+	 * Returns the direct child shapes that are not on the ignore list.
 	 */
 	getChildShapesWithout: function(shape, ignoreList) {
 		var childs = shape.getChildShapes(false);
@@ -392,4 +392,4 @@ ORYX.Plugins.ContainerLayouter = {
 	}
 }
 
-ORYX.Plugins.ContainerLayouter = ORYX.Plugins.AbstractPlugin.extend(ORYX.Plugins.ContainerLayouter);
+ORYX.Plugins.ContainerLayouter = ORYX.Plugins.AbstractPlugin.extend(ORYX.Plugins.ContainerLayouter);

editor/client/scripts/Plugins/bpmn2xpdl20.js

@@ -15,10 +15,11 @@ ORYX.Plugins.CPNToolsSupport = ORYX.Plugins.AbstractPlugin.extend({
 		this.facade.offer({
 			'name':				"Export to CPN Tools",
 			'functionality': 	this.exportCPN.bind(this),
-			'group': 			"CPNTools",
-			'icon': 			ORYX.PATH + "images/cpn/cpn_import.png",
+			'group': 			ORYX.I18N.cpntoolsSupport.group,
+			'dropDownGroupIcon':ORYX.PATH + "images/export2.png",
+			'icon': 			ORYX.PATH + "images/cpn/cpn_export.png",
 			'description': 		ORYX.I18N.cpntoolsSupport.exportDescription,
-			'index': 			1,
+			'index': 			0,
 			'minShape': 		0,
 			'maxShape': 		0,
 			'maxShape': 		0
@@ -27,8 +28,9 @@ ORYX.Plugins.CPNToolsSupport = ORYX.Plugins.AbstractPlugin.extend({
 		this.facade.offer({
 			'name':				"Import from CPN Tools",
 			'functionality': 	this.importCPN.bind(this),
-			'group': 			"CPNTools",
-			'icon': 			ORYX.PATH + "images/cpn/cpn_export.png",
+			'group': 			ORYX.I18N.cpntoolsSupport.group,
+			'dropDownGroupIcon':ORYX.PATH + "images/import.png",
+			'icon': 			ORYX.PATH + "images/cpn/cpn_import.png",
 			'description': 		ORYX.I18N.cpntoolsSupport.importDescription,
 			'index': 			1,
 			'minShape': 		0,

editor/client/scripts/Plugins/cpntoolsSupport.js

@@ -28,8 +28,6 @@ ORYX.Plugins.JPDLSupport = ORYX.Plugins.AbstractPlugin.extend({
 
 	facade: undefined,
 
-	jPDLImporterUrl: 'backend/poem/new_jpdl',
-	jPDLExporterUrlSuffix: '/jpdl',
 
 	stencilSetExtensionNamespace: 'http://oryx-editor.org/stencilsets/extensions/jbpm#',
 	stencilSetExtensionDefinition: 'jbpm/jbpm.json',
@@ -91,16 +89,25 @@ ORYX.Plugins.JPDLSupport = ORYX.Plugins.AbstractPlugin.extend({
 	 * 
 	 */
 	exportJPDL: function(){
-		// TODO: save?
-		var loc = location.href;
-		var jpdlLoc ;
-		if ( loc.length > 4 && loc.substring(loc.length - 5) == "/self" ) {
-			jpdlLoc = loc.substring(0, loc.length - 5) + this.jPDLExporterUrlSuffix;
-		} else {
-			alert("TODO: Integrate existing export with new models.. ");
-			return ;
-		}
-		this._doExport( jpdlLoc );
+		// raise loading enable event
+        this.facade.raiseEvent({
+            type: ORYX.CONFIG.EVENT_LOADING_ENABLE
+        });
+            
+		// asynchronously ...
+        window.setTimeout((function(){
+			
+			// ... save synchronously
+    		this._doExport();			
+			// raise loading disable event.
+            this.facade.raiseEvent({
+                type: ORYX.CONFIG.EVENT_LOADING_DISABLE
+            });
+			
+        }).bind(this), 10);
+
+		return true;
+
 
 	},
 
@@ -207,12 +214,13 @@ ORYX.Plugins.JPDLSupport = ORYX.Plugins.AbstractPlugin.extend({
 	 * Opens an export window / tab.
 	 * 
 	 */
-	_doExport: function( url ){
-		
+	_doExport: function(){
+		var serialized_json = this.facade.getSerializedJSON();
+
 		this._sendRequest(
-			url,
-			'GET',
-			{ },
+			ORYX.CONFIG.JPDLEXPORTURL,
+			'POST',
+			{ data:serialized_json },
 			function( result ) { 
 				var parser = new DOMParser();
 				var parsedResult = parser.parseFromString(result, "text/xml");
@@ -285,7 +293,7 @@ ORYX.Plugins.JPDLSupport = ORYX.Plugins.AbstractPlugin.extend({
 							var jpdlString =  form.items.items[2].getValue();
 
 							this._sendRequest(
-									this.jPDLImporterUrl,
+									ORYX.CONFIG.JPDLIMPORTURL,
 									'POST',
 									{ 'data' : jpdlString },
 									function( arg ) { this._loadJSON( arg );  loadMask.hide();  dialog.hide(); }.bind(this),

editor/client/scripts/Plugins/jpdlSupport.js

@@ -26,7 +26,10 @@
 		</plugin>	
 
 		<plugin source="jpdlSupport.js" name="ORYX.Plugins.JPDLSupport">
-			<requires namespace="http://b3mn.org/stencilset/bpmn1.1#"/>	
+			<requires namespace="http://b3mn.org/stencilset/bpmn1.1#"/>
+			<!-- plugin loads dynamically the needed extension 
+				<requires namespace="http://oryx-editor.org/stencilsets/extensions/jbpm#"/>
+			-->
 		</plugin>	
 
 		<!-- User Interface Aggregation -->
@@ -82,7 +85,7 @@
 		<plugin source="overlay.js" name="ORYX.Plugins.Overlay" />		
 		<plugin source="edit.js" name="ORYX.Plugins.Edit" />
 		<plugin source="keysMove.js" name="ORYX.Plugins.KeysMove" />
-		<!--plugin source="Layouter/containerLayouter.js" name="ORYX.Plugins.ContainerLayouter" /-->
+		<plugin source="Layouter/containerLayouter.js" name="ORYX.Plugins.ContainerLayouter" />
 
 		<!-- plugin for PNML export and deployment -->
 		<plugin source="pnmlexport.js" name="ORYX.Plugins.Pnmlexport">
@@ -264,9 +267,11 @@
             <requires namespace="http://b3mn.org/stencilset/bpmn#"/>
         </plugin>
 
+		<!-- Replaced by BPMN2XPDL 2.0 
 		<plugin source="bpmn2xpdl.js" name="ORYX.Plugins.BPMN2XPDL">
 			<requires namespace="http://b3mn.org/stencilset/bpmn1.1#"/>	
 		</plugin>
+		 -->
 
 		<plugin source="bpmn2xhtml.js" name="ORYX.Plugins.BPMN2XHTML">
 			<requires namespace="http://b3mn.org/stencilset/bpmn1.1#"/>	
@@ -324,6 +329,7 @@
 		<plugin source="bpmn.js" name="ORYX.Plugins.BPMN" />
 
 
+		
 		<plugin source="feedback.js" name="ORYX.Plugins.Feedback">
 			<property name="cssfile" value="/oryx/css/feedback.css" />
 			<!-- configure subjects and info in localization: /editor/data/I18N#ORYX.I18N.Feedback.subjects  -->
@@ -333,8 +339,13 @@
 
 		<plugin source="fileRepository.js" name="ORYX.Plugins.FileRepositorySave" />
 
+		<plugin source="bpmn2xpdl20.js" name="ORYX.Plugins.BPMN2XPDL20" >
+			<requires namespace="http://b3mn.org/stencilset/bpmn1.1#"/>
+		</plugin>
+			
 	</plugins>
 
+	
 	<properties>
 		<property group="File" index="1" />
 		<property group="Edit" index="2" />	

editor/client/scripts/Plugins/plugins.xml

@@ -8,7 +8,7 @@
 		<plugin name="ORYX.Plugins.ShapeRepository"/>
 		<plugin name="ORYX.Plugins.PropertyWindow"/>
 		<plugin name="ORYX.Plugins.CanvasResize"/>
-		<plugin name="ORYX.Plugins.View"/>
+		<!-- plugin name="ORYX.Plugins.View"/ -->
 		<plugin name="ORYX.Plugins.DragDropResize"/>
 		<plugin name="ORYX.Plugins.RenameShapes" />
 		<plugin name="ORYX.Plugins.ERDFSupport" />
@@ -31,8 +31,10 @@
 		<plugin name="ORYX.Plugins.PluginLoader"/>
 		<plugin name="ORYX.Plugins.File"/>
 		<plugin name="ORYX.Plugins.Save"/>
-		<!--plugin source="Layouter/containerLayouter.js" name="ORYX.Plugins.ContainerLayouter" /-->
-		<plugin source="Layouter/edgeLayouter.js" name="ORYX.Plugins.Layouter.EdgeLayouter"/>				
+		<plugin source="Layouter/containerLayouter.js" name="ORYX.Plugins.ContainerLayouter" />
+		<plugin source="Layouter/edgeLayouter.js" name="ORYX.Plugins.Layouter.EdgeLayouter"/>
+		
+				
 	</profile>
 	<profile name="bpmn" depends="default" stencilset="stencilsets/bpmn1.1/bpmn1.1.json">
 		<plugin name="ORYX.Plugins.BPMN2XForms"/>
@@ -47,7 +49,7 @@
 		<plugin name="ORYX.Plugins.QueryResultHighlighter"/>
 		<plugin name="ORYX.Plugins.BpmnLayouter"/>
 		<plugin name="ORYX.Plugins.PNExport"/>
-		<plugin name="ORYX.Plugins.BPMN2XPDL"/>
+		<plugin name="ORYX.Plugins.BPMN2XPDL20"/>
 		<plugin name="ORYX.Plugins.BPMN2DTRPXMI"/>
 	</profile>
 	<profile name="bpmn2.0" depends="default" stencilset="stencilsets/bpmn2.0/bpmn2.0.json">
@@ -135,9 +137,6 @@
 		<plugin name="ORYX.Plugins.CPNToolsSupport"/>	
 	</profile>
 
-	<profile name="pms" depends="default">
-		<plugin name="ORYX.Plugins.FileRepositorySave" />
-	</profile>
 	<profile name="uml2.2" depends="default" stencilset="stencilsets/uml2.2/uml2.2.json">
 
 		<plugin name="ORYX.Plugins.UML"/>

editor/client/scripts/Plugins/profiles.xml

@@ -57,8 +57,13 @@ ORYX.CONFIG.BPMN_LAYOUTER =				ORYX.CONFIG.ROOT_PATH + "bpmnlayouter";
 ORYX.CONFIG.EPC_LAYOUTER =				ORYX.CONFIG.ROOT_PATH + "epclayouter";
 ORYX.CONFIG.BPMN2MIGRATION =			ORYX.CONFIG.ROOT_PATH + "bpmn2migration";
 ORYX.CONFIG.BPMN20_SCHEMA_VALIDATION_ON = true;
+ORYX.CONFIG.JPDLIMPORTURL =				ORYX.CONFIG.ROOT_PATH + "jpdlimporter";
+ORYX.CONFIG.JPDLEXPORTURL =				ORYX.CONFIG.ROOT_PATH + "jpdlexporter";
 ORYX.CONFIG.CPNTOOLSEXPORTER = 			ORYX.CONFIG.ROOT_PATH + "cpntoolsexporter";
 ORYX.CONFIG.CPNTOOLSIMPORTER = 			ORYX.CONFIG.ROOT_PATH + "cpntoolsimporter";
+ORYX.CONFIG.BPMN2XPDLPATH =				ORYX.CONFIG.ROOT_PATH + "bpmn2xpdl";
+
+
 
 	/* Namespaces */
 ORYX.CONFIG.NAMESPACE_ORYX =			"http://www.b3mn.org/oryx";

editor/client/scripts/config.js

@@ -491,6 +491,14 @@ Ext.MessageBox.buttonText.ok = "OK";
 if(!ORYX.I18N.BPMN2XPDL) ORYX.I18N.BPMN2XPDL = {};
 ORYX.I18N.BPMN2XPDL.group = "Export";
 ORYX.I18N.BPMN2XPDL.xpdlExport = "Export to XPDL";
+ORYX.I18N.BPMN2XPDL.xpdlImport = "Import from XPDL";
+ORYX.I18N.BPMN2XPDL.importGroup = "Import";
+ORYX.I18N.BPMN2XPDL.selectFile = "Select a XPDL (.xml) file or type in the XPDL to import it!";
+ORYX.I18N.BPMN2XPDL.file = "File";
+ORYX.I18N.BPMN2XPDL.impXPDL = "Import XPDL";
+ORYX.I18N.BPMN2XPDL.impBtn = "Import";
+ORYX.I18N.BPMN2XPDL.impProgress = "Importing...";
+ORYX.I18N.BPMN2XPDL.close = "Close";
 
 /** Resource Perspective Additions: 24 March 2009 */
 if(!ORYX.I18N.ResourcesSoDAdd) ORYX.I18N.ResourcesSoDAdd = {};
@@ -815,6 +823,7 @@ ORYX.I18N.cpntoolsSupport.importLable = "Import";
 ORYX.I18N.cpntoolsSupport.close = "Close";
 ORYX.I18N.cpntoolsSupport.wrongCPNFile = "Not chosen correct CPN - File.";
 ORYX.I18N.cpntoolsSupport.noPageSelection = "No page has been selected.";
+ORYX.I18N.cpntoolsSupport.group = "Export";
 ORYX.I18N.cpntoolsSupport.importProgress = "Importing ...";
 ORYX.I18N.cpntoolsSupport.exportProgress = "Exporting ...";
 ORYX.I18N.cpntoolsSupport.exportDescription = "Export to CPN Tools";