You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/09/12 00:39:35 UTC
svn commit: r574712 - in
/incubator/tuscany/java/sca/modules/implementation-bpel: ./
src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/
src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/
src/test/java/org/apache/tuscany/sca/i...
Author: lresende
Date: Tue Sep 11 15:39:30 2007
New Revision: 574712
URL: http://svn.apache.org/viewvc?rev=574712&view=rev
Log:
Trying to invoke a process deployed in the EmbeddedODEServer
Added:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCaseFIXME.java
- copied, changed from r574699, incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
Removed:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?rev=574712&r1=574711&r2=574712&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Tue Sep 11 15:39:30 2007
@@ -183,7 +183,17 @@
<artifactId>ode-bpel-obj</artifactId>
<version>1.0-incubating</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob</artifactId>
+ <version>1.0-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob-ap</artifactId>
+ <version>1.0-incubating</version>
+ </dependency>
+
<!-- ODE Dependencies -->
<dependency>
<groupId>commons-logging</groupId>
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?rev=574712&r1=574711&r2=574712&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java Tue Sep 11 15:39:30 2007
@@ -73,6 +73,11 @@
private Scheduler _scheduler;
+
+ public EmbeddedODEServer(TransactionManager txMgr) {
+ _txMgr = txMgr;
+ }
+
public void init() throws ODEInitializationException {
_config = new OdeConfigProperties(new Properties(), "ode-sca");
@@ -99,12 +104,14 @@
}
private void initTxMgr() {
- try {
- GeronimoTxFactory txFactory = new GeronimoTxFactory();
- _txMgr = txFactory.getTransactionManager();
- } catch (Exception e) {
- __log.fatal("Couldn't initialize a transaction manager using Geronimo's transaction factory.", e);
- throw new ODEInitializationException("Couldn't initialize a transaction manager using " + "Geronimo's transaction factory.", e);
+ if(_txMgr == null) {
+ try {
+ GeronimoTxFactory txFactory = new GeronimoTxFactory();
+ _txMgr = txFactory.getTransactionManager();
+ } catch (Exception e) {
+ __log.fatal("Couldn't initialize a transaction manager using Geronimo's transaction factory.", e);
+ throw new ODEInitializationException("Couldn't initialize a transaction manager using " + "Geronimo's transaction factory.", e);
+ }
}
}
@@ -190,6 +197,10 @@
public BpelServerImpl getBpelServer() {
return _bpelServer;
}
+
+ public Scheduler getScheduler() {
+ return _scheduler;
+ }
public void deploy(ODEDeployment d) {
Collection<QName> procs;
@@ -202,7 +213,7 @@
System.out.println(d + "DEPLOY: Unexpected exception: " + ex.getMessage());
return;
}
-
+
try {
for (QName procName : procs) {
ProcessConf conf = (ProcessConf) store.getProcessConfiguration(procName);
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java?rev=574712&r1=574711&r2=574712&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProviderFactory.java Tue Sep 11 15:39:30 2007
@@ -37,7 +37,7 @@
* @param odeServer the server instance passed to the implementation provider
*/
public BPELImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
- this.odeServer = new EmbeddedODEServer();
+ this.odeServer = new EmbeddedODEServer(null);
}
public ImplementationProvider createImplementationProvider(RuntimeComponent component, BPELImplementation implementation) {
Copied: incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCaseFIXME.java (from r574699, incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCaseFIXME.java?p2=incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCaseFIXME.java&p1=incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java&r1=574699&r2=574712&rev=574712&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCaseFIXME.java Tue Sep 11 15:39:30 2007
@@ -22,39 +22,99 @@
import java.io.File;
import java.net.URL;
+import javax.transaction.TransactionManager;
+import javax.xml.namespace.QName;
+
import junit.framework.TestCase;
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.apache.ode.bpel.iapi.MessageExchange.Status;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange.CorrelationStatus;
+import org.apache.ode.utils.DOMUtils;
+import org.apache.ode.utils.GUID;
import org.apache.tuscany.sca.implementation.bpel.ode.EmbeddedODEServer;
+import org.apache.tuscany.sca.implementation.bpel.ode.GeronimoTxFactory;
import org.apache.tuscany.sca.implementation.bpel.ode.ODEDeployment;
/**
+ * Test to Deploy and Invoke a HelloWorld BPEL process using EmbeddedODEServer
+ *
* @version $Rev$ $Date$
*/
-public class EmbeddedODEServerTestCase extends TestCase {
+public class EmbeddedODEServerTestCaseFIXME extends TestCase {
private EmbeddedODEServer odeServer;
-
+
+ private TransactionManager txMgr;
+
@Override
protected void setUp() throws Exception {
- this.odeServer = new EmbeddedODEServer();
+ GeronimoTxFactory txFactory = new GeronimoTxFactory();
+ txMgr = txFactory.getTransactionManager();
+
+ this.odeServer = new EmbeddedODEServer(txMgr);
odeServer.init();
}
-
+
@Override
protected void tearDown() throws Exception {
odeServer.stop();
}
-
- public void testProcessInvocation() throws Exception{
- if(! odeServer.isInitialized()) {
+
+ public void testProcessInvocation() throws Exception {
+ if (!odeServer.isInitialized()) {
fail("Server did not start !");
}
-
+
URL deployURL = getClass().getClassLoader().getResource("deploy.xml");
File deploymentDir = new File(deployURL.toURI().getPath()).getParentFile();
System.out.println(deploymentDir);
- if(odeServer.isInitialized()) {
- odeServer.deploy(new ODEDeployment(deploymentDir));
+ if (odeServer.isInitialized()) {
+
+ txMgr.begin();
+ try {
+ odeServer.deploy(new ODEDeployment(deploymentDir));
+ } catch (Exception e) {
+ txMgr.rollback();
+ } finally {
+ txMgr.commit();
+ }
+
+ odeServer.getScheduler().start();
+
+ // transaction one
+ txMgr.begin();
+ MyRoleMessageExchange mex = null;
+ try {
+ // invoke the process
+ mex = odeServer.getBpelServer().getEngine().createMessageExchange(new GUID().toString(),
+ new QName("http://tuscany.apache.org/implementation/bpel/example/helloworld", "HelloWorld"), "hello");
+
+ Message request = mex.createMessage(new QName("", ""));
+ request.setMessage(DOMUtils.stringToDOM("<message><TestPart>Hello</TestPart></message>"));
+ mex.invoke(request);
+ } catch (Exception e) {
+ txMgr.rollback();
+ } finally {
+ txMgr.commit();
+ }
+
+ // - end of transaction one
+
+ // transaction two
+ txMgr.begin();
+ try {
+ Status status = mex.getStatus();
+ System.out.println("Status" + status.name());
+ CorrelationStatus cstatus = mex.getCorrelationStatus();
+ System.out.println("CorrelationStatus" + cstatus.name());
+ // end of transaction two
+ } catch (Exception e) {
+ txMgr.rollback();
+ } finally {
+ txMgr.commit();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org