Author: mriou
Date: Tue Sep 11 20:18:54 2007
New Revision: 574776
URL: http://svn.apache.org/viewvc?rev=574776&view=rev
Log:
Added binding and mex context used by the engine to communicate with the
oustide world (enable endpoint, send to engine, receive, callback, ...)
Added:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.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/impl/BPELImplementationImpl.java
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.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=574776&r1=574775&r2=574776&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Tue Sep 11
20:18:54 2007
@@ -120,78 +120,78 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-epr</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-store</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-dao</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-dao</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-dao-jpa</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-runtime</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-api</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-scheduler-quartz</artifactId>
- <version>1.0-incubating</version>
+ <artifactId>ode-scheduler-simple</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-utils</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-compiler</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-schemas</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-obj</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-jacob</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-jacob-ap</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
</dependency>
<!-- ODE Dependencies -->
@@ -326,7 +326,7 @@
<artifactItem>
<groupId>org.apache.ode</groupId>
<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
- <version>1.0-incubating</version>
+ <version>1.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java?rev=574776&r1=574775&r2=574776&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
Tue Sep 11 20:18:54 2007
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.InputStream;
import java.net.URL;
+import java.net.URI;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -149,7 +150,7 @@
return null;
}
- public URL getBaseURL() {
+ public URI getBaseURI() {
return null;
}
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=574776&r1=574775&r2=574776&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 20:18:54 2007
@@ -40,10 +40,12 @@
import org.apache.ode.bpel.iapi.ProcessStoreListener;
import org.apache.ode.bpel.iapi.Scheduler;
import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
-import org.apache.ode.bpel.scheduler.quartz.QuartzSchedulerImpl;
import org.apache.ode.il.config.OdeConfigProperties;
import org.apache.ode.il.dbutil.Database;
import org.apache.ode.store.ProcessStoreImpl;
+import org.apache.ode.scheduler.simple.SimpleScheduler;
+import org.apache.ode.scheduler.simple.JdbcDelegate;
+import org.apache.ode.utils.GUID;
/**
* Embedded ODE process server
@@ -146,8 +148,8 @@
_bpelServer.setDaoConnectionFactory(_daoCF);
_bpelServer.setInMemDaoConnectionFactory(new
BpelDAOConnectionFactoryImpl(_scheduler));
// _bpelServer.setEndpointReferenceContext(new
EndpointReferenceContextImpl(this));
- // _bpelServer.setMessageExchangeContext(new
MessageExchangeContextImpl(this));
- // _bpelServer.setBindingContext(new BindingContextImpl(this, _store));
+ _bpelServer.setMessageExchangeContext(new
ODEMessageExchangeContext(this));
+ _bpelServer.setBindingContext(new ODEBindingContext(this));
_bpelServer.setScheduler(_scheduler);
if (_config.isDehydrationEnabled()) {
CountLRUDehydrationPolicy dehy = new CountLRUDehydrationPolicy();
@@ -182,11 +184,9 @@
}
protected Scheduler createScheduler() {
- QuartzSchedulerImpl scheduler = new QuartzSchedulerImpl();
- scheduler.setExecutorService(_executor, 20);
+ SimpleScheduler scheduler = new SimpleScheduler(new
GUID().toString(),new JdbcDelegate(_db.getDataSource()));
scheduler.setTransactionManager(_txMgr);
- scheduler.setDataSource(_db.getDataSource());
- scheduler.init();
+
return scheduler;
}
Added:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java?rev=574776&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
(added)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
Tue Sep 11 20:18:54 2007
@@ -0,0 +1,43 @@
+package org.apache.tuscany.sca.implementation.bpel.ode;
+
+import org.apache.ode.bpel.iapi.BindingContext;
+import org.apache.ode.bpel.iapi.EndpointReference;
+import org.apache.ode.bpel.iapi.Endpoint;
+import org.apache.ode.bpel.iapi.PartnerRoleChannel;
+import org.w3c.dom.Document;
+
+import javax.xml.namespace.QName;
+import javax.wsdl.PortType;
+
+/**
+ * @author Matthieu Riou <[EMAIL PROTECTED]>
+ */
+public class ODEBindingContext implements BindingContext {
+
+ private EmbeddedODEServer _server;
+
+ public ODEBindingContext(EmbeddedODEServer _server) {
+ this._server = _server;
+ }
+
+ public EndpointReference activateMyRoleEndpoint(QName pid, Endpoint
endpoint) {
+ return new TuscanyEPR();
+ }
+
+ public void deactivateMyRoleEndpoint(Endpoint endpoint) {
+ // TODO
+ }
+
+ public PartnerRoleChannel createPartnerRoleChannel(QName qName, PortType
portType, Endpoint endpoint) {
+ // TODO
+ return null;
+ }
+
+ // TODO This should hold something that makes sense for Tuscany so that
the process has
+ // an address that makes sense from the outside world perspective
+ private class TuscanyEPR implements EndpointReference {
+ public Document toXML() {
+ return null;
+ }
+ }
+}
Added:
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java?rev=574776&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
(added)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
Tue Sep 11 20:18:54 2007
@@ -0,0 +1,23 @@
+package org.apache.tuscany.sca.implementation.bpel.ode;
+
+import org.apache.ode.bpel.iapi.*;
+import org.apache.ode.utils.DOMUtils;
+
+/**
+ * @author Matthieu Riou <[EMAIL PROTECTED]>
+ */
+public class ODEMessageExchangeContext implements MessageExchangeContext {
+ private EmbeddedODEServer _server;
+
+ public ODEMessageExchangeContext(EmbeddedODEServer _server) {
+ this._server = _server;
+ }
+
+ public void invokePartner(PartnerRoleMessageExchange
partnerRoleMessageExchange) throws ContextException {
+ // TODO necessary to invoke an external service
+ }
+
+ public void onAsyncReply(MyRoleMessageExchange myRoleMessageExchange)
throws BpelEngineException {
+ // TODO necessary to get the reply when is returned asynchronously (in
a different thread)
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]