Author: mriou
Date: Tue Apr 22 17:41:15 2008
New Revision: 650707
URL: http://svn.apache.org/viewvc?rev=650707&view=rev
Log:
Conf properties for store. Actually it's better the pass the main props object.
Modified:
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
Modified:
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=650707&r1=650706&r2=650707&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
(original)
+++
ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
Tue Apr 22 17:41:15 2008
@@ -434,7 +434,7 @@
}
protected ProcessStoreImpl createProcessStore(DataSource ds) {
- return new ProcessStoreImpl(ds, _odeConfig.getDAOConnectionFactory(),
_odeConfig.getProperties(), false);
+ return new ProcessStoreImpl(ds, _odeConfig.getDAOConnectionFactory(),
_odeConfig, false);
}
protected Scheduler createScheduler() {
Modified:
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java?rev=650707&r1=650706&r2=650707&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
Tue Apr 22 17:41:15 2008
@@ -36,6 +36,7 @@
import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl;
import org.apache.ode.il.EmbeddedGeronimoFactory;
import org.apache.ode.il.MockScheduler;
+import org.apache.ode.il.config.OdeConfigProperties;
import org.apache.ode.il.dbutil.Database;
import org.apache.ode.store.ProcessStoreImpl;
import org.apache.ode.utils.DOMUtils;
@@ -88,7 +89,7 @@
_server.setInMemDaoConnectionFactory(new
BpelDAOConnectionFactoryImpl(_scheduler));
if (_scheduler == null)
throw new RuntimeException("No scheduler");
- _store = new ProcessStoreImpl(_dataSource,"jpa", new Properties(),
true);
+ _store = new ProcessStoreImpl(_dataSource,"jpa", new
OdeConfigProperties(new Properties(), ""), true);
_server.setScheduler(_scheduler);
_server.setEndpointReferenceContext(createEndpointReferenceContext());
_server.setMessageExchangeContext(createMessageExchangeContext());
Modified:
ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=650707&r1=650706&r2=650707&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Tue Apr 22 17:41:15 2008
@@ -33,6 +33,7 @@
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.GUID;
import org.apache.ode.utils.msg.MessageBundle;
+import org.apache.ode.il.config.OdeConfigProperties;
import org.hsqldb.jdbc.jdbcDataSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -104,14 +105,14 @@
private DataSource _inMemDs;
public ProcessStoreImpl() {
- this(null, "", new Properties(), true);
+ this(null, "", new OdeConfigProperties(new Properties(), ""), true);
}
- public ProcessStoreImpl(DataSource ds, String persistenceType, Properties
props, boolean auto) {
+ public ProcessStoreImpl(DataSource ds, String persistenceType,
OdeConfigProperties props, boolean auto) {
if (ds != null) {
// ugly hack
if (persistenceType.toLowerCase().indexOf("hib") != -1)
- _cf = new
org.apache.ode.store.hib.DbConfStoreConnectionFactory(ds, props, auto);
+ _cf = new
org.apache.ode.store.hib.DbConfStoreConnectionFactory(ds,
props.getProperties(), auto);
else
_cf = new
org.apache.ode.store.jpa.DbConfStoreConnectionFactory(ds, auto);
} else {
@@ -119,7 +120,7 @@
// database. Makes testing a bit simpler.
DataSource hsqlds = createInternalDS(_guid);
if ("hibernate".equalsIgnoreCase(persistenceType))
- _cf = new
org.apache.ode.store.hib.DbConfStoreConnectionFactory(hsqlds, props, auto);
+ _cf = new
org.apache.ode.store.hib.DbConfStoreConnectionFactory(hsqlds,
props.getProperties(), auto);
else
_cf = new
org.apache.ode.store.jpa.DbConfStoreConnectionFactory(hsqlds, auto);
_inMemDs = hsqlds;
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?rev=650707&r1=650706&r2=650707&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
Tue Apr 22 17:41:15 2008
@@ -32,6 +32,7 @@
import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl;
import org.apache.ode.il.MockScheduler;
+import org.apache.ode.il.config.OdeConfigProperties;
import org.apache.ode.store.ProcessConfImpl;
import org.apache.ode.store.ProcessStoreImpl;
import org.apache.ode.utils.DOMUtils;
@@ -133,7 +134,7 @@
_server.setBindingContext(new BindingContextImpl());
_server.setMessageExchangeContext(mexContext);
scheduler.setJobProcessor(_server);
- store = new ProcessStoreImpl(null, "jpa", new Properties(), true);
+ store = new ProcessStoreImpl(null, "jpa", new OdeConfigProperties(new
Properties(), ""), true);
store.registerListener(new ProcessStoreListener() {
public void onProcessStoreEvent(ProcessStoreEvent event) {
// bounce the process
Modified:
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=650707&r1=650706&r2=650707&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
(original)
+++
ode/branches/APACHE_ODE_1.1/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
Tue Apr 22 17:41:15 2008
@@ -212,8 +212,7 @@
_ode._scheduler.setExecutorService(_ode._executorService);
_ode._scheduler.setTransactionManager((TransactionManager)
_ode.getContext().getTransactionManager());
- _ode._store = new ProcessStoreImpl(_ode._dataSource,
_ode._config.getDAOConnectionFactory(),
- _ode._config.getProperties(), false);
+ _ode._store = new ProcessStoreImpl(_ode._dataSource,
_ode._config.getDAOConnectionFactory(), _ode._config, false);
_ode._store.loadAll();
_ode._server.setInMemDaoConnectionFactory(new
org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl(
