BZ 994408 - jBPM engine does not support boundary event on Service Task

kiegroup · Nov 13, 2013 · 63177f0 · 63177f0
1 parent c2d9429
commit 63177f0
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 6 deletions.
diff --git a/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/dragDocker.js b/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/dragDocker.js
diff --git a/...-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/dragdropresize.js b/...-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/dragdropresize.js
@@ -352,7 +352,6 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 			this.containmentParentNode = this.facade.getCanvas();
 
 		} else {
-
 			/* Check the containment and connection rules */
 			var options = {
 				event : event,
@@ -456,7 +455,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
             if(this.containmentParentNode && this.containmentParentNode.properties['oryx-tasktype'] && this.containmentParentNode.properties['oryx-tasktype'] == "Script") {
                 this.isAttachingAllowed = false;
             }
-			
+
 			if ( this.isAttachingAllowed	) {
 				var point = this.facade.eventCoordinates(event);
 				this.isAttachingAllowed	= this.containmentParentNode.isPointOverOffset( point.x, point.y );

diff --git a/...r-client/src/main/resources/org/jbpm/designer/public/js/Plugins/queryResultHighlighter.js b/...r-client/src/main/resources/org/jbpm/designer/public/js/Plugins/queryResultHighlighter.js
@@ -178,7 +178,7 @@ ORYX.Plugins.QueryResultHighlighter = ORYX.Plugins.AbstractPlugin.extend({
 
 	highlightSelectedTask: function(shape){ //edge marking of selected/ given task
 		if(!(shape instanceof ORYX.Core.Shape)) return;
-		this.facade.raiseEvent({
+        this.facade.raiseEvent({
 			type:			ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW, 
 			highlightId:	shape.id,
 			elements:		[shape],

diff --git a/...signer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/shapeHighlighting.js b/...signer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/shapeHighlighting.js
diff --git a/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/shapemenu.js b/jbpm-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/shapemenu.js
@@ -732,7 +732,7 @@ ORYX.Plugins.ShapeMenuPlugin = {
 
 				this._currentReference = canConnect ? candidate : undefined;		
 
-			}	
+			}
 
 			this.facade.raiseEvent({
 											type:		ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW, 

diff --git a/...designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/shaperepository.js b/...designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/shaperepository.js
@@ -446,6 +446,9 @@ ORYX.Plugins.ShapeRepository = {
 												edgeStencil: stencil,
 												targetStencil: stencil
 											});
+                        if(parentCandidate && parentCandidate.properties['oryx-tasktype'] && parentCandidate.properties['oryx-tasktype'] == "Script") {
+                            this._canAttach = false;
+                        }
 
 						if( this._canAttach ){
 							// Show Highlight

diff --git a/...n/resources/org/jbpm/designer/public/stencilsets/bpmn2.0jbpm/stencildata/bpmn2.0jbpm.orig b/...n/resources/org/jbpm/designer/public/stencilsets/bpmn2.0jbpm/stencildata/bpmn2.0jbpm.orig
@@ -9429,6 +9429,30 @@
 						"from":"Task",
 						"to":["IntermediateEventOnActivityBoundary"]
 					},
+                    {
+                        "from":"UserTask",
+                        "to":["IntermediateEventOnActivityBoundary"]
+                    },
+                    {
+                        "from":"SendTask",
+                        "to":["IntermediateEventOnActivityBoundary"]
+                    },
+                    {
+                        "from":"ReceiveTask",
+                        "to":["IntermediateEventOnActivityBoundary"]
+                    },
+                    {
+                        "from":"ManualTask",
+                        "to":["IntermediateEventOnActivityBoundary"]
+                    },
+                    {
+                        "from":"ServiceTask",
+                        "to":["IntermediateEventOnActivityBoundary"]
+                    },
+                    {
+                        "from":"Business RuleTask",
+                        "to":["IntermediateEventOnActivityBoundary"]
+                    },
 					$workitemDefs:{k|
                         $bopen$
                                                 "from":"$workitemDefs.(k).name$",