svn commit: r504161 - in /incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi: OdeConfigProperties.java OdeLifeCycle.java

[gn...@apache.org]

Author: gnodet
Date: Tue Feb  6 06:40:06 2007
New Revision: 504161

URL: http://svn.apache.org/viewvc?view=rev&rev=504161
Log:
Add a constructor to ProcessStoreImpl.java which takes the persistence type (jpa, hibernate)
instead of using a system property (which remains the default).
The main reason is that the bpel-dao is not configured through a system property
in the jbi SE but in a property file. So being consistent is better.

Modified:
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeConfigProperties.java
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java

Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeConfigProperties.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeConfigProperties.java?view=diff&rev=504161&r1=504160&r2=504161
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeConfigProperties.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeConfigProperties.java Tue Feb  6 06:40:06 2007
@@ -61,6 +61,7 @@
 
     private static final String PROP_CONNECTOR_NAME = "ode-jbi.connector.registryName";
 
+    private final static String PROP_PERSISTENCE_TYPE = "ode-jbi.store.persistence";
 
     private String _installDir;
 
@@ -166,5 +167,9 @@
 
     public String getDAOConnectionFactory() {
         return getProperty(PROP_DAOCF, "org.apache.ode.dao.jpa.ojpa.BPELDAOConnectionFactoryImpl");        
+    }
+    
+    public String getPersistenceType() {
+        return getProperty(PROP_PERSISTENCE_TYPE, "jpa");
     }
 }

Modified: incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?view=diff&rev=504161&r1=504160&r2=504161
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java (original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java Tue Feb  6 06:40:06 2007
@@ -239,7 +239,7 @@
         _ode._scheduler.setDataSource(_ode._dataSource);
         _ode._scheduler.init();
 
-        _ode._store = new ProcessStoreImpl(_ode._dataSource);
+        _ode._store = new ProcessStoreImpl(_ode._dataSource, _ode._config.getPersistenceType());
         _ode._store.loadAll();