You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2006/11/01 01:05:45 UTC
svn commit: r469714 [4/4] - in /incubator/ode/trunk: ./ axis2/
axis2/src/main/java/org/apache/ode/axis2/
axis2/src/main/java/org/apache/ode/axis2/deploy/
axis2/src/main/java/org/apache/ode/axis2/service/
bpel-api/src/main/java/org/apache/ode/bpel/iapi/...
Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java?view=diff&rev=469714&r1=469713&r2=469714
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java Tue Oct 31 16:05:42 2006
@@ -18,30 +18,29 @@
*/
package org.apache.ode.jbi;
-import java.util.ArrayList;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-
-import javax.jbi.component.ComponentContext;
-import javax.jbi.messaging.DeliveryChannel;
-import javax.jbi.messaging.NormalizedMessage;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-import javax.wsdl.Operation;
-import javax.xml.namespace.QName;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
import org.apache.ode.bpel.engine.BpelServerImpl;
import org.apache.ode.bpel.iapi.Endpoint;
+import org.apache.ode.bpel.iapi.ProcessStore;
import org.apache.ode.bpel.scheduler.quartz.QuartzSchedulerImpl;
import org.apache.ode.jbi.msgmap.Mapper;
import org.w3c.dom.Document;
+import javax.jbi.component.ComponentContext;
+import javax.jbi.messaging.DeliveryChannel;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import javax.wsdl.Operation;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+
/**
* Encapsulation of all the junk needed to get the BPEL engine running.
*
@@ -83,6 +82,8 @@
OdeConfigProperties _config;
DataSource _dataSource;
+
+ ProcessStore _store;
/** Mapping of Endpoint to OdeService */
private Map<Endpoint, OdeService> _activeOdeServices = new ConcurrentHashMap<Endpoint, OdeService>();
Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?view=diff&rev=469714&r1=469713&r2=469714
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java Tue Oct 31 16:05:42 2006
@@ -19,25 +19,6 @@
package org.apache.ode.jbi;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.util.HashMap;
-import java.util.Properties;
-import java.util.concurrent.Executors;
-
-import javax.jbi.JBIException;
-import javax.jbi.component.ComponentContext;
-import javax.jbi.component.ComponentLifeCycle;
-import javax.jbi.component.ServiceUnitManager;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.derby.jdbc.EmbeddedDriver;
@@ -49,6 +30,7 @@
import org.apache.ode.daohib.SessionManager;
import org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl;
import org.apache.ode.jbi.msgmap.Mapper;
+import org.apache.ode.store.ProcessStoreImpl;
import org.apache.ode.utils.fs.TempFileManager;
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
@@ -56,6 +38,24 @@
import org.opentools.minerva.MinervaPool;
import org.opentools.minerva.MinervaPool.PoolType;
+import javax.jbi.JBIException;
+import javax.jbi.component.ComponentContext;
+import javax.jbi.component.ComponentLifeCycle;
+import javax.jbi.component.ServiceUnitManager;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.concurrent.Executors;
+
/**
* This class implements ComponentLifeCycle. The JBI framework will start this
* engine class automatically when JBI framework starts up.
@@ -63,25 +63,16 @@
public class OdeLifeCycle implements ComponentLifeCycle {
private static final String DEFAULT_HIBERNATE_DIALECT = "org.hibernate.dialect.DerbyDialect";
-
private static final Messages __msgs = Messages.getMessages(Messages.class);
-
private static final Log __log = LogFactory.getLog(OdeLifeCycle.class);
private OdeSUManager _suManager = null;
-
private boolean _initSuccess = false;
-
private OdeContext _ode;
-
private Receiver _receiver;
-
private boolean _started;
-
private boolean _needDerbyShutdown;
-
private String _derbyUrl;
-
private BpelServerConnector _connector;
ServiceUnitManager getSUManager() {
@@ -244,9 +235,8 @@
}
_ode._server = new BpelServerImpl();
- // We don't want the server to automatically activate deployed processes,
+ // We don't want the server to automatically load deployed processes,
// we'll do that explcitly
- _ode._server.setAutoActivate(true);
_ode._eprContext = new EndpointReferenceContextImpl(_ode);
_ode._mexContext = new MessageExchangeContextImpl(_ode);
_ode._executorService = Executors.newCachedThreadPool();
@@ -258,11 +248,15 @@
_ode._scheduler.setDataSource(_ode._dataSource);
_ode._scheduler.init();
+ _ode._store = new ProcessStoreImpl(new File("."), _ode._dataSource);
+
_ode._server.setDaoConnectionFactory(_ode._daocf);
_ode._server.setEndpointReferenceContext(_ode._eprContext);
_ode._server.setMessageExchangeContext(_ode._mexContext);
_ode._server.setBindingContext(new BindingContextImpl(_ode));
_ode._server.setScheduler(_ode._scheduler);
+ _ode._server.setProcessStore(_ode._store);
+
_ode._server.init();
}
Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java?view=diff&rev=469714&r1=469713&r2=469714
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeServiceUnit.java Tue Oct 31 16:05:42 2006
@@ -19,13 +19,14 @@
package org.apache.ode.jbi;
-import java.io.File;
-
-import javax.jbi.management.DeploymentException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.jbi.management.DeploymentException;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.util.Collection;
+
/**
* Representation of a JBI service unit. A JBI service unit may actually consist
* of multiple processes.
@@ -54,7 +55,11 @@
public void deploy() throws DeploymentException {
try {
- _ode._server.deploy(_serviceUnitRootPath);
+ Collection<QName> deployed = _ode._store.deploy(_serviceUnitRootPath);
+ for (QName pqname : deployed) {
+ _ode._server.load(pqname, true);
+ }
+
} catch (Exception ex) {
String errmsg = __msgs.msgOdeProcessDeploymentFailed(_serviceUnitRootPath, _serviceUnitID);
__log.error(errmsg, ex);
@@ -64,7 +69,11 @@
public void undeploy() throws Exception {
try {
- _ode._server.undeploy(_serviceUnitRootPath);
+ Collection<QName> undeployed = _ode._store.undeploy(_serviceUnitRootPath);
+ for (QName pqname : undeployed) {
+ _ode._server.unload(pqname, true);
+ }
+
} catch (Exception ex) {
String errmsg = __msgs.msgOdeProcessUndeploymentFailed(null);
__log.error(errmsg, ex);
@@ -87,20 +96,20 @@
// Exception e = null;
// for (QName pid : _pids) {
// try {
-// _ode._server.activate(pid, false);
+// _ode._server.load(pid, false);
// activated.add(pid);
// } catch (Exception ex) {
// e = ex;
-// __log.error("Unable to activate " + pid, ex);
+// __log.error("Unable to load " + pid, ex);
// break;
// }
// }
// if (activated.size() != _pids.size()) {
// for (QName pid : activated)
// try {
-// _ode._server.deactivate(pid, true);
+// _ode._server.unload(pid, true);
// } catch (Exception ex) {
-// __log.error("Unable to deactivate " + pid, ex);
+// __log.error("Unable to unload " + pid, ex);
// }
// }
//
@@ -111,9 +120,9 @@
public void stop() throws Exception {
// for (QName pid : _pids) {
// try {
-// _ode._server.deactivate(pid, true);
+// _ode._server.unload(pid, true);
// } catch (Exception ex) {
-// __log.error("Unable to deactivate " + pid, ex);
+// __log.error("Unable to unload " + pid, ex);
// }
// }
}
Modified: incubator/ode/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/pom.xml?view=diff&rev=469714&r1=469713&r2=469714
==============================================================================
--- incubator/ode/trunk/pom.xml (original)
+++ incubator/ode/trunk/pom.xml Tue Oct 31 16:05:42 2006
@@ -113,6 +113,7 @@
<module>jacob</module>
+ <module>bpel-store</module>
<module>bpel-scripts</module>
<module>bpel-schemas</module>
<module>bpel-obj</module>
@@ -247,7 +248,7 @@
<name>ODE Maven2 repository</name>
<url>http://pxe.intalio.org/public/maven2</url>
</repository>
-<!-- Repository is down;
+<!-- Repository is down;
<repository>
<id>apache-incubator</id>
<name>Apache Incubator Repository</name>
@@ -259,12 +260,12 @@
<name>Maven Repository Switchboard</name>
<url>http://repo1.maven.org/maven2</url>
</repository>
-<!-- <repository>
+ <repository>
<id>ibiblio</id>
<name>ibiblio</name>
<url>http://www.ibiblio.org/maven2</url>
</repository>
- <repository>
+<!-- <repository>
<id>apache</id>
<name>Apache Repository</name>
<url>http://cvs.apache.org/repository</url>
@@ -299,11 +300,11 @@
<name>ibiblio</name>
<url>http://www.ibiblio.org/maven2</url>
</pluginRepository>
- <pluginRepository>
+ <!--pluginRepository>
<id>apache-incubator</id>
<name>Apache Incubator Repository</name>
<url>http://people.apache.org/repo/m2-incubating-repository</url>
- </pluginRepository>
+ </pluginRepository-->
</pluginRepositories>
@@ -384,6 +385,11 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-scripts</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-store</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>