You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by je...@apache.org on 2010/08/18 06:51:45 UTC
svn commit: r986564 [2/4] - in /ode/trunk: ./ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/test/java/org/apache/ode/axis2/
axis2-war/src/test/java/org/apache/ode/axis2/instancecleanup/
axis2-war/src/test/java/org/apache/ode/bpel/dao/ axis2-war...
Modified: ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java (original)
+++ ode/trunk/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java Wed Aug 18 04:51:39 2010
@@ -19,18 +19,29 @@
package org.apache.ode.il.dbutil;
import java.io.File;
+import java.sql.SQLException;
+import java.util.Properties;
import javax.naming.InitialContext;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.dao.bpel.BpelDAOConnectionFactory;
-import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
+import org.apache.derby.jdbc.EmbeddedDriver;
+import org.apache.geronimo.connector.outbound.GenericConnectionManager;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.LocalTransactions;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.SinglePool;
+import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
+import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
import org.apache.ode.il.config.OdeConfigProperties;
import org.apache.ode.utils.LoggingInterceptor;
-
+import org.tranql.connector.jdbc.JDBCDriverMCF;
/**
* Does the dirty work of setting up / obtaining a DataSource based on the configuration in the {@link OdeConfigProperties} object.
@@ -43,11 +54,15 @@ public class Database {
private static final Messages __msgs = Messages.getMessages(Messages.class);
+ private static final int CONNECTION_MAX_WAIT_MILLIS = 30000;
+
+ private static final int CONNECTION_MAX_IDLE_MINUTES = 5;
+
private OdeConfigProperties _odeConfig;
private boolean _started;
- private DatabaseConnectionManager _connectionManager;
+ private GenericConnectionManager _connectionManager;
private TransactionManager _txm;
@@ -55,9 +70,9 @@ public class Database {
private File _workRoot;
- private boolean _needShutdown;
+ private boolean _needDerbyShutdown;
- private EmbeddedDatabase _embeddedDB;
+ private String _derbyUrl;
public Database(OdeConfigProperties props) {
if (props == null)
@@ -78,7 +93,7 @@ public class Database {
if (_started)
return;
- _needShutdown = false;
+ _needDerbyShutdown = false;
_datasource = null;
_connectionManager = null;
@@ -87,35 +102,42 @@ public class Database {
}
public synchronized void shutdown() {
- if (!_started) {
- return;
- }
+ if (!_started)
+ return;
- if (_connectionManager != null) {
- try {
- __log.debug("Stopping connection manager");
- _connectionManager.shutdown();
- } catch (Throwable t) {
- __log.warn("Exception while stopping connection manager: " + t.getMessage());
- } finally {
- _connectionManager = null;
- }
- }
+ if (_connectionManager != null)
+ try {
+ __log.debug("Stopping connection manager");
+ _connectionManager.doStop();
+ } catch (Throwable t) {
+ __log.warn("Exception while stopping connection manager: " + t.getMessage());
+ } finally {
+ _connectionManager = null;
+ }
- if (_needShutdown) {
- __log.debug("shutting down database.");
- _embeddedDB.shutdown();
+ if (_needDerbyShutdown) {
+ __log.debug("shutting down derby.");
+ EmbeddedDriver driver = new EmbeddedDriver();
+ try {
+ driver.connect(_derbyUrl + ";shutdown=true", new Properties());
+ } catch (SQLException ex) {
+ // Shutdown will always return an exeption!
+ if (ex.getErrorCode() != 45000)
+ __log.error("Error shutting down Derby: " + ex.getErrorCode(), ex);
- }
+ } catch (Throwable ex) {
+ __log.debug("Error shutting down Derby.", ex);
+ }
+ }
- _needShutdown = false;
+ _needDerbyShutdown = false;
_datasource = null;
_started = false;
}
public DataSource getDataSource() {
- DataSource ds = __logSql.isDebugEnabled() ? LoggingInterceptor.createLoggingDS(_datasource, __logSql) : _datasource;
- return ds;
+ //return __logSql.isDebugEnabled() ? new LoggingDataSourceWrapper(_datasource, __logSql) : _datasource;
+ return __logSql.isDebugEnabled() ? LoggingInterceptor.createLoggingDS(_datasource, __logSql) : _datasource;
}
private void initDataSource() throws DatabaseConfigException {
@@ -137,7 +159,7 @@ public class Database {
private void initExternalDb() throws DatabaseConfigException {
try {
_datasource = (DataSource) lookupInJndi(_odeConfig.getDbDataSource());
- __log.debug(__msgs.msgOdeUsingExternalDb(_odeConfig.getDbDataSource()));
+ __log.info(__msgs.msgOdeUsingExternalDb(_odeConfig.getDbDataSource()));
} catch (Exception ex) {
String msg = __msgs.msgOdeInitExternalDbFailed(_odeConfig.getDbDataSource());
__log.error(msg, ex);
@@ -146,34 +168,87 @@ public class Database {
}
private void initInternalDb() throws DatabaseConfigException {
- __log.debug(__msgs.msgOdeUsingInternalDb(_odeConfig.getDbIntenralJdbcUrl(), _odeConfig.getDbInternalJdbcDriverClass()));
+ __log.info(__msgs.msgOdeUsingInternalDb(_odeConfig.getDbIntenralJdbcUrl(), _odeConfig.getDbInternalJdbcDriverClass()));
initInternalDb(_odeConfig.getDbIntenralJdbcUrl(), _odeConfig.getDbInternalJdbcDriverClass(),
_odeConfig.getDbInternalUserName(), _odeConfig.getDbInternalPassword());
-
}
private void initInternalDb(String url, String driverClass, String username,String password) throws DatabaseConfigException {
- _connectionManager = new DatabaseConnectionManager(_txm,_odeConfig);
- _connectionManager.init(url, driverClass, username, password);
- _datasource = _connectionManager.getDataSource();
+
+ __log.debug("Creating connection pool for " + url + " with driver " + driverClass);
+ if (!(_txm instanceof RecoverableTransactionManager)) {
+ throw new RuntimeException("TransactionManager is not recoverable.");
+ }
+
+ TransactionSupport transactionSupport = LocalTransactions.INSTANCE;
+ ConnectionTracker connectionTracker = new ConnectionTrackingCoordinator();
+
+ PoolingSupport poolingSupport = new SinglePool(
+ _odeConfig.getPoolMaxSize(),
+ _odeConfig.getPoolMinSize(),
+ CONNECTION_MAX_WAIT_MILLIS,
+ CONNECTION_MAX_IDLE_MINUTES,
+ true, // match one
+ false, // match all
+ false); // select one assume match
+
+ _connectionManager = new GenericConnectionManager(
+ transactionSupport,
+ poolingSupport,
+ null,
+ connectionTracker,
+ (RecoverableTransactionManager) _txm,
+ getClass().getName(),
+ getClass().getClassLoader());
+
+
+ try {
+ javax.resource.spi.ManagedConnectionFactory mcf = null;
+ String mcfClass = _odeConfig.getDbInternalMCFClass();
+ if (mcfClass != null) {
+ Properties dbInternalMCFProps = _odeConfig.getDbInternalMCFProperties();
+ if (__log.isDebugEnabled()) {
+ __log.debug("Using internal DB MCF " + mcfClass + " " + dbInternalMCFProps);
+ }
+ mcf = (javax.resource.spi.ManagedConnectionFactory) Class.forName(mcfClass).newInstance();
+ BeanUtils.copyProperties(mcf, dbInternalMCFProps);
+ } else {
+ if (__log.isDebugEnabled()) {
+ __log.debug("Using internal DB JDBCDriverMCF");
+ }
+ JDBCDriverMCF mcf2 = new JDBCDriverMCF();
+ mcf = mcf2;
+ mcf2.setDriver(driverClass);
+ mcf2.setConnectionURL(url);
+ if (username != null) {
+ mcf2.setUserName(username);
+ }
+ if (password != null) {
+ mcf2.setPassword(password);
+ }
+ }
+ _connectionManager.doStart();
+ _datasource = (DataSource) mcf.createConnectionFactory(_connectionManager);
+ } catch (Exception ex) {
+ String errmsg = __msgs.msgOdeDbPoolStartupFailed(url);
+ __log.error(errmsg, ex);
+ throw new DatabaseConfigException(errmsg, ex);
+ }
}
/**
* Initialize embedded (DERBY) database.
*/
- private void initEmbeddedDb() throws DatabaseConfigException {
+ private void initEmbeddedDb() throws DatabaseConfigException {
- switch (_odeConfig.getDbEmbeddedType()) {
- case DERBY:
- _embeddedDB = new DerbyDatabase();
- break;
- default:
- _embeddedDB = new H2Database();
- }
- _embeddedDB.init(_workRoot,_odeConfig,_txm);
- _datasource = _embeddedDB.getDataSource();
- _needShutdown = true;
- }
+ String db = _odeConfig.getDbEmbeddedName();
+
+ String url = "jdbc:derby:" + _workRoot + "/" + db ;
+ __log.info("Using Embedded Derby: " + url);
+ _derbyUrl = url;
+ initInternalDb(url, org.apache.derby.jdbc.EmbeddedDriver.class.getName(),"sa",null);
+ _needDerbyShutdown = true;
+ }
@SuppressWarnings("unchecked")
private <T> T lookupInJndi(String objName) throws Exception {
@@ -197,40 +272,23 @@ public class Database {
}
}
- public BpelDAOConnectionFactory createDaoCF() throws DatabaseConfigException {
+ public BpelDAOConnectionFactoryJDBC createDaoCF() throws DatabaseConfigException {
String pClassName = _odeConfig.getDAOConnectionFactory();
- __log.debug(__msgs.msgOdeUsingDAOImpl(pClassName));
-
- BpelDAOConnectionFactory cf;
- try {
- cf = (BpelDAOConnectionFactory) Class.forName(pClassName).newInstance();
- } catch (Exception ex) {
- String errmsg = __msgs.msgDAOInstantiationFailed(pClassName);
- __log.error(errmsg, ex);
- throw new DatabaseConfigException(errmsg, ex);
- }
-
- cf.init(_odeConfig.getProperties(),_txm,getDataSource());
- return cf;
- }
-
-
- public ConfStoreDAOConnectionFactory createDaoStoreCF() throws DatabaseConfigException {
- String pClassName = _odeConfig.getDAOConfStoreConnectionFactory();
-
- __log.debug(__msgs.msgOdeUsingDAOImpl(pClassName));
+ __log.info(__msgs.msgOdeUsingDAOImpl(pClassName));
- ConfStoreDAOConnectionFactory cf;
+ BpelDAOConnectionFactoryJDBC cf;
try {
- cf = (ConfStoreDAOConnectionFactory) Class.forName(pClassName).newInstance();
+ cf = (BpelDAOConnectionFactoryJDBC) Class.forName(pClassName).newInstance();
} catch (Exception ex) {
String errmsg = __msgs.msgDAOInstantiationFailed(pClassName);
__log.error(errmsg, ex);
throw new DatabaseConfigException(errmsg, ex);
}
- cf.init(_odeConfig.getProperties(),_txm,getDataSource());
+ cf.setDataSource(getDataSource());
+ cf.setTransactionManager(_txm);
+ cf.init(_odeConfig.getProperties());
return cf;
}
Modified: ode/trunk/bpel-runtime/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/pom.xml?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/pom.xml (original)
+++ ode/trunk/bpel-runtime/pom.xml Wed Aug 18 04:51:39 2010
@@ -39,10 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-agents</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-api</artifactId>
</dependency>
<dependency>
@@ -85,11 +81,6 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-jpa-ojpa</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
<artifactId>ode-dao-hibernate</artifactId>
<scope>test</scope>
</dependency>
@@ -104,10 +95,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
@@ -119,6 +110,27 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-agents</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-dao</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
@@ -179,21 +191,18 @@
<artifactId>xercesImpl</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql-connector-derby-common</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
</dependencies>
<build>
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelDatabase.java Wed Aug 18 04:51:39 2010
@@ -22,9 +22,9 @@ package org.apache.ode.bpel.engine;
import javax.xml.namespace.QName;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
import org.apache.ode.bpel.iapi.Scheduler;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.BpelDAOConnectionFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java Wed Aug 18 04:51:39 2010
@@ -34,6 +34,9 @@ import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.evt.BpelEvent;
import org.apache.ode.bpel.iapi.BpelEngine;
import org.apache.ode.bpel.iapi.BpelEngineException;
@@ -61,9 +64,6 @@ import org.apache.ode.bpel.o.OConstants;
import org.apache.ode.bpel.o.OPartnerLink;
import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.bpel.runtime.InvalidProcessException;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelManagementFacadeImpl.java Wed Aug 18 04:51:39 2010
@@ -18,38 +18,24 @@
*/
package org.apache.ode.bpel.engine;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
import org.apache.ode.bpel.bdi.breaks.ActivityBreakpoint;
import org.apache.ode.bpel.bdi.breaks.Breakpoint;
import org.apache.ode.bpel.bdi.breaks.VariableModificationBreakpoint;
import org.apache.ode.bpel.common.CorrelationKey;
+import org.apache.ode.bpel.dao.*;
import org.apache.ode.bpel.iapi.BpelServer;
import org.apache.ode.bpel.iapi.ProcessStore;
import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.pmapi.BpelManagementFacade;
-import org.apache.ode.bpel.pmapi.EventInfoListDocument;
-import org.apache.ode.bpel.pmapi.InstanceNotFoundException;
-import org.apache.ode.bpel.pmapi.InvalidRequestException;
-import org.apache.ode.bpel.pmapi.ManagementException;
-import org.apache.ode.bpel.pmapi.ProcessingException;
+import org.apache.ode.bpel.pmapi.*;
import org.apache.ode.bpel.pmapi.TInstanceInfo.EventInfo;
import org.apache.ode.bpel.runtime.breaks.ActivityBreakpointImpl;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.CorrelationSetDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ScopeDAO;
-import org.apache.ode.dao.bpel.XmlDataDAO;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.uuid.UUIDGen;
import org.w3c.dom.Node;
+import javax.xml.namespace.QName;
+import java.util.*;
+
/**
* Implementation of the instance/process management interaction. This class implements
* the methods necessary to support process debugging. It also implements all the methods in the
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java Wed Aug 18 04:51:39 2010
@@ -21,12 +21,15 @@ package org.apache.ode.bpel.engine;
import java.io.InputStream;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import javax.wsdl.Fault;
import javax.xml.namespace.QName;
@@ -36,6 +39,13 @@ import org.apache.commons.logging.LogFac
import org.apache.ode.agents.memory.SizingAgent;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.common.ProcessState;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.DeferredProcessInstanceCleanable;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.engine.BpelProcess;
+import org.apache.ode.bpel.engine.MyRoleMessageExchangeImpl;
import org.apache.ode.bpel.engine.extvar.ExternalVariableConf;
import org.apache.ode.bpel.engine.extvar.ExternalVariableManager;
import org.apache.ode.bpel.evt.ProcessInstanceEvent;
@@ -49,6 +59,7 @@ import org.apache.ode.bpel.iapi.MessageE
import org.apache.ode.bpel.iapi.PartnerRoleChannel;
import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
import org.apache.ode.bpel.iapi.ProcessConf;
+import org.apache.ode.bpel.iapi.Scheduler;
import org.apache.ode.bpel.iapi.MessageExchange.Status;
import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY;
import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
@@ -68,10 +79,6 @@ import org.apache.ode.bpel.runtime.Inval
import org.apache.ode.bpel.runtime.PROCESS;
import org.apache.ode.bpel.runtime.PropertyAliasEvaluationContext;
import org.apache.ode.bpel.runtime.channels.FaultData;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.jacob.soup.ReplacementMap;
import org.apache.ode.utils.ObjectPrinter;
import org.apache.ode.utils.Properties;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcessDatabase.java Wed Aug 18 04:51:39 2010
@@ -18,9 +18,9 @@
*/
package org.apache.ode.bpel.engine;
+import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
+import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.iapi.Scheduler;
-import org.apache.ode.dao.bpel.BpelDAOConnectionFactory;
-import org.apache.ode.dao.bpel.ProcessDAO;
import javax.xml.namespace.QName;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java Wed Aug 18 04:51:39 2010
@@ -40,6 +40,17 @@ import org.apache.ode.bpel.common.Correl
import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.common.ProcessState;
+import org.apache.ode.bpel.dao.CorrelationSetDAO;
+import org.apache.ode.bpel.dao.CorrelatorDAO;
+import org.apache.ode.bpel.dao.MessageDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.MessageRouteDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ScopeDAO;
+import org.apache.ode.bpel.dao.ScopeStateEnum;
+import org.apache.ode.bpel.dao.XmlDataDAO;
import org.apache.ode.bpel.evar.ExternalVariableModuleException;
import org.apache.ode.bpel.evar.ExternalVariableModule.Value;
import org.apache.ode.bpel.evt.CorrelationSetWriteEvent;
@@ -98,17 +109,6 @@ import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.ObjectPrinter;
import org.apache.ode.bpel.evar.ExternalVariableModuleException;
import org.apache.ode.bpel.evar.ExternalVariableModule.Value;
-import org.apache.ode.dao.bpel.CorrelationSetDAO;
-import org.apache.ode.dao.bpel.CorrelatorDAO;
-import org.apache.ode.dao.bpel.MessageDAO;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
-import org.apache.ode.dao.bpel.MessageRouteDAO;
-import org.apache.ode.dao.bpel.PartnerLinkDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ScopeDAO;
-import org.apache.ode.dao.bpel.ScopeStateEnum;
-import org.apache.ode.dao.bpel.XmlDataDAO;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java Wed Aug 18 04:51:39 2010
@@ -35,6 +35,10 @@ import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
+import org.apache.ode.bpel.dao.DeferredProcessInstanceCleanable;
+import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.engine.cron.CronScheduler;
import org.apache.ode.bpel.engine.migration.MigrationHandler;
import org.apache.ode.bpel.evar.ExternalVariableModule;
@@ -55,10 +59,6 @@ import org.apache.ode.bpel.iapi.Schedule
import org.apache.ode.bpel.iapi.Scheduler.Synchronizer;
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.BpelDAOConnectionFactory;
-import org.apache.ode.dao.bpel.DeferredProcessInstanceCleanable;
-import org.apache.ode.dao.bpel.ProcessDAO;
import org.apache.ode.utils.msg.MessageBundle;
import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.stl.MemberOfFunction;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BrokeredMyRoleMessageExchangeImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BrokeredMyRoleMessageExchangeImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BrokeredMyRoleMessageExchangeImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BrokeredMyRoleMessageExchangeImpl.java Wed Aug 18 04:51:39 2010
@@ -28,12 +28,12 @@ import java.util.concurrent.TimeoutExcep
import javax.wsdl.Operation;
import javax.wsdl.PortType;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.iapi.BpelEngineException;
import org.apache.ode.bpel.iapi.EndpointReference;
import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
import org.apache.ode.bpel.iapi.ProcessState;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
/**
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/Contexts.java Wed Aug 18 04:51:39 2010
@@ -19,6 +19,7 @@
package org.apache.ode.bpel.engine;
+import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
import org.apache.ode.bpel.iapi.BindingContext;
import org.apache.ode.bpel.iapi.BpelEventListener;
import org.apache.ode.bpel.iapi.EndpointReferenceContext;
@@ -27,7 +28,6 @@ import org.apache.ode.bpel.iapi.Schedule
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
import org.apache.ode.bpel.engine.cron.CronScheduler;
import org.apache.ode.bpel.evar.ExternalVariableModule;
-import org.apache.ode.dao.bpel.BpelDAOConnectionFactory;
import java.util.HashMap;
import java.util.List;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DebuggerSupport.java Wed Aug 18 04:51:39 2010
@@ -25,6 +25,9 @@ import org.apache.ode.bpel.iapi.Schedule
import org.apache.ode.bpel.iapi.Scheduler.JobType;
import org.apache.ode.bpel.bdi.breaks.Breakpoint;
import org.apache.ode.bpel.common.ProcessState;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.evt.ActivityExecStartEvent;
import org.apache.ode.bpel.evt.BpelEvent;
import org.apache.ode.bpel.evt.ProcessCompletionEvent;
@@ -38,9 +41,6 @@ import org.apache.ode.bpel.pmapi.Instanc
import org.apache.ode.bpel.pmapi.ManagementException;
import org.apache.ode.bpel.pmapi.ProcessingException;
import org.apache.ode.bpel.runtime.breaks.BreakpointImpl;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.utils.CollectionUtils;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InterceptorContextImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InterceptorContextImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InterceptorContextImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InterceptorContextImpl.java Wed Aug 18 04:51:39 2010
@@ -18,11 +18,11 @@
*/
package org.apache.ode.bpel.engine;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.iapi.BpelEngine;
import org.apache.ode.bpel.iapi.ProcessConf;
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor.InterceptorContext;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.ProcessDAO;
/**
* Implementation of the {@link org.apache.ode.bpel.intercept.MessageExchangeInterceptor.InterceptorContext}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java Wed Aug 18 04:51:39 2010
@@ -21,12 +21,12 @@ package org.apache.ode.bpel.engine;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.MessageDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.iapi.BpelEngineException;
import org.apache.ode.bpel.iapi.EndpointReference;
import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.bpel.iapi.MessageExchange;
-import org.apache.ode.dao.bpel.MessageDAO;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
import org.apache.ode.utils.msg.MessageBundle;
import org.w3c.dom.Element;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageImpl.java Wed Aug 18 04:51:39 2010
@@ -31,8 +31,8 @@ import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
import org.w3c.dom.Document;
+import org.apache.ode.bpel.dao.MessageDAO;
import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.dao.bpel.MessageDAO;
import org.apache.ode.utils.DOMUtils;
public class MessageImpl implements Message {
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MexDaoUtil.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MexDaoUtil.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MexDaoUtil.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MexDaoUtil.java Wed Aug 18 04:51:39 2010
@@ -21,12 +21,12 @@ package org.apache.ode.bpel.engine;
import javax.xml.namespace.QName;
+import org.apache.ode.bpel.dao.MessageDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.bpel.iapi.MessageExchange;
import org.apache.ode.bpel.iapi.MessageExchange.FailureType;
import org.apache.ode.bpel.iapi.MessageExchange.Status;
-import org.apache.ode.dao.bpel.MessageDAO;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
import org.w3c.dom.Element;
/**
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImpl.java Wed Aug 18 04:51:39 2010
@@ -33,6 +33,7 @@ import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.engine.replayer.Replayer;
import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.bpel.iapi.MessageExchange;
@@ -47,7 +48,6 @@ import org.apache.ode.bpel.intercept.Fau
import org.apache.ode.bpel.intercept.InterceptorInvoker;
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor;
import org.apache.ode.bpel.intercept.MessageExchangeInterceptor.InterceptorContext;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java Wed Aug 18 04:51:39 2010
@@ -35,6 +35,10 @@ import org.apache.ode.bpel.common.Correl
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.common.InvalidMessageException;
import org.apache.ode.bpel.common.OptionalCorrelationKey;
+import org.apache.ode.bpel.dao.CorrelatorDAO;
+import org.apache.ode.bpel.dao.MessageRouteDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.evt.CorrelationMatchEvent;
import org.apache.ode.bpel.evt.CorrelationNoMatchEvent;
import org.apache.ode.bpel.evt.NewProcessInstanceEvent;
@@ -52,10 +56,6 @@ import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.runtime.InvalidProcessException;
import org.apache.ode.bpel.runtime.PROCESS;
-import org.apache.ode.dao.bpel.CorrelatorDAO;
-import org.apache.ode.dao.bpel.MessageRouteDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.utils.ObjectPrinter;
import org.apache.ode.utils.msg.MessageBundle;
import org.w3c.dom.Element;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java Wed Aug 18 04:51:39 2010
@@ -21,6 +21,7 @@ package org.apache.ode.bpel.engine;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.engine.replayer.Replayer;
import org.apache.ode.bpel.iapi.BpelEngineException;
import org.apache.ode.bpel.iapi.EndpointReference;
@@ -29,7 +30,6 @@ import org.apache.ode.bpel.iapi.PartnerR
import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
import org.apache.ode.bpel.iapi.Scheduler.JobType;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
import org.apache.ode.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java Wed Aug 18 04:51:39 2010
@@ -46,6 +46,16 @@ import org.apache.ode.bpel.common.BpelEv
import org.apache.ode.bpel.common.Filter;
import org.apache.ode.bpel.common.InstanceFilter;
import org.apache.ode.bpel.common.ProcessFilter;
+import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.CorrelationSetDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ScopeDAO;
+import org.apache.ode.bpel.dao.XmlDataDAO;
+import org.apache.ode.bpel.dao.ProcessManagementDAO.FailedSummaryValue;
+import org.apache.ode.bpel.dao.ProcessManagementDAO.InstanceSummaryKey;
import org.apache.ode.bpel.engine.replayer.Replayer;
import org.apache.ode.bpel.evt.ActivityEvent;
import org.apache.ode.bpel.evt.BpelEvent;
@@ -126,16 +136,6 @@ import org.apache.ode.bpel.pmapi.TScopeR
import org.apache.ode.bpel.pmapi.TVariableInfo;
import org.apache.ode.bpel.pmapi.TVariableRef;
import org.apache.ode.bpel.pmapi.VariableInfoDocument;
-import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.CorrelationSetDAO;
-import org.apache.ode.dao.bpel.PartnerLinkDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ScopeDAO;
-import org.apache.ode.dao.bpel.XmlDataDAO;
-import org.apache.ode.dao.bpel.ProcessManagementDAO.FailedSummaryValue;
-import org.apache.ode.dao.bpel.ProcessManagementDAO.InstanceSummaryKey;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.ISO8601DateParser;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessCleanUpRunnable.java Wed Aug 18 04:51:39 2010
@@ -26,11 +26,11 @@ import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.DeferredProcessInstanceCleanable;
+import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.engine.BpelServerImpl.ContextsAware;
import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
import org.apache.ode.bpel.iapi.Scheduler.MapSerializableRunnable;
-import org.apache.ode.dao.bpel.DeferredProcessInstanceCleanable;
-import org.apache.ode.dao.bpel.ProcessDAO;
public class ProcessCleanUpRunnable implements MapSerializableRunnable, ContextsAware {
private static final long serialVersionUID = 1L;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessStatusConverter.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessStatusConverter.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessStatusConverter.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessStatusConverter.java Wed Aug 18 04:51:39 2010
@@ -24,10 +24,10 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.ode.bpel.common.ProcessState;
+import org.apache.ode.bpel.dao.ScopeStateEnum;
import org.apache.ode.bpel.pmapi.ProcessingException;
import org.apache.ode.bpel.pmapi.TInstanceStatus;
import org.apache.ode.bpel.pmapi.TScopeStatus;
-import org.apache.ode.dao.bpel.ScopeStateEnum;
/**
* Class for converting status codes from external (PMAPI) to internal (DAO) representation.
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java Wed Aug 18 04:51:39 2010
@@ -28,14 +28,14 @@ import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.InstanceFilter;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.FilteredInstanceDeletable;
import org.apache.ode.bpel.engine.Contexts;
import org.apache.ode.bpel.engine.BpelServerImpl.ContextsAware;
import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY;
import org.apache.ode.bpel.iapi.ProcessConf.CleanupInfo;
import org.apache.ode.bpel.iapi.Scheduler.JobDetails;
import org.apache.ode.bpel.iapi.Scheduler.MapSerializableRunnable;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.FilteredInstanceDeletable;
public class RuntimeDataCleanupRunnable implements MapSerializableRunnable, ContextsAware {
private final Log _log = LogFactory.getLog(RuntimeDataCleanupRunnable.class);
Propchange: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/cron/RuntimeDataCleanupRunnable.java
('svn:mergeinfo' removed)
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeyMigration.java Wed Aug 18 04:51:39 2010
@@ -19,28 +19,24 @@
package org.apache.ode.bpel.engine.migration;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.wsdl.Operation;
-import javax.xml.namespace.QName;
-
+import org.apache.ode.bpel.engine.BpelProcess;
+import org.apache.ode.bpel.engine.ReplacementMapImpl;
+import org.apache.ode.bpel.engine.OutstandingRequestManager;
+import org.apache.ode.bpel.dao.*;
+import org.apache.ode.bpel.common.CorrelationKey;
+import org.apache.ode.bpel.o.*;
+import org.apache.ode.bpel.runtime.Selector;
+import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.bpel.engine.BpelProcess;
-import org.apache.ode.bpel.o.OBase;
-import org.apache.ode.bpel.o.OPartnerLink;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.CorrelationSetDAO;
-import org.apache.ode.dao.bpel.CorrelatorDAO;
-import org.apache.ode.dao.bpel.CorrelatorMessageDAO;
-import org.apache.ode.dao.bpel.MessageRouteDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+
+import javax.xml.namespace.QName;
+import javax.wsdl.Operation;
+import java.util.*;
+import java.io.ObjectStreamClass;
+import java.io.FileInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
/**
* Migrates the correlation key values to a scheme containing the OModel correlation
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetDataMigration.java Wed Aug 18 04:51:39 2010
@@ -20,13 +20,13 @@
package org.apache.ode.bpel.engine.migration;
import org.apache.ode.bpel.engine.BpelProcess;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.CorrelatorDAO;
+import org.apache.ode.bpel.dao.MessageRouteDAO;
import org.apache.ode.bpel.o.OPartnerLink;
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.CorrelationKeySet;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.CorrelatorDAO;
-import org.apache.ode.dao.bpel.MessageRouteDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelationKeySetMigration.java Wed Aug 18 04:51:39 2010
@@ -22,13 +22,13 @@ package org.apache.ode.bpel.engine.migra
import org.apache.ode.bpel.engine.BpelProcess;
import org.apache.ode.bpel.engine.OutstandingRequestManager;
import org.apache.ode.bpel.engine.ReplacementMapImpl;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.runtime.Selector;
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/CorrelatorsMigration.java Wed Aug 18 04:51:39 2010
@@ -20,10 +20,10 @@
package org.apache.ode.bpel.engine.migration;
import org.apache.ode.bpel.engine.BpelProcess;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.CorrelatorDAO;
import org.apache.ode.bpel.o.OPartnerLink;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.CorrelatorDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/Migration.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/Migration.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/Migration.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/Migration.java Wed Aug 18 04:51:39 2010
@@ -20,7 +20,7 @@
package org.apache.ode.bpel.engine.migration;
import org.apache.ode.bpel.engine.BpelProcess;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
import java.util.Set;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/MigrationHandler.java Wed Aug 18 04:51:39 2010
@@ -61,7 +61,7 @@ public class MigrationHandler {
}
public boolean migrate(final Set<BpelProcess> registeredProcesses, int migrationTransactionTimeout) {
- if (_contexts.dao.getConnection() == null) {
+ if (_contexts.dao.getDataSource() == null) {
__log.debug("No datasource available, stopping migration. Probably running fully in-memory.");
return true;
}
@@ -153,7 +153,7 @@ public class MigrationHandler {
PreparedStatement stmt = null;
ResultSet rs = null;
try {
- conn = null; //FIXME jpa refactoring work leftover
+ conn = _contexts.dao.getDataSource().getConnection();
stmt = conn.prepareStatement("SELECT VERSION FROM ODE_SCHEMA_VERSION");
rs = stmt.executeQuery();
if (rs.next()) version = rs.getInt("VERSION");
@@ -175,7 +175,7 @@ public class MigrationHandler {
Connection conn = null;
Statement stmt = null;
try {
- conn = null; //FIXME jpa refactoring work leftover
+ conn = _contexts.dao.getDataSource().getConnection();
stmt = conn.createStatement();
int res = stmt.executeUpdate("UPDATE ODE_SCHEMA_VERSION SET VERSION = " + version);
// This should never happen but who knows?
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/migration/OutstandingRequestsMigration.java Wed Aug 18 04:51:39 2010
@@ -27,12 +27,12 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.engine.BpelProcess;
import org.apache.ode.bpel.engine.IMAManager;
import org.apache.ode.bpel.engine.OutstandingRequestManager;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
/**
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/Replayer.java Wed Aug 18 04:51:39 2010
@@ -32,6 +32,10 @@ import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.engine.BpelEngineImpl;
import org.apache.ode.bpel.engine.BpelProcess;
import org.apache.ode.bpel.engine.MyRoleMessageExchangeImpl;
@@ -52,10 +56,6 @@ import org.apache.ode.bpel.pmapi.GetComm
import org.apache.ode.bpel.pmapi.Replay;
import org.apache.ode.bpel.pmapi.CommunicationType.Exchange;
import org.apache.ode.bpel.runtime.PROCESS;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.xmlbeans.XmlCalendar;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerBpelRuntimeContextImpl.java Wed Aug 18 04:51:39 2010
@@ -27,6 +27,10 @@ import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.FaultException;
+import org.apache.ode.bpel.dao.MessageDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.engine.BpelEngineImpl;
import org.apache.ode.bpel.engine.BpelProcess;
import org.apache.ode.bpel.engine.BpelRuntimeContextImpl;
@@ -46,10 +50,6 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.InvokeResponseChannel;
import org.apache.ode.bpel.runtime.channels.PickResponseChannel;
import org.apache.ode.bpel.runtime.channels.TimerResponseChannel;
-import org.apache.ode.dao.bpel.MessageDAO;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
-import org.apache.ode.dao.bpel.PartnerLinkDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.GUID;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerContext.java Wed Aug 18 04:51:39 2010
@@ -37,6 +37,8 @@ import net.sf.saxon.xqj.SaxonXQDataSourc
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.apache.ode.bpel.engine.BpelEngineImpl;
import org.apache.ode.bpel.engine.BpelProcess;
import org.apache.ode.bpel.engine.MyRoleMessageExchangeImpl;
@@ -51,8 +53,6 @@ import org.apache.ode.bpel.pmapi.Respons
import org.apache.ode.bpel.pmapi.CommunicationType.Exchange;
import org.apache.ode.bpel.pmapi.CommunicationType.ServiceConfig;
import org.apache.ode.bpel.runtime.PROCESS;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
import org.apache.ode.utils.DOMUtils;
import org.apache.xmlbeans.XmlAnySimpleType;
import org.apache.xmlbeans.XmlObject;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/replayer/ReplayerScheduler.java Wed Aug 18 04:51:39 2010
@@ -26,9 +26,9 @@ import java.util.concurrent.Future;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
import org.apache.ode.bpel.iapi.ContextException;
import org.apache.ode.bpel.iapi.Scheduler;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
/**
* Manages events invocation in sorted order during replaying.
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/MessageExchangeInterceptor.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/MessageExchangeInterceptor.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/MessageExchangeInterceptor.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/MessageExchangeInterceptor.java Wed Aug 18 04:51:39 2010
@@ -18,13 +18,13 @@
*/
package org.apache.ode.bpel.intercept;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.engine.BpelProcess;
import org.apache.ode.bpel.iapi.BpelEngine;
import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
import org.apache.ode.bpel.iapi.ProcessConf;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.ProcessDAO;
/**
* Hook into the BPEL server that enables intercepting of message exchange
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionFactoryImpl.java Wed Aug 18 04:51:39 2010
@@ -18,14 +18,12 @@
*/
package org.apache.ode.bpel.memdao;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.BpelDAOConnectionFactory;
import org.apache.ode.bpel.iapi.Scheduler;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.BpelDAOConnectionFactory;
import javax.xml.namespace.QName;
import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -51,6 +49,11 @@ public class BpelDAOConnectionFactoryImp
return new BpelDAOConnectionImpl(__StateStore, _scheduler, _mexTtl);
}
+ /**
+ * @see org.apache.ode.bpel.dao.BpelDAOConnectionFactory#init(java.util.Properties)
+ */
+ public void init(Properties properties) {
+ }
public void shutdown() {
}
@@ -58,7 +61,4 @@ public class BpelDAOConnectionFactoryImp
public DataSource getDataSource() {
return null;
}
- public <E> void init(Properties p, TransactionManager txm, E envCtx) {
-
- }
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/BpelDAOConnectionImpl.java Wed Aug 18 04:51:39 2010
@@ -24,14 +24,14 @@ import org.apache.ode.bpel.common.BpelEv
import org.apache.ode.bpel.common.Filter;
import org.apache.ode.bpel.common.InstanceFilter;
import org.apache.ode.bpel.common.ProcessFilter;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.CorrelationSetDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ScopeDAO;
import org.apache.ode.bpel.evt.BpelEvent;
import org.apache.ode.bpel.iapi.Scheduler;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.CorrelationSetDAO;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ScopeDAO;
import org.apache.ode.utils.ISO8601DateParser;
import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.stl.UnaryFunction;
@@ -332,7 +332,7 @@ class BpelDAOConnectionImpl implements B
}
/**
- * @see org.apache.ode.dao.bpel.BpelDAOConnection#instanceQuery(String)
+ * @see org.apache.ode.bpel.dao.BpelDAOConnection#instanceQuery(String)
*/
public Collection<ProcessInstanceDAO> instanceQuery(String expression) {
//TODO
@@ -388,8 +388,4 @@ class BpelDAOConnectionImpl implements B
public ProcessManagementDaoImpl getProcessManagement() {
return new ProcessManagementDaoImpl();
}
-
- public boolean isClosed() {
- return false;
- }
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelationSetDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelationSetDaoImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelationSetDaoImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelationSetDaoImpl.java Wed Aug 18 04:51:39 2010
@@ -19,10 +19,10 @@
package org.apache.ode.bpel.memdao;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.dao.bpel.CorrelationSetDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.bpel.dao.CorrelationSetDAO;
+import org.apache.ode.bpel.dao.ScopeDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import javax.xml.namespace.QName;
import java.util.HashMap;
@@ -44,7 +44,7 @@ class CorrelationSetDaoImpl extends DaoB
* @param name correlation set name
* @param scope the scope for which the correlation set is relevant
*/
- public CorrelationSetDaoImpl(String name, org.apache.ode.dao.bpel.ScopeDAO scope) {
+ public CorrelationSetDaoImpl(String name, org.apache.ode.bpel.dao.ScopeDAO scope) {
_name = name;
_scope = scope;
_csetId = IdGen.newCorrelationSetId();
@@ -55,14 +55,14 @@ class CorrelationSetDaoImpl extends DaoB
}
/**
- * @see org.apache.ode.dao.bpel.CorrelationSetDAO#getName()
+ * @see org.apache.ode.bpel.dao.CorrelationSetDAO#getName()
*/
public String getName() {
return _name;
}
/**
- * @see org.apache.ode.dao.bpel.CorrelationSetDAO#getScope()
+ * @see org.apache.ode.bpel.dao.CorrelationSetDAO#getScope()
*/
public ScopeDAO getScope() {
return _scope;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/CorrelatorDaoImpl.java Wed Aug 18 04:51:39 2010
@@ -18,20 +18,16 @@
*/
package org.apache.ode.bpel.memdao;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.CorrelationKeySet;
-import org.apache.ode.dao.bpel.CorrelatorDAO;
-import org.apache.ode.dao.bpel.CorrelatorMessageDAO;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
-import org.apache.ode.dao.bpel.MessageRouteDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Collection;
/**
* A very simple, in-memory implementation of the {@link CorrelatorDAO} interface.
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/FaultDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/FaultDaoImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/FaultDaoImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/FaultDaoImpl.java Wed Aug 18 04:51:39 2010
@@ -19,7 +19,7 @@
package org.apache.ode.bpel.memdao;
-import org.apache.ode.dao.bpel.FaultDAO;
+import org.apache.ode.bpel.dao.FaultDAO;
import org.apache.ode.utils.QNameUtils;
import org.w3c.dom.Element;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java Wed Aug 18 04:51:39 2010
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.memdao;
-import org.apache.ode.dao.bpel.MessageDAO;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.MessageDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java Wed Aug 18 04:51:39 2010
@@ -19,11 +19,11 @@
package org.apache.ode.bpel.memdao;
-import org.apache.ode.dao.bpel.MessageDAO;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
-import org.apache.ode.dao.bpel.PartnerLinkDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.MessageDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageRouteDaoImpl.java Wed Aug 18 04:51:39 2010
@@ -20,8 +20,8 @@ package org.apache.ode.bpel.memdao;
import org.apache.ode.bpel.common.CorrelationKeySet;
import org.apache.ode.bpel.common.CorrelationKey;
-import org.apache.ode.dao.bpel.MessageRouteDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.MessageRouteDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
/**
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/PartnerLinkDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/PartnerLinkDAOImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/PartnerLinkDAOImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/PartnerLinkDAOImpl.java Wed Aug 18 04:51:39 2010
@@ -19,14 +19,14 @@
package org.apache.ode.bpel.memdao;
-import org.apache.ode.dao.bpel.PartnerLinkDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
/**
* A very simple, in-memory implementation of the
- * {@link org.apache.ode.dao.bpel.PartnerLinkDAO} interface.
+ * {@link org.apache.ode.bpel.dao.PartnerLinkDAO} interface.
*/
public class PartnerLinkDAOImpl extends DaoBaseImpl implements PartnerLinkDAO {
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessDaoImpl.java Wed Aug 18 04:51:39 2010
@@ -33,11 +33,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.ProcessState;
-import org.apache.ode.dao.bpel.CorrelationSetDAO;
-import org.apache.ode.dao.bpel.CorrelatorDAO;
-import org.apache.ode.dao.bpel.PartnerLinkDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.CorrelationSetDAO;
+import org.apache.ode.bpel.dao.CorrelatorDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
/**
* A very simple, in-memory implementation of the {@link ProcessDAO} interface.
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java Wed Aug 18 04:51:39 2010
@@ -19,18 +19,18 @@
package org.apache.ode.bpel.memdao;
import org.apache.ode.bpel.common.ProcessState;
+import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.CorrelationSetDAO;
+import org.apache.ode.bpel.dao.CorrelatorDAO;
+import org.apache.ode.bpel.dao.FaultDAO;
+import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.bpel.dao.ProcessDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ScopeDAO;
+import org.apache.ode.bpel.dao.XmlDataDAO;
import org.apache.ode.bpel.evt.ProcessInstanceEvent;
import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY;
-import org.apache.ode.dao.bpel.ActivityRecoveryDAO;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.CorrelationSetDAO;
-import org.apache.ode.dao.bpel.CorrelatorDAO;
-import org.apache.ode.dao.bpel.FaultDAO;
-import org.apache.ode.dao.bpel.MessageExchangeDAO;
-import org.apache.ode.dao.bpel.ProcessDAO;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ScopeDAO;
-import org.apache.ode.dao.bpel.XmlDataDAO;
import org.apache.ode.utils.QNameUtils;
import org.w3c.dom.Element;
@@ -209,7 +209,7 @@ public class ProcessInstanceDaoImpl exte
}
/**
- * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#getScope(java.lang.Long)
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getScope(java.lang.Long)
*/
public ScopeDAO getScope(Long scopeInstanceId) {
return _scopes.get(scopeInstanceId);
@@ -223,7 +223,7 @@ public class ProcessInstanceDaoImpl exte
}
/**
- * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#insertBpelEvent(org.apache.ode.bpel.evt.ProcessInstanceEvent)
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#insertBpelEvent(org.apache.ode.bpel.evt.ProcessInstanceEvent)
*/
public void insertBpelEvent(ProcessInstanceEvent event) {
_events.add(event);
@@ -234,14 +234,14 @@ public class ProcessInstanceDaoImpl exte
}
/**
- * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#getInstantiatingCorrelator()
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getInstantiatingCorrelator()
*/
public CorrelatorDAO getInstantiatingCorrelator() {
return _instantiatingCorrelator;
}
/**
- * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#getScopes(java.lang.String)
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getScopes(java.lang.String)
*/
public Collection<ScopeDAO> getScopes(String scopeName) {
List<ScopeDAO> scopes = _scopesByName.get(scopeName);
@@ -249,28 +249,28 @@ public class ProcessInstanceDaoImpl exte
}
/**
- * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#getPreviousState()
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getPreviousState()
*/
public short getPreviousState() {
return _previousState;
}
/**
- * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#getLastActiveTime()
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getLastActiveTime()
*/
public Date getLastActiveTime() {
return _lastActive;
}
/**
- * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#setLastActiveTime(java.util.Date)
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#setLastActiveTime(java.util.Date)
*/
public void setLastActiveTime(Date dt) {
_lastActive = dt;
}
/**
- * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#finishCompletion()
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#finishCompletion()
*/
public void finishCompletion() {
// make sure we have completed.
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessManagementDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessManagementDaoImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessManagementDaoImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessManagementDaoImpl.java Wed Aug 18 04:51:39 2010
@@ -27,10 +27,10 @@ import java.util.Set;
import javax.xml.namespace.QName;
import org.apache.ode.bpel.common.InstanceFilter;
-import org.apache.ode.dao.bpel.BpelDAOConnection;
-import org.apache.ode.dao.bpel.ProcessInstanceDAO;
-import org.apache.ode.dao.bpel.ProcessManagementDAO;
-import org.apache.ode.dao.bpel.ProcessManagementDAO.InstanceSummaryKey;
+import org.apache.ode.bpel.dao.BpelDAOConnection;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ProcessManagementDAO;
+import org.apache.ode.bpel.dao.ProcessManagementDAO.InstanceSummaryKey;
public class ProcessManagementDaoImpl extends DaoBaseImpl implements ProcessManagementDAO {
public Object[] findFailedCountAndLastFailedDateForProcessId(BpelDAOConnection conn, String status, String processId) {
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ScopeDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ScopeDaoImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ScopeDaoImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ScopeDaoImpl.java Wed Aug 18 04:51:39 2010
@@ -18,12 +18,12 @@
*/
package org.apache.ode.bpel.memdao;
+import org.apache.ode.bpel.dao.CorrelationSetDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.apache.ode.bpel.dao.ScopeDAO;
+import org.apache.ode.bpel.dao.ScopeStateEnum;
+import org.apache.ode.bpel.dao.XmlDataDAO;
import org.apache.ode.bpel.evt.BpelEvent;
-import org.apache.ode.dao.bpel.CorrelationSetDAO;
-import org.apache.ode.dao.bpel.PartnerLinkDAO;
-import org.apache.ode.dao.bpel.ScopeDAO;
-import org.apache.ode.dao.bpel.ScopeStateEnum;
-import org.apache.ode.dao.bpel.XmlDataDAO;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,7 +41,7 @@ class ScopeDaoImpl extends DaoBaseImpl i
private Map<String, CorrelationSetDAO> _correlations = new HashMap<String, CorrelationSetDAO>();
private Map<Integer, PartnerLinkDAO> _eprs = new HashMap<Integer, PartnerLinkDAO>();
private ProcessInstanceDaoImpl _processInstance;
- private org.apache.ode.dao.bpel.ScopeDAO _parent;
+ private org.apache.ode.bpel.dao.ScopeDAO _parent;
private Long _instanceId;
private int _scopeModelId;
@@ -62,7 +62,7 @@ class ScopeDaoImpl extends DaoBaseImpl i
/**
- * @see org.apache.ode.dao.bpel.ScopeDAO#getCorrelationSet(java.lang.String)
+ * @see org.apache.ode.bpel.dao.ScopeDAO#getCorrelationSet(java.lang.String)
*/
public CorrelationSetDAO getCorrelationSet(String corrSetName) {
CorrelationSetDAO corr = _correlations.get(corrSetName);
@@ -76,42 +76,42 @@ class ScopeDaoImpl extends DaoBaseImpl i
}
/**
- * @see org.apache.ode.dao.bpel.ScopeDAO#getParentScope()
+ * @see org.apache.ode.bpel.dao.ScopeDAO#getParentScope()
*/
- public org.apache.ode.dao.bpel.ScopeDAO getParentScope() {
+ public org.apache.ode.bpel.dao.ScopeDAO getParentScope() {
return _parent;
}
/**
- * @see org.apache.ode.dao.bpel.ScopeDAO#getProcessInstance()
+ * @see org.apache.ode.bpel.dao.ScopeDAO#getProcessInstance()
*/
- public org.apache.ode.dao.bpel.ProcessInstanceDAO getProcessInstance() {
+ public org.apache.ode.bpel.dao.ProcessInstanceDAO getProcessInstance() {
return _processInstance;
}
/**
- * @see org.apache.ode.dao.bpel.ScopeDAO#setState(org.apache.ode.dao.bpel.ScopeStateEnum)
+ * @see org.apache.ode.bpel.dao.ScopeDAO#setState(org.apache.ode.bpel.dao.ScopeStateEnum)
*/
- public void setState(org.apache.ode.dao.bpel.ScopeStateEnum state) {
+ public void setState(org.apache.ode.bpel.dao.ScopeStateEnum state) {
_state = state;
}
/**
- * @see org.apache.ode.dao.bpel.ScopeDAO#getState()
+ * @see org.apache.ode.bpel.dao.ScopeDAO#getState()
*/
- public org.apache.ode.dao.bpel.ScopeStateEnum getState() {
+ public org.apache.ode.bpel.dao.ScopeStateEnum getState() {
return _state;
}
/**
- * @see org.apache.ode.dao.bpel.ScopeDAO#getName()
+ * @see org.apache.ode.bpel.dao.ScopeDAO#getName()
*/
public String getName() {
return _type;
}
/**
- * @see org.apache.ode.dao.bpel.ScopeDAO#getVariable(java.lang.String)
+ * @see org.apache.ode.bpel.dao.ScopeDAO#getVariable(java.lang.String)
*/
public XmlDataDAO getVariable(String varName) {
XmlDataDAO v = _variables.get(varName);
@@ -129,14 +129,14 @@ class ScopeDaoImpl extends DaoBaseImpl i
}
/**
- * @see org.apache.ode.dao.bpel.ScopeDAO#getScopeInstanceId()
+ * @see org.apache.ode.bpel.dao.ScopeDAO#getScopeInstanceId()
*/
public Long getScopeInstanceId() {
return _instanceId;
}
/**
- * @see org.apache.ode.dao.bpel.ScopeDAO#getModelId()
+ * @see org.apache.ode.bpel.dao.ScopeDAO#getModelId()
*/
public int getModelId() {
return _scopeModelId;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/XmlDataDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/XmlDataDaoImpl.java?rev=986564&r1=986563&r2=986564&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/XmlDataDaoImpl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/XmlDataDaoImpl.java Wed Aug 18 04:51:39 2010
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.memdao;
-import org.apache.ode.dao.bpel.ScopeDAO;
-import org.apache.ode.dao.bpel.XmlDataDAO;
+import org.apache.ode.bpel.dao.ScopeDAO;
+import org.apache.ode.bpel.dao.XmlDataDAO;
import org.apache.ode.utils.DOMUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -91,14 +91,14 @@ class XmlDataDaoImpl extends DaoBaseImpl
}
/**
- * @see org.apache.ode.dao.bpel.XmlDataDAO#getProperty(java.lang.String)
+ * @see org.apache.ode.bpel.dao.XmlDataDAO#getProperty(java.lang.String)
*/
public String getProperty(String propertyName) {
return _properties.getProperty(propertyName);
}
/**
- * @see org.apache.ode.dao.bpel.XmlDataDAO#setProperty(java.lang.String, java.lang.String)
+ * @see org.apache.ode.bpel.dao.XmlDataDAO#setProperty(java.lang.String, java.lang.String)
*/
public void setProperty(String pname, String pvalue) {
_properties.setProperty(pname, pvalue);
@@ -109,7 +109,7 @@ class XmlDataDaoImpl extends DaoBaseImpl
}
/**
- * @see org.apache.ode.dao.bpel.XmlDataDAO#getScopeDAO()
+ * @see org.apache.ode.bpel.dao.XmlDataDAO#getScopeDAO()
*/
public ScopeDAO getScopeDAO() {
return _scope;