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:12:59 UTC
svn commit: r986561 [4/13] - 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-wa...
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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -61,7 +61,7 @@ public class MigrationHandler {
}
public boolean migrate(final Set<BpelProcess> registeredProcesses, int migrationTransactionTimeout) {
- if (_contexts.dao.getDataSource() == null) {
+ if (_contexts.dao.getConnection() == 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 = _contexts.dao.getDataSource().getConnection();
+ conn = null; //FIXME jpa refactoring work leftover
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 = _contexts.dao.getDataSource().getConnection();
+ conn = null; //FIXME jpa refactoring work leftover
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=986561&r1=986560&r2=986561&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:12:49 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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -32,10 +32,6 @@ 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;
@@ -56,6 +52,10 @@ 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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -27,10 +27,6 @@ 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;
@@ -50,6 +46,10 @@ 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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -37,8 +37,6 @@ 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;
@@ -53,6 +51,8 @@ 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=986561&r1=986560&r2=986561&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:12:49 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=986561&r1=986560&r2=986561&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:12:49 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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -18,12 +18,14 @@
*/
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;
@@ -49,11 +51,6 @@ 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() {
}
@@ -61,4 +58,7 @@ 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=986561&r1=986560&r2=986561&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:12:49 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.bpel.dao.BpelDAOConnection#instanceQuery(String)
+ * @see org.apache.ode.dao.bpel.BpelDAOConnection#instanceQuery(String)
*/
public Collection<ProcessInstanceDAO> instanceQuery(String expression) {
//TODO
@@ -388,4 +388,8 @@ 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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,10 +19,10 @@
package org.apache.ode.bpel.memdao;
import org.apache.ode.bpel.common.CorrelationKey;
-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 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 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.bpel.dao.ScopeDAO scope) {
+ public CorrelationSetDaoImpl(String name, org.apache.ode.dao.bpel.ScopeDAO scope) {
_name = name;
_scope = scope;
_csetId = IdGen.newCorrelationSetId();
@@ -55,14 +55,14 @@ class CorrelationSetDaoImpl extends DaoB
}
/**
- * @see org.apache.ode.bpel.dao.CorrelationSetDAO#getName()
+ * @see org.apache.ode.dao.bpel.CorrelationSetDAO#getName()
*/
public String getName() {
return _name;
}
/**
- * @see org.apache.ode.bpel.dao.CorrelationSetDAO#getScope()
+ * @see org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -18,16 +18,20 @@
*/
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.bpel.dao.*;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Collection;
+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;
/**
* 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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,7 +19,7 @@
package org.apache.ode.bpel.memdao;
-import org.apache.ode.bpel.dao.FaultDAO;
+import org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.memdao;
-import org.apache.ode.bpel.dao.MessageDAO;
-import org.apache.ode.bpel.dao.MessageExchangeDAO;
+import org.apache.ode.dao.bpel.MessageDAO;
+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/memdao/MessageExchangeDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java?rev=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,11 +19,11 @@
package org.apache.ode.bpel.memdao;
-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.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.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=986561&r1=986560&r2=986561&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:12:49 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.bpel.dao.MessageRouteDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.dao.bpel.MessageRouteDAO;
+import org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -19,14 +19,14 @@
package org.apache.ode.bpel.memdao;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.apache.ode.dao.bpel.PartnerLinkDAO;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
/**
* A very simple, in-memory implementation of the
- * {@link org.apache.ode.bpel.dao.PartnerLinkDAO} interface.
+ * {@link org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 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.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;
+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;
/**
* 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=986561&r1=986560&r2=986561&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:12:49 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.bpel.dao.ProcessInstanceDAO#getScope(java.lang.Long)
+ * @see org.apache.ode.dao.bpel.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.bpel.dao.ProcessInstanceDAO#insertBpelEvent(org.apache.ode.bpel.evt.ProcessInstanceEvent)
+ * @see org.apache.ode.dao.bpel.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.bpel.dao.ProcessInstanceDAO#getInstantiatingCorrelator()
+ * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#getInstantiatingCorrelator()
*/
public CorrelatorDAO getInstantiatingCorrelator() {
return _instantiatingCorrelator;
}
/**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getScopes(java.lang.String)
+ * @see org.apache.ode.dao.bpel.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.bpel.dao.ProcessInstanceDAO#getPreviousState()
+ * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#getPreviousState()
*/
public short getPreviousState() {
return _previousState;
}
/**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getLastActiveTime()
+ * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#getLastActiveTime()
*/
public Date getLastActiveTime() {
return _lastActive;
}
/**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#setLastActiveTime(java.util.Date)
+ * @see org.apache.ode.dao.bpel.ProcessInstanceDAO#setLastActiveTime(java.util.Date)
*/
public void setLastActiveTime(Date dt) {
_lastActive = dt;
}
/**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#finishCompletion()
+ * @see org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 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.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;
+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;
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=986561&r1=986560&r2=986561&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:12:49 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.bpel.dao.ScopeDAO _parent;
+ private org.apache.ode.dao.bpel.ScopeDAO _parent;
private Long _instanceId;
private int _scopeModelId;
@@ -62,7 +62,7 @@ class ScopeDaoImpl extends DaoBaseImpl i
/**
- * @see org.apache.ode.bpel.dao.ScopeDAO#getCorrelationSet(java.lang.String)
+ * @see org.apache.ode.dao.bpel.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.bpel.dao.ScopeDAO#getParentScope()
+ * @see org.apache.ode.dao.bpel.ScopeDAO#getParentScope()
*/
- public org.apache.ode.bpel.dao.ScopeDAO getParentScope() {
+ public org.apache.ode.dao.bpel.ScopeDAO getParentScope() {
return _parent;
}
/**
- * @see org.apache.ode.bpel.dao.ScopeDAO#getProcessInstance()
+ * @see org.apache.ode.dao.bpel.ScopeDAO#getProcessInstance()
*/
- public org.apache.ode.bpel.dao.ProcessInstanceDAO getProcessInstance() {
+ public org.apache.ode.dao.bpel.ProcessInstanceDAO getProcessInstance() {
return _processInstance;
}
/**
- * @see org.apache.ode.bpel.dao.ScopeDAO#setState(org.apache.ode.bpel.dao.ScopeStateEnum)
+ * @see org.apache.ode.dao.bpel.ScopeDAO#setState(org.apache.ode.dao.bpel.ScopeStateEnum)
*/
- public void setState(org.apache.ode.bpel.dao.ScopeStateEnum state) {
+ public void setState(org.apache.ode.dao.bpel.ScopeStateEnum state) {
_state = state;
}
/**
- * @see org.apache.ode.bpel.dao.ScopeDAO#getState()
+ * @see org.apache.ode.dao.bpel.ScopeDAO#getState()
*/
- public org.apache.ode.bpel.dao.ScopeStateEnum getState() {
+ public org.apache.ode.dao.bpel.ScopeStateEnum getState() {
return _state;
}
/**
- * @see org.apache.ode.bpel.dao.ScopeDAO#getName()
+ * @see org.apache.ode.dao.bpel.ScopeDAO#getName()
*/
public String getName() {
return _type;
}
/**
- * @see org.apache.ode.bpel.dao.ScopeDAO#getVariable(java.lang.String)
+ * @see org.apache.ode.dao.bpel.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.bpel.dao.ScopeDAO#getScopeInstanceId()
+ * @see org.apache.ode.dao.bpel.ScopeDAO#getScopeInstanceId()
*/
public Long getScopeInstanceId() {
return _instanceId;
}
/**
- * @see org.apache.ode.bpel.dao.ScopeDAO#getModelId()
+ * @see org.apache.ode.dao.bpel.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=986561&r1=986560&r2=986561&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:12:49 2010
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.memdao;
-import org.apache.ode.bpel.dao.ScopeDAO;
-import org.apache.ode.bpel.dao.XmlDataDAO;
+import org.apache.ode.dao.bpel.ScopeDAO;
+import org.apache.ode.dao.bpel.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.bpel.dao.XmlDataDAO#getProperty(java.lang.String)
+ * @see org.apache.ode.dao.bpel.XmlDataDAO#getProperty(java.lang.String)
*/
public String getProperty(String propertyName) {
return _properties.getProperty(propertyName);
}
/**
- * @see org.apache.ode.bpel.dao.XmlDataDAO#setProperty(java.lang.String, java.lang.String)
+ * @see org.apache.ode.dao.bpel.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.bpel.dao.XmlDataDAO#getScopeDAO()
+ * @see org.apache.ode.dao.bpel.XmlDataDAO#getScopeDAO()
*/
public ScopeDAO getScopeDAO() {
return _scope;
Modified: ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java?rev=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java (original)
+++ ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/MyRoleMessageExchangeImplTest.java Wed Aug 18 04:12:49 2010
@@ -26,8 +26,8 @@ import java.util.concurrent.TimeoutExcep
import javax.transaction.TransactionManager;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.bpel.engine.MyRoleMessageExchangeImpl.ResponseCallback;
+import org.apache.ode.dao.bpel.MessageExchangeDAO;
import org.apache.ode.scheduler.simple.SimpleScheduler;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java?rev=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java (original)
+++ ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/engine/cron/CronSchedulerTest.java Wed Aug 18 04:12:49 2010
@@ -36,7 +36,7 @@ import org.apache.ode.bpel.iapi.Schedule
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.daohib.bpel.BpelDAOConnectionImpl;
+import org.apache.ode.dao.hib.bpel.BpelDAOConnectionImpl;
import org.apache.ode.utils.CronExpression;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java?rev=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java (original)
+++ ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java Wed Aug 18 04:12:49 2010
@@ -32,7 +32,7 @@ import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.GUID;
import org.apache.ode.bpel.evar.ExternalVariableModule.Locator;
import org.apache.ode.bpel.evar.ExternalVariableModule.Value;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.h2.jdbcx.JdbcDataSource;
import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -54,13 +54,13 @@ public class JdbcExternalVariableEngineT
final QName _varType = new QName("foo", "foobar");
ExternalVariableConf _econf;
- jdbcDataSource _ds;
+ JdbcDataSource _ds;
JdbcExternalVariableModule _engine;
Element _el1;
public void setUp() throws Exception {
- _ds = new org.hsqldb.jdbc.jdbcDataSource();
- _ds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
+ _ds = new JdbcDataSource();
+ _ds.setURL("jdbc:h2:mem:" + new GUID().toString() + ";DB_CLOSE_DELAY=-1");
_ds.setUser("sa");
Connection conn = _ds.getConnection();
Modified: ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java?rev=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java (original)
+++ ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java Wed Aug 18 04:12:49 2010
@@ -18,17 +18,23 @@
*/
package org.apache.ode.bpel.runtime;
-import org.apache.derby.jdbc.EmbeddedXADataSource;
-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.BpelDAOConnectionFactory;
-import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
+import java.io.File;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import javax.wsdl.PortType;
+import javax.xml.namespace.QName;
+
import org.apache.ode.bpel.engine.BpelServerImpl;
import org.apache.ode.bpel.iapi.BindingContext;
import org.apache.ode.bpel.iapi.ContextException;
@@ -41,9 +47,9 @@ import org.apache.ode.bpel.iapi.MyRoleMe
import org.apache.ode.bpel.iapi.PartnerRoleChannel;
import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
import org.apache.ode.bpel.iapi.Scheduler;
-import org.apache.ode.bpel.iapi.Scheduler.MapSerializableRunnable;
import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
-import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl;
+import org.apache.ode.dao.bpel.BpelDAOConnectionFactory;
+import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
import org.apache.ode.il.EmbeddedGeronimoFactory;
import org.apache.ode.il.MockScheduler;
import org.apache.ode.il.config.OdeConfigProperties;
@@ -51,28 +57,9 @@ import org.apache.ode.il.dbutil.Database
import org.apache.ode.store.ProcessStoreImpl;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.GUID;
-import org.hsqldb.jdbc.jdbcDataSource;
-import org.tranql.connector.derby.EmbeddedLocalMCF;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import javax.resource.spi.ConnectionManager;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-import javax.wsdl.PortType;
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Collections;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
class MockBpelServer {
@@ -82,7 +69,8 @@ class MockBpelServer {
Database _database;
DataSource _dataSource;
SchedulerWrapper _scheduler;
- BpelDAOConnectionFactory _daoCF;
+ BpelDAOConnectionFactory _bpelDaoCF;
+ ConfStoreDAOConnectionFactory _confDaoCF;
EndpointReferenceContext _eprContext;
MessageExchangeContext _mexContext;
BindingContext _bindContext;
@@ -97,16 +85,16 @@ class MockBpelServer {
createDataSource();
createScheduler();
createDAOConnection();
- if (_daoCF == null)
+ if (_bpelDaoCF == null)
throw new RuntimeException("No DAO");
- _server.setDaoConnectionFactory(_daoCF);
+ _server.setDaoConnectionFactory(_bpelDaoCF);
_server.setInMemDaoConnectionFactory(new BpelDAOConnectionFactoryImpl(_scheduler));
if (_scheduler == null)
throw new RuntimeException("No scheduler");
createEndpointReferenceContext();
Properties storeProps = new Properties();
storeProps.setProperty("hibernate.hbm2ddl.auto", "update");
- _store = new ProcessStoreImpl(_eprContext, _dataSource,"hib", new OdeConfigProperties(storeProps, ""), true);
+ _store = new ProcessStoreImpl(_eprContext,_txManager,_confDaoCF);
_server.setScheduler(_scheduler);
_server.setEndpointReferenceContext(_eprContext);
_server.setMessageExchangeContext(createMessageExchangeContext());
@@ -182,45 +170,15 @@ class MockBpelServer {
}
protected DataSource createDataSource() throws Exception {
- TransactionSupport transactionSupport = LocalTransactions.INSTANCE;
- ConnectionTracker connectionTracker = new ConnectionTrackingCoordinator();
-
- PoolingSupport poolingSupport = new SinglePool(
- 10,
- 0,
- 1000,
- 1,
- true,
- false,
- false);
-
- ConnectionManager connectionManager = new GenericConnectionManager(
- transactionSupport,
- poolingSupport,
- null,
- connectionTracker,
- (RecoverableTransactionManager) _txManager,
- getClass().getName(),
- getClass().getClassLoader());
-
-
- EmbeddedLocalMCF mcf = new org.tranql.connector.derby.EmbeddedLocalMCF();
- mcf.setCreateDatabase(true);
- mcf.setDatabaseName("target/testdb");
- mcf.setUserName("sa");
- mcf.setPassword("");
- _dataSource = (DataSource) mcf.createConnectionFactory(connectionManager);
- return _dataSource;
-
-
-// d = org.tranql.connector.jdbc.JDBCDriverMCF();
-// EmbeddedXADataSource ds = new EmbeddedXADataSource();
-// ds.setCreateDatabase("create");
-// ds.setDatabaseName("target/testdb");
-// ds.setUser("sa");
-// ds.setPassword("");
-// _dataSource = ds;
-// return _dataSource;
+ Properties props = new Properties();
+ props.setProperty(OdeConfigProperties.PROP_DAOCF, "org.apache.ode.dao.hib.bpel.BpelDAOConnectionFactoryImpl");
+ props.setProperty(OdeConfigProperties.PROP_DAOCF_STORE, "org.apache.ode.dao.hib.store.ConfStoreDAOConnectionFactoryImpl");
+ OdeConfigProperties odeProps = new OdeConfigProperties(props,"");
+ _database = new Database(odeProps);
+ _database.setTransactionManager(_txManager);
+ _database.start();
+ _dataSource=_database.getDataSource();
+ return _dataSource;
}
protected Scheduler createScheduler() throws Exception {
@@ -234,30 +192,15 @@ class MockBpelServer {
return _scheduler;
}
- protected BpelDAOConnectionFactory createDAOConnection() throws Exception {
+ protected void createDAOConnection() throws Exception {
if (_txManager == null)
throw new RuntimeException("No transaction manager");
if (_dataSource == null)
throw new RuntimeException("No data source");
+
+ _bpelDaoCF = _database.createDaoCF();
+ _confDaoCF = _database.createDaoStoreCF();
-//
-// BpelDAOConnectionFactoryJDBC daoCF = new BPELDAOConnectionFactoryImpl();
-// daoCF.setDataSource(_dataSource);
-// daoCF.setTransactionManager(_txManager);
-// Properties props = new Properties();
-// props.put("openjpa.Log", "log4j");
-// props.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=false)");
-// daoCF.init(props);
-// _daoCF = daoCF;
- org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl daoCF = new org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl();
- daoCF.setDataSource(_dataSource);
- daoCF.setTransactionManager(_txManager);
- Properties props = new Properties();
- props.setProperty("hibernate.hbm2ddl.auto", "update");
- daoCF.init(props);
-
- _daoCF = daoCF;
- return _daoCF;
}
protected EndpointReferenceContext createEndpointReferenceContext() {
@@ -372,9 +315,9 @@ class MockBpelServer {
public <T> T execTransaction(Callable<T> transaction) throws Exception, ContextException {
return _scheduler.execTransaction(transaction, 0);
}
-
+
public <T> T execTransaction(Callable<T> transaction, int timeout) throws Exception, ContextException {
- return _scheduler.execTransaction(transaction, timeout);
+ return _scheduler.execTransaction(transaction, timeout);
}
public void beginTransaction() throws Exception {
@@ -417,14 +360,12 @@ class MockBpelServer {
public void setPolledRunnableProcesser(JobProcessor delegatedRunnableProcessor) {
}
- public boolean amICoordinator() {
- return true;
- }
-
-
- public void acquireTransactionLocks() {
- // TODO Auto-generated method stub
-
- }
+ public boolean amICoordinator() {
+ return true;
+ }
+
+ public void acquireTransactionLocks() {
+
+ }
}
}
Modified: ode/trunk/bpel-runtime/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/test/resources/log4j.properties?rev=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/test/resources/log4j.properties (original)
+++ ode/trunk/bpel-runtime/src/test/resources/log4j.properties Wed Aug 18 04:12:49 2010
@@ -35,4 +35,6 @@ log4j.category.org.apache.ode.jacob=INFO
log4j.category.org.apache.ode.store=INFO
log4j.category.org.apache.ode.daohib=INFO
log4j.category.org.apache.ode.utils=INFO
+log4j.category.org.apache.ode.sql=INFO
+log4j.category.openjpa=INFO
Modified: ode/trunk/bpel-store/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/pom.xml?rev=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/bpel-store/pom.xml (original)
+++ ode/trunk/bpel-store/pom.xml Wed Aug 18 04:12:49 2010
@@ -69,155 +69,84 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>${spring.version}</version>
</dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <scope>test</scope>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa-ojpa</artifactId>
<scope>test</scope>
</dependency>
+ <!-- for the integration tests - seems to work with the openjpa enhanced enities -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa-hibernate</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.serp</groupId>
- <artifactId>serp</artifactId>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-hibernate</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
- <build>
- <plugins>
+ <build>
+ <plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
- <id>openjpa-enhancer</id>
- <phase>process-classes</phase>
+ <id>hibernate-jpa</id>
+ <phase>integration-test</phase>
<goals>
- <goal>run</goal>
+ <goal>test</goal>
</goals>
<configuration>
- <tasks>
- <property name="maven.runtime.classpath" refid="maven.test.classpath"/>
- <path id="classpath">
- <pathelement path="${maven.runtime.classpath}"/>
- </path>
- <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/>
- <openjpac>
- <fileset dir="${basedir}/src/main">
- <include name="**/*.java" />
- </fileset>
- <classpath>
- <pathelement location="${basedir}/target/classes"/>
- <pathelement path="${maven.runtime.classpath}"/>
- </classpath>
- </openjpac>
- </tasks>
+ <reportsDirectory>${project.build.directory}/surefire-reports/hibernate-jpa</reportsDirectory>
+ <systemPropertyVariables>
+ <dao.factory.store>org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl</dao.factory.store>
+ </systemPropertyVariables>
+ <includes>
+ <include>**/DaoTest.java</include>
+ <include>**/ProcessStoreTest.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>hibernate</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/hibernate</reportsDirectory>
+ <systemPropertyVariables>
+ <dao.factory.store>org.apache.ode.dao.hib.store.ConfStoreDAOConnectionFactoryImpl</dao.factory.store>
+ </systemPropertyVariables>
+ <includes>
+ <include>**/DaoTest.java</include>
+ <include>**/ProcessStoreTest.java</include>
+ </includes>
</configuration>
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xdoclet-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>xdoclet</goal>
- </goals>
-
- <configuration>
- <tasks>
- <hibernatedoclet excludedTags="@version,@author,@todo" verbose="true"
- destdir="${project.build.outputDirectory}" force="true">
- <hibernate version="3.0"/>
- <fileset dir="${project.build.sourceDirectory}" includes="org/apache/ode/store/hib/*.java"/>
- </hibernatedoclet>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
+
</project>
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Wed Aug 18 04:12:49 2010
@@ -18,34 +18,57 @@
*/
package org.apache.ode.store;
+import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import javax.xml.namespace.QName;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.dd.DeployDocument;
import org.apache.ode.bpel.dd.TDeployment;
-import org.apache.ode.bpel.iapi.*;
-import org.apache.ode.il.config.OdeConfigProperties;
+import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.iapi.EndpointReferenceContext;
+import org.apache.ode.bpel.iapi.ProcessConf;
+import org.apache.ode.bpel.iapi.ProcessState;
+import org.apache.ode.bpel.iapi.ProcessStore;
+import org.apache.ode.bpel.iapi.ProcessStoreEvent;
+import org.apache.ode.bpel.iapi.ProcessStoreListener;
+import org.apache.ode.bpel.iapi.OdeGlobalConfig;
+import org.apache.ode.dao.store.ConfStoreDAOConnection;
+import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
+import org.apache.ode.dao.store.DeploymentUnitDAO;
+import org.apache.ode.dao.store.ProcessConfDAO;
import org.apache.ode.store.DeploymentUnitDir.CBPInfo;
import org.apache.ode.utils.DOMUtils;
-import org.apache.ode.utils.GUID;
import org.apache.ode.utils.msg.MessageBundle;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.h2.jdbcx.JdbcDataSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import javax.sql.DataSource;
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
/**
* <p>
* JDBC-based implementation of a process store. Also provides an "in-memory" store by way of HSQL database.
@@ -78,9 +101,11 @@ public class ProcessStoreImpl implements
/** Guards access to the _processes and _deploymentUnits */
private final ReadWriteLock _rw = new ReentrantReadWriteLock();
- private ConfStoreConnectionFactory _cf;
+ private ConfStoreDAOConnectionFactory _cf;
+
+ private TransactionManager _txm;
- private EndpointReferenceContext eprContext;
+ private EndpointReferenceContext _eprContext;
private boolean generateProcessEventsAll;
@@ -100,43 +125,14 @@ public class ProcessStoreImpl implements
* In-memory DataSource, or <code>null</code> if we are using a real DS. We need this to shutdown the DB.
*/
private DataSource _inMemDs;
-
- public ProcessStoreImpl() {
- this(null, null, "", new OdeConfigProperties(new Properties(), ""), true);
- }
-
- public ProcessStoreImpl(EndpointReferenceContext eprContext, DataSource ds, String persistenceType, OdeConfigProperties props, boolean createDatamodel) {
- this.eprContext = eprContext;
- this.generateProcessEventsAll = props.getProperty("generateProcessEvents", "all").equals("all");
- if (ds != null) {
- // ugly hack
- if (persistenceType.toLowerCase().indexOf("hib") != -1) {
- _cf = new org.apache.ode.store.hib.DbConfStoreConnectionFactory(ds, props.getProperties(), createDatamodel, props.getTxFactoryClass());
- } else {
- _cf = new org.apache.ode.store.jpa.DbConfStoreConnectionFactory(ds, createDatamodel, props.getTxFactoryClass());
- }
- } else {
- // If the datasource is not provided, then we create a HSQL-based
- // in-memory database. Makes testing a bit simpler.
- DataSource hsqlds = createInternalDS(new GUID().toString());
- if ("hibernate".equalsIgnoreCase(persistenceType)) {
- _cf = new org.apache.ode.store.hib.DbConfStoreConnectionFactory(hsqlds, props.getProperties(), createDatamodel, props.getTxFactoryClass());
- } else {
- _cf = new org.apache.ode.store.jpa.DbConfStoreConnectionFactory(hsqlds, createDatamodel, props.getTxFactoryClass());
- }
- _inMemDs = hsqlds;
- }
- }
-
+
/**
* Constructor that hardwires OpenJPA on a new in-memory database. Suitable for tests.
*/
- public ProcessStoreImpl(EndpointReferenceContext eprContext, DataSource inMemDs) {
- this.eprContext = eprContext;
- DataSource hsqlds = createInternalDS(new GUID().toString());
- //when in memory we always create the model as we are starting from scratch
- _cf = new org.apache.ode.store.jpa.DbConfStoreConnectionFactory(hsqlds, true, OdeConfigProperties.DEFAULT_TX_FACTORY_CLASS_NAME);
- _inMemDs = hsqlds;
+ public <E> ProcessStoreImpl(EndpointReferenceContext eprContext, TransactionManager mgr, ConfStoreDAOConnectionFactory cf) {
+ _eprContext = eprContext;
+ _txm = mgr;
+ _cf=cf;
}
public void shutdown() {
@@ -191,7 +187,7 @@ public class ProcessStoreImpl implements
if (autoincrementVersion || du.getStaticVersion() == -1) {
// Process and DU use a monotonically increased single version number by default.
version = exec(new Callable<Long>() {
- public Long call(ConfStoreConnection conn) {
+ public Long call(ConfStoreDAOConnection conn) {
return conn.getNextVersion();
}
});
@@ -243,7 +239,7 @@ public class ProcessStoreImpl implements
}
ProcessConfImpl pconf = new ProcessConfImpl(pid, processDD.getName(), version, du, processDD, deployDate,
- calcInitialProperties(du.getProperties(), processDD), calcInitialState(processDD), eprContext, _configDir, generateProcessEventsAll);
+ calcInitialProperties(du.getProperties(), processDD), calcInitialState(processDD), _eprContext, _configDir, generateProcessEventsAll);
processes.add(pconf);
}
@@ -262,7 +258,7 @@ public class ProcessStoreImpl implements
// Do the deployment in the DB. We need this so that we remember deployments across system shutdowns.
// We don't fail if there is a DB error, simply print some errors.
deployed = exec(new Callable<Collection<QName>>() {
- public Collection<QName> call(ConfStoreConnection conn) {
+ public Collection<QName> call(ConfStoreDAOConnection conn) {
// Check that this deployment unit is not deployed.
DeploymentUnitDAO dudao = conn.getDeploymentUnit(du.getName());
if (dudao != null) {
@@ -358,7 +354,7 @@ public class ProcessStoreImpl implements
public Collection<QName> undeploy(final String duName) {
try {
exec(new Callable<Collection<QName>>() {
- public Collection<QName> call(ConfStoreConnection conn) {
+ public Collection<QName> call(ConfStoreDAOConnection conn) {
DeploymentUnitDAO dudao = conn.getDeploymentUnit(duName);
if (dudao != null)
dudao.delete();
@@ -433,7 +429,7 @@ public class ProcessStoreImpl implements
// Update in the database.
ProcessState old = exec(new Callable<ProcessState>() {
- public ProcessState call(ConfStoreConnection conn) {
+ public ProcessState call(ConfStoreDAOConnection conn) {
DeploymentUnitDAO dudao = conn.getDeploymentUnit(dudir.getName());
if (dudao == null) {
String errmsg = __msgs.msgProcessNotFound(pid);
@@ -494,7 +490,7 @@ public class ProcessStoreImpl implements
final DeploymentUnitDir dudir = pconf.getDeploymentUnit();
exec(new ProcessStoreImpl.Callable<Object>() {
- public Object call(ConfStoreConnection conn) {
+ public Object call(ConfStoreDAOConnection conn) {
DeploymentUnitDAO dudao = conn.getDeploymentUnit(dudir.getName());
if (dudao == null)
return null;
@@ -516,7 +512,7 @@ public class ProcessStoreImpl implements
public void loadAll() {
final ArrayList<ProcessConfImpl> loaded = new ArrayList<ProcessConfImpl>();
exec(new Callable<Object>() {
- public Object call(ConfStoreConnection conn) {
+ public Object call(ConfStoreDAOConnection conn) {
Collection<DeploymentUnitDAO> dus = conn.getDeploymentUnits();
for (DeploymentUnitDAO du : dus)
try {
@@ -561,7 +557,7 @@ public class ProcessStoreImpl implements
public long getCurrentVersion() {
long version = exec(new Callable<Long>() {
- public Long call(ConfStoreConnection conn) {
+ public Long call(ConfStoreDAOConnection conn) {
return conn.getNextVersion();
}
});
@@ -619,7 +615,7 @@ public class ProcessStoreImpl implements
}
}
- private ConfStoreConnection getConnection() {
+ private ConfStoreDAOConnection getConnection() {
return _cf.getConnection();
}
@@ -710,7 +706,7 @@ public class ProcessStoreImpl implements
// TODO: update the props based on the values in the DB.
ProcessConfImpl pconf = new ProcessConfImpl(p.getPID(), p.getType(), p.getVersion(), dud, pinfo, dudao
- .getDeployDate(), props, p.getState(), eprContext, _configDir, generateProcessEventsAll);
+ .getDeployDate(), props, p.getState(), _eprContext, _configDir, generateProcessEventsAll);
version = p.getVersion();
_processes.put(pconf.getProcessId(), pconf);
@@ -760,7 +756,7 @@ public class ProcessStoreImpl implements
try {
return exec(new Callable<Boolean>() {
- public Boolean call(ConfStoreConnection conn) {
+ public Boolean call(ConfStoreDAOConnection conn) {
DeploymentUnitDAO dudao = conn.getDeploymentUnit(duName);
if (dudao == null)
return false;
@@ -785,27 +781,32 @@ public class ProcessStoreImpl implements
*/
abstract class Callable<V> implements java.util.concurrent.Callable<V> {
public V call() {
- boolean success = false;
- // in JTA, transaction is bigger than the session
- _cf.beginTransaction();
- ConfStoreConnection conn = getConnection();
+ boolean success = false;
+ ConfStoreDAOConnection conn = getConnection();
try {
+ if (_txm!=null)
+ _txm.begin();
V r = call(conn);
- _cf.commitTransaction();
+ if (_txm!=null)
+ _txm.commit();
success = true;
return r;
+ } catch (Exception e){
+ e.printStackTrace();
+ __log.error("TxError",e);
+ return null;
} finally {
- if (!success)
+ if (!success && _txm != null)
try {
- _cf.rollbackTransaction();
+ _txm.rollback();
} catch (Exception ex) {
__log.error("DbError", ex);
}
+ conn.close();
}
- // session is closed automatically when committed or rolled back under JTA
}
- abstract V call(ConfStoreConnection conn);
+ abstract V call(ConfStoreDAOConnection conn);
}
public void setDeployDir(File depDir) {
@@ -836,11 +837,11 @@ public class ProcessStoreImpl implements
}
public static DataSource createInternalDS(String guid) {
- jdbcDataSource hsqlds = new jdbcDataSource();
- hsqlds.setDatabase("jdbc:hsqldb:mem:" + guid);
- hsqlds.setUser("sa");
- hsqlds.setPassword("");
- return hsqlds;
+ JdbcDataSource ds = new JdbcDataSource();
+ ds.setURL("jdbc:h2:mem:" + guid);
+ ds.setUser("sa");
+ ds.setPassword("");
+ return ds;
}
public static void shutdownInternalDB(DataSource ds) {
Added: ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DaoTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DaoTest.java?rev=986561&view=auto
==============================================================================
--- ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DaoTest.java (added)
+++ ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DaoTest.java Wed Aug 18 04:12:49 2010
@@ -0,0 +1,202 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ode.store;
+
+import junit.framework.TestCase;
+
+import org.apache.ode.dao.store.ConfStoreDAOConnection;
+import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
+import org.apache.ode.dao.store.DeploymentUnitDAO;
+import org.apache.ode.dao.store.ProcessConfDAO;
+import org.apache.ode.il.config.OdeConfigProperties;
+import org.apache.ode.il.dbutil.Database;
+import org.apache.ode.il.txutil.TxManager;
+import java.util.Properties;
+
+import javax.transaction.TransactionManager;
+import javax.xml.namespace.QName;
+
+public class DaoTest extends TestCase {
+
+ ConfStoreDAOConnectionFactory _cf;
+
+ Database _db;
+
+ TransactionManager _txm;
+
+ public void setUp() throws Exception {
+ Properties props = new Properties();
+ props.setProperty(OdeConfigProperties.PROP_DAOCF_STORE,System.getProperty(OdeConfigProperties.PROP_DAOCF_STORE,OdeConfigProperties.DEFAULT_DAOCF_STORE_CLASS));
+ OdeConfigProperties odeProps = new OdeConfigProperties(props, "");
+ TxManager tx = new TxManager(odeProps);
+ _txm = tx.createTransactionManager();
+ _db = new Database(odeProps);
+ _db.setTransactionManager(_txm);
+ _db.start();
+ _cf = _db.createDaoStoreCF();
+ }
+
+ public void tearDown() throws Exception {
+ _cf.shutdown();
+ _db.shutdown();
+ }
+
+ public void testEmpty() throws Exception {
+ ConfStoreDAOConnection conn = _cf.getConnection();
+ _txm.begin();
+ assertEquals(0, conn.getDeploymentUnits().size());
+ assertNull(conn.getDeploymentUnit("foobar"));
+ _txm.commit();
+ conn.close();
+ }
+
+ public void testCreateDU() throws Exception{
+ ConfStoreDAOConnection conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ DeploymentUnitDAO du = conn.createDeploymentUnit("foo");
+ assertNotNull(du);
+ assertEquals("foo", du.getName());
+ assertNotNull(du.getDeployDate());
+ } finally {
+ _txm.commit();
+ conn.close();
+ }
+
+ conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ DeploymentUnitDAO du = conn.getDeploymentUnit("foo");
+ assertNotNull(du);
+ assertEquals("foo", du.getName());
+ } finally {
+ _txm.commit();
+ }
+
+ }
+
+ public void testRollback() throws Exception {
+ ConfStoreDAOConnection conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ DeploymentUnitDAO du = conn.createDeploymentUnit("foo");
+ assertNotNull(du);
+ assertEquals("foo", du.getName());
+ assertNotNull(du.getDeployDate());
+ } finally {
+ _txm.rollback();
+ conn.close();
+ }
+
+ conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ DeploymentUnitDAO du = conn.getDeploymentUnit("foo");
+ assertNull(du);
+ } finally {
+ _txm.commit();
+ }
+ }
+
+ public void testGetDeploymentUnits() throws Exception {
+ ConfStoreDAOConnection conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ conn.createDeploymentUnit("foo1");
+ conn.createDeploymentUnit("foo2");
+ conn.createDeploymentUnit("foo3");
+ conn.createDeploymentUnit("foo4");
+ } finally {
+ _txm.commit();
+ conn.close();
+ }
+
+ conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ assertNotNull(conn.getDeploymentUnit("foo1"));
+ assertNotNull(conn.getDeploymentUnit("foo2"));
+ assertNotNull(conn.getDeploymentUnit("foo3"));
+ assertNotNull(conn.getDeploymentUnit("foo4"));
+ assertNull(conn.getDeploymentUnit("foo5"));
+ } finally {
+ _txm.commit();
+ }
+ }
+
+ public void testCreateProcess() throws Exception {
+ QName foobar = new QName("foo","bar");
+ ConfStoreDAOConnection conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ DeploymentUnitDAO du = conn.createDeploymentUnit("foo1");
+ ProcessConfDAO p = du.createProcess(foobar,foobar,1);
+ assertEquals(foobar,p.getPID());
+ assertEquals(foobar,p.getType());
+ assertNotNull(p.getDeploymentUnit());
+ assertEquals("foo1", p.getDeploymentUnit().getName());
+ } finally {
+ _txm.commit();
+ conn.close();
+ }
+
+ conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ DeploymentUnitDAO du = conn.getDeploymentUnit("foo1");
+ ProcessConfDAO p = du.getProcess(foobar);
+ assertNotNull(p);
+ assertNotNull(du.getProcesses());
+
+ assertEquals(foobar,p.getPID());
+ assertEquals(foobar,p.getType());
+ } finally {
+ _txm.commit();
+ conn.close();
+ }
+ }
+
+ public void testProcessProperties() throws Exception {
+ QName foobar = new QName("foo","bar");
+ ConfStoreDAOConnection conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ DeploymentUnitDAO du = conn.createDeploymentUnit("foo1");
+ ProcessConfDAO p = du.createProcess(foobar,foobar,1);
+ p.setProperty(foobar,"baz");
+ } finally {
+ _txm.commit();
+ conn.close();
+ }
+
+ conn = _cf.getConnection();
+ _txm.begin();
+ try {
+ DeploymentUnitDAO du = conn.getDeploymentUnit("foo1");
+ ProcessConfDAO p = du.getProcess(foobar);
+ assertNotNull(p.getProperty(foobar));
+ assertEquals("baz", p.getProperty(foobar));
+ assertNotNull(p.getPropertyNames());
+ assertTrue(p.getPropertyNames().contains(foobar));
+ } finally {
+ _txm.commit();
+ conn.close();
+ }
+ }
+}
\ No newline at end of file
Modified: ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java?rev=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java (original)
+++ ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java Wed Aug 18 04:12:49 2010
@@ -23,29 +23,49 @@ import java.net.URI;
import java.util.Collection;
import java.util.EnumSet;
import java.util.List;
+import java.util.Properties;
+import javax.transaction.TransactionManager;
import javax.xml.namespace.QName;
import junit.framework.TestCase;
import org.apache.ode.bpel.iapi.ProcessConf;
import org.apache.ode.bpel.iapi.ProcessConf.CLEANUP_CATEGORY;
+import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory;
+import org.apache.ode.il.config.OdeConfigProperties;
+import org.apache.ode.il.dbutil.Database;
+import org.apache.ode.il.txutil.TxManager;
public class ProcessStoreTest extends TestCase {
ProcessStoreImpl _ps;
+ Database _db;
+ ConfStoreDAOConnectionFactory _cf;
+
private File _testdd;
-
+
public void setUp() throws Exception {
- System.setProperty("openjpa.properties", "/openjpa.xml");
- _ps = new ProcessStoreImpl();
+ Properties props = new Properties();
+ props.setProperty(OdeConfigProperties.PROP_DAOCF_STORE,System.getProperty(OdeConfigProperties.PROP_DAOCF_STORE,OdeConfigProperties.DEFAULT_DAOCF_STORE_CLASS));
+ OdeConfigProperties odeProps = new OdeConfigProperties(props, "");
+ _db = new Database(odeProps);
+ TxManager tx = new TxManager(odeProps);
+ TransactionManager txm = tx.createTransactionManager();
+ _db.setTransactionManager(txm);
+ _db.start();
+ _cf = _db.createDaoStoreCF();
+ _ps = new ProcessStoreImpl(null,txm, _cf);
_ps.loadAll();
- URI tdd= getClass().getResource("/testdd/deploy.xml").toURI();
+ URI tdd = getClass().getResource("/testdd/deploy.xml").toURI();
_testdd = new File(tdd.getPath()).getParentFile();
- }
+
+ }
public void tearDown() throws Exception {
_ps.shutdown();
+ _cf.shutdown();
+ _db.shutdown();
}
public void testSanity() {
Modified: ode/trunk/bpel-test/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/pom.xml?rev=986561&r1=986560&r2=986561&view=diff
==============================================================================
--- ode/trunk/bpel-test/pom.xml (original)
+++ ode/trunk/bpel-test/pom.xml Wed Aug 18 04:12:49 2010
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-dao-jpa</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-runtime</artifactId>
@@ -146,28 +146,50 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql-connector-derby-common</artifactId>
<version>1.1</version>
</dependency>
+
+ <!-- for the integration tests - seems to work with the openjpa enhanced enities -->
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa-hibernate</artifactId>
+ <scope>test</scope>
+ </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>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
<systemPropertyVariables>
<org.apache.ode.autoRetireProcess>true</org.apache.ode.autoRetireProcess>
</systemPropertyVariables>
<argLine>-Xms512M -Xmx1024M -XX:MaxPermSize=512M</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
</project>