[jboss-svn-commits] JBL Code SVN: r27465 - labs/jbossrules/trunk/drools-process/drools-ode/src/main/java/org/drools/ode/instance.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2009-07-02 20:52:35 -0400 (Thu, 02 Jul 2009)
New Revision: 27465

Modified:
   labs/jbossrules/trunk/drools-process/drools-ode/src/main/java/org/drools/ode/instance/BPELEventListener.java
   labs/jbossrules/trunk/drools-process/drools-ode/src/main/java/org/drools/ode/instance/EmbeddedBPELServer.java
Log:
JBRULES-2153: ODE integration
 - small fixes

Modified: labs/jbossrules/trunk/drools-process/drools-ode/src/main/java/org/drools/ode/instance/BPELEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-ode/src/main/java/org/drools/ode/instance/BPELEventListener.java	2009-07-03 00:35:19 UTC (rev 27464)
+++ labs/jbossrules/trunk/drools-process/drools-ode/src/main/java/org/drools/ode/instance/BPELEventListener.java	2009-07-03 00:52:35 UTC (rev 27465)
@@ -50,22 +50,26 @@
 				processInstance.setState(ProcessInstance.STATE_COMPLETED);
 			} else if (event instanceof ActivityExecStartEvent) {
 				ActivityExecStartEvent execEvent = (ActivityExecStartEvent) event;
-				BPELProcessInstance processInstance = findProcessInstance(execEvent.getProcessInstanceId());
-				BPELNodeInstance nodeInstance = createNodeInstance(
-					processInstance, execEvent.getActivityId(),
-					execEvent.getActivityDeclarationId(),
-					execEvent.getActivityName());
-				((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeTriggered(nodeInstance, null);
-				((EventSupport) workingMemory).getRuleFlowEventSupport().fireAfterRuleFlowNodeTriggered(nodeInstance, null);
+				if (execEvent.getActivityName() != null) {
+    				BPELProcessInstance processInstance = findProcessInstance(execEvent.getProcessInstanceId());
+    				BPELNodeInstance nodeInstance = createNodeInstance(
+    					processInstance, execEvent.getActivityId(),
+    					execEvent.getActivityDeclarationId(),
+    					execEvent.getActivityName());
+    				((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeTriggered(nodeInstance, null);
+    				((EventSupport) workingMemory).getRuleFlowEventSupport().fireAfterRuleFlowNodeTriggered(nodeInstance, null);
+				}
 			} else if (event instanceof ActivityExecEndEvent) {
 				ActivityExecEndEvent execEvent = (ActivityExecEndEvent) event;
-				BPELProcessInstance processInstance = findProcessInstance(execEvent.getProcessInstanceId());
-				BPELNodeInstance nodeInstance = createNodeInstance(
-					processInstance, execEvent.getActivityId(),
-					execEvent.getActivityDeclarationId(),
-					execEvent.getActivityName());
-				((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeLeft(nodeInstance, null);
-				((EventSupport) workingMemory).getRuleFlowEventSupport().fireAfterRuleFlowNodeLeft(nodeInstance, null);
+                if (execEvent.getActivityName() != null) {
+    				BPELProcessInstance processInstance = findProcessInstance(execEvent.getProcessInstanceId());
+    				BPELNodeInstance nodeInstance = createNodeInstance(
+    					processInstance, execEvent.getActivityId(),
+    					execEvent.getActivityDeclarationId(),
+    					execEvent.getActivityName());
+    				((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeLeft(nodeInstance, null);
+    				((EventSupport) workingMemory).getRuleFlowEventSupport().fireAfterRuleFlowNodeLeft(nodeInstance, null);
+                }
 			}
 		} catch (Throwable t) {
 			t.printStackTrace();

Modified: labs/jbossrules/trunk/drools-process/drools-ode/src/main/java/org/drools/ode/instance/EmbeddedBPELServer.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-ode/src/main/java/org/drools/ode/instance/EmbeddedBPELServer.java	2009-07-03 00:35:19 UTC (rev 27464)
+++ labs/jbossrules/trunk/drools-process/drools-ode/src/main/java/org/drools/ode/instance/EmbeddedBPELServer.java	2009-07-03 00:52:35 UTC (rev 27465)
@@ -19,6 +19,8 @@
 import javax.wsdl.PortType;
 import javax.xml.namespace.QName;
 
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.ode.axis2.ExternalService;
 import org.apache.ode.axis2.SoapExternalService;
@@ -292,8 +294,10 @@
                 extService = new HttpExternalService(
             		pconf, serviceName, portName, _executorService, _scheduler, _server);
             } else if (WsdlUtils.useSOAPBinding(def, serviceName, portName)) {
+                AxisConfiguration config = ConfigurationContextFactory.
+                    createDefaultConfigurationContext().getAxisConfiguration();
                 extService = new SoapExternalService(
-            		pconf, serviceName, portName, _executorService, new AxisConfiguration(), _scheduler, _server);
+            		pconf, serviceName, portName, _executorService, config, _scheduler, _server);
             }
         } catch (Exception ex) {
             throw new ContextException("Error creating external service! name:"+serviceName+", port:"+portName, ex);