You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2008/04/23 00:59:01 UTC
svn commit: r650689 - in /ode/branches/APACHE_ODE_1.1:
axis2/src/main/java/org/apache/ode/axis2/
bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/
bpel-store/src/main/java/org/apache/ode/store/
bpel-store/src/main/java/org/apache/ode/store/hib/ b...
Author: mriou
Date: Tue Apr 22 15:58:44 2008
New Revision: 650689
URL: http://svn.apache.org/viewvc?rev=650689&view=rev
Log:
The BPEL store now shares the main configuration (mostly for persistence config).
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-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.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=650689&r1=650688&r2=650689&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 15:58:44 2008
@@ -434,7 +434,7 @@
}
protected ProcessStoreImpl createProcessStore(DataSource ds) {
- return new ProcessStoreImpl(ds, _odeConfig.getDAOConnectionFactory(), false);
+ return new ProcessStoreImpl(ds, _odeConfig.getDAOConnectionFactory(), _odeConfig.getProperties(), 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=650689&r1=650688&r2=650689&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 15:58:44 2008
@@ -88,7 +88,7 @@
_server.setInMemDaoConnectionFactory(new BpelDAOConnectionFactoryImpl(_scheduler));
if (_scheduler == null)
throw new RuntimeException("No scheduler");
- _store = new ProcessStoreImpl(_dataSource,"jpa", true);
+ _store = new ProcessStoreImpl(_dataSource,"jpa", 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=650689&r1=650688&r2=650689&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 15:58:44 2008
@@ -43,13 +43,7 @@
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.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -110,14 +104,14 @@
private DataSource _inMemDs;
public ProcessStoreImpl() {
- this(null, "", true);
+ this(null, "", new Properties(), true);
}
- public ProcessStoreImpl(DataSource ds, String persistenceType, boolean auto) {
+ public ProcessStoreImpl(DataSource ds, String persistenceType, Properties props, boolean auto) {
if (ds != null) {
// ugly hack
if (persistenceType.toLowerCase().indexOf("hib") != -1)
- _cf = new org.apache.ode.store.hib.DbConfStoreConnectionFactory(ds, auto);
+ _cf = new org.apache.ode.store.hib.DbConfStoreConnectionFactory(ds, props, auto);
else
_cf = new org.apache.ode.store.jpa.DbConfStoreConnectionFactory(ds, auto);
} else {
@@ -125,7 +119,7 @@
// database. Makes testing a bit simpler.
DataSource hsqlds = createInternalDS(_guid);
if ("hibernate".equalsIgnoreCase(persistenceType))
- _cf = new org.apache.ode.store.hib.DbConfStoreConnectionFactory(hsqlds, auto);
+ _cf = new org.apache.ode.store.hib.DbConfStoreConnectionFactory(hsqlds, props, auto);
else
_cf = new org.apache.ode.store.jpa.DbConfStoreConnectionFactory(hsqlds, auto);
_inMemDs = hsqlds;
Modified: ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java?rev=650689&r1=650688&r2=650689&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java Tue Apr 22 15:58:44 2008
@@ -78,24 +78,24 @@
final SessionFactory _sessionFactory;
- public DbConfStoreConnectionFactory(DataSource ds, boolean auto) {
+ public DbConfStoreConnectionFactory(DataSource ds, Properties properties, boolean auto) {
_ds = ds;
- Properties properties = new Properties();
-
__log.debug("using data source: " + ds);
_dataSources.put(_guid, ds);
properties.put("guid", _guid);
properties.put(Environment.CONNECTION_PROVIDER, DataSourceConnectionProvider.class.getName());
- try {
- properties.put(Environment.DIALECT, guessDialect(_ds));
- } catch (Exception ex) {
- String errmsg = __msgs.msgOdeInitHibernateDialectDetectFailed();
- __log.error(errmsg, ex);
- throw new BpelEngineException(errmsg, ex);
+ if (properties.get(Environment.DIALECT) == null) {
+ try {
+ properties.put(Environment.DIALECT, guessDialect(_ds));
+ } catch (Exception ex) {
+ String errmsg = __msgs.msgOdeInitHibernateDialectDetectFailed();
+ __log.error(errmsg, ex);
+ throw new BpelEngineException(errmsg, ex);
+ }
}
-
+
if (auto) {
properties.put(Environment.HBM2DDL_AUTO, "create-drop");
}
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=650689&r1=650688&r2=650689&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 15:58:44 2008
@@ -133,7 +133,7 @@
_server.setBindingContext(new BindingContextImpl());
_server.setMessageExchangeContext(mexContext);
scheduler.setJobProcessor(_server);
- store = new ProcessStoreImpl(null, "jpa", true);
+ store = new ProcessStoreImpl(null, "jpa", 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=650689&r1=650688&r2=650689&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 15:58:44 2008
@@ -212,7 +212,8 @@
_ode._scheduler.setExecutorService(_ode._executorService);
_ode._scheduler.setTransactionManager((TransactionManager) _ode.getContext().getTransactionManager());
- _ode._store = new ProcessStoreImpl(_ode._dataSource, _ode._config.getDAOConnectionFactory(), false);
+ _ode._store = new ProcessStoreImpl(_ode._dataSource, _ode._config.getDAOConnectionFactory(),
+ _ode._config.getProperties(), false);
_ode._store.loadAll();
_ode._server.setInMemDaoConnectionFactory(new org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl(