svn commit: r942148 - in /ode/branches/APACHE_ODE_1.X: Rakefile bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java

[rr...@apache.org]

Author: rr
Date: Fri May  7 16:42:25 2010
New Revision: 942148

URL: http://svn.apache.org/viewvc?rev=942148&view=rev
Log:
Moving to hibernate in bpel-test

Modified:
    ode/branches/APACHE_ODE_1.X/Rakefile
    ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java

Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=942148&r1=942147&r2=942148&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Fri May  7 16:42:25 2010
@@ -248,7 +248,7 @@ define "ode" do
   desc "ODE BPEL Tests"
   define "bpel-test" do
     compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-runtime",
-      "bpel-store", "utils", "bpel-epr", "dao-jpa", "agents"),
+      "bpel-store", "utils", "bpel-epr", "dao-hibernate", "agents"),
       DERBY, JUnit.dependencies, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient,
     COMMONS.codec
 

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?rev=942148&r1=942147&r2=942148&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java Fri May  7 16:42:25 2010
@@ -50,7 +50,6 @@ import org.apache.ode.bpel.iapi.ProcessS
 import org.apache.ode.bpel.iapi.MessageExchange.Status;
 import org.apache.ode.bpel.iapi.MyRoleMessageExchange.CorrelationStatus;
 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;
@@ -105,7 +104,7 @@ public abstract class BPELTestAbstract {
         if (Boolean.getBoolean("org.apache.ode.test.persistent")) {
             emf = Persistence.createEntityManagerFactory("ode-unit-test-embedded");
             em = emf.createEntityManager();
-            _cf = new BPELDAOConnectionFactoryImpl();
+            _cf = new org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl();
             _server.setDaoConnectionFactory(_cf);
             scheduler = new MockScheduler() {
                 @Override
@@ -137,7 +136,7 @@ public abstract class BPELTestAbstract {
         _server.setBindingContext(new BindingContextImpl());
         _server.setMessageExchangeContext(mexContext);
         scheduler.setJobProcessor(_server);
-        store = new ProcessStoreImpl(null, null, "jpa", new OdeConfigProperties(new Properties(), ""), true);
+        store = new ProcessStoreImpl(null, null, "hibernate", new OdeConfigProperties(new Properties(), ""), true);
         store.registerListener(new ProcessStoreListener() {
             public void onProcessStoreEvent(ProcessStoreEvent event) {
                 // bounce the process