Author: jeff.yuchang Date: 2010-06-15 09:26:13 -0400 (Tue, 15 Jun 2010) New Revision: 734 Modified: branches/riftsaw-jpa/distribution/src/main/release/db/bpel.properties branches/riftsaw-jpa/distribution/src/main/release/install/deployment.properties branches/riftsaw-jpa/integration-tests/pom.xml branches/riftsaw-jpa/pom.xml branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java Log: * fix the transaction issue, now only pass mexId, and then use it to get MEX from persistence layer. (almost make me crazy on finding this out. ;) Modified: branches/riftsaw-jpa/distribution/src/main/release/db/bpel.properties =================================================================== --- branches/riftsaw-jpa/distribution/src/main/release/db/bpel.properties 2010-06-15 13:09:12 UTC (rev 733) +++ branches/riftsaw-jpa/distribution/src/main/release/db/bpel.properties 2010-06-15 13:26:13 UTC (rev 734) @@ -110,11 +110,16 @@ bpel.jaxws.client.initializer.impl=(a)jaxws.client.initializer.impl@ +# all hibernate specific properties + hibernate.dialect=@dialect@ -hibernate.hbm2ddl.auto=update +hibernate.hbm2ddl.auto=none hibernate.current_session_context_class=jta hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup +hibernate.show_sql=false +hibernate.connection.isolation=2 + jta.UserTransaction=UserTransaction ode.persistence=hibernate Modified: branches/riftsaw-jpa/distribution/src/main/release/install/deployment.properties =================================================================== --- branches/riftsaw-jpa/distribution/src/main/release/install/deployment.properties 2010-06-15 13:09:12 UTC (rev 733) +++ branches/riftsaw-jpa/distribution/src/main/release/install/deployment.properties 2010-06-15 13:26:13 UTC (rev 734) @@ -19,5 +19,5 @@ org.jboss.esb.home=/var/local/jbossesb-4.7 # database -# (e.g. hsql derby mysql) +# (e.g. hsql postgres mysql) database=hsql Modified: branches/riftsaw-jpa/integration-tests/pom.xml =================================================================== --- branches/riftsaw-jpa/integration-tests/pom.xml 2010-06-15 13:09:12 UTC (rev 733) +++ branches/riftsaw-jpa/integration-tests/pom.xml 2010-06-15 13:26:13 UTC (rev 734) @@ -278,6 +278,7 @@ <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude> <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude> <exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude> + <exclude>**/*RiftSaw163*.java</exclude> </excludes> </configuration> <executions> Modified: branches/riftsaw-jpa/pom.xml =================================================================== --- branches/riftsaw-jpa/pom.xml 2010-06-15 13:09:12 UTC (rev 733) +++ branches/riftsaw-jpa/pom.xml 2010-06-15 13:26:13 UTC (rev 734) @@ -72,9 +72,9 @@ </profiles> <properties> - <riftsaw.ode.version>2.1.0.CR1-SNAPSHOT</riftsaw.ode.version> + <riftsaw.ode.version>2.1.0-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.1.0-SNAPSHOT</riftsaw.engine.version> - <bpm.console.version>2.1-SNAPSHOT</bpm.console.version> + <bpm.console.version>2.1</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> <jboss.version>5.1.0.GA</jboss.version> Modified: branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java =================================================================== --- branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-15 13:09:12 UTC (rev 733) +++ branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-15 13:26:13 UTC (rev 734) @@ -165,7 +165,8 @@ __log.error(errorMsg, e); throw new Exception(errorMsg); } - + + // Hopefully we have a response __log.debug("Handling response for MEX " + odeMex); boolean commit = false; @@ -758,4 +759,8 @@ { return _odeConfig; } + + public BpelServerImpl getBpelServer() { + return _bpelServer; + } } Modified: branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java =================================================================== --- branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-06-15 13:09:12 UTC (rev 733) +++ branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-06-15 13:26:13 UTC (rev 734) @@ -230,7 +230,7 @@ javax.xml.soap.SOAPHeader soapHeader = soapMessage.getSOAPHeader(); if (soapHeader==null) soapHeader = soapMessage.getSOAPPart().getEnvelope().addHeader(); for (Node headerNode : headerParts.values()) { - if (headerNode.getNodeType() == Node.ELEMENT_NODE) { + if (Node.ELEMENT_NODE == headerNode.getNodeType()) { if (getFirstChildWithName(new QName(headerNode.getNamespaceURI(), headerNode.getLocalName()),soapHeader) == null) { SOAPElement partElement = soapFactory.createElement((Element) headerNode); soapHeader.addChildElement(partElement); Modified: branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java =================================================================== --- branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-15 13:09:12 UTC (rev 733) +++ branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-15 13:26:13 UTC (rev 734) @@ -140,6 +140,8 @@ wsdlDefinition = wsdlReference.getDefinition(); wsdlUrl = wsdlReference.getWsdlURL(); } + + this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart()); isInitialized=true; } @@ -164,7 +166,7 @@ { // Defer the invoke until the transaction commits. Scheduler scheduler = executionEnvironment.getScheduler(); - executionCallable = new TwoWayCallable(mex); + executionCallable = new TwoWayCallable(mex.getMessageExchangeId()); scheduler.registerSynchronizer(new Scheduler.Synchronizer() { public void afterCompletion(boolean success) @@ -188,7 +190,7 @@ { // one-way invocation ExecutorService executorService = executionEnvironment.getExecutorService(); - executionCallable = new OneWayCallable(mex); + executionCallable = new OneWayCallable(mex.getMessageExchangeId()); executorService.submit(executionCallable); mex.replyOneWayOk(); @@ -197,10 +199,10 @@ private class TwoWayCallable implements Callable<Object> { - private PartnerRoleMessageExchange mex; + private String mexId; - public TwoWayCallable(PartnerRoleMessageExchange mex) { - this.mex = mex; + public TwoWayCallable(String mexId) { + this.mexId = mexId; } public Object call() throws Exception { @@ -208,6 +210,8 @@ return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){ public Object call() throws Exception { + //We need to get a new mex from persistence layer. + PartnerRoleMessageExchange mex = (PartnerRoleMessageExchange) engine.getBpelServer().getEngine().getMessageExchange(mexId); try { // Create SOAPMessage @@ -278,16 +282,18 @@ private class OneWayCallable implements Callable<Object> { - private PartnerRoleMessageExchange mex; + private String mexId; - public OneWayCallable(PartnerRoleMessageExchange mex) { - this.mex = mex; + public OneWayCallable(String mex) { + this.mexId = mexId; } public Object call() throws Exception { return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){ public Object call() throws Exception { + //We need to get a new mex from persistence layer. + PartnerRoleMessageExchange mex = (PartnerRoleMessageExchange) engine.getBpelServer().getEngine().getMessageExchange(mexId); try { // Create SOAPMessage @@ -365,7 +371,6 @@ if(null==dispatcher) { log.debug("Creating Dispatcher ("+this.id+") on " + wsdlUrl + ": "+serviceName); - this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart()); initializeStack(portName); Service service = Service.create(this.wsdlUrl, serviceName);