svn commit: r526920 - in /incubator/ode/trunk: ./ bpel-store/src/main/java/org/apache/ode/store/hib/ bpel-store/src/main/java/org/apache/ode/store/jpa/ bpel-store/src/test/java/org/apache/ode/store/

[mriou]

Author: mriou
Date: Mon Apr  9 14:10:03 2007
New Revision: 526920

URL: http://svn.apache.org/viewvc?view=rev&rev=526920
Log:
Store tests all work.

Modified:
    incubator/ode/trunk/Rakefile
    
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
    
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java
    
incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java
    
incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java

Modified: incubator/ode/trunk/Rakefile
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/Rakefile?view=diff&rev=526920&r1=526919&r2=526920
==============================================================================
--- incubator/ode/trunk/Rakefile (original)
+++ incubator/ode/trunk/Rakefile Mon Apr  9 14:10:03 2007
@@ -232,9 +232,15 @@
       "ode:dao-hibernate", "ode:utils"),
       COMMONS.logging, JAVAX.persistence, JAVAX.stream, HIBERNATE, HSQLDB, 
XMLBEANS, XERCES, WSDL4J
 
-    compile { open_jpa_enhance }
-    tests.run.with DOM4J
-
+    compile do 
+      Java::Hibernate.xdoclet :source=>compile.sources, :include=>"**/*.java",
+        :target=>compile.target, :excludedtags=>"@version,@author,@todo"
+      open_jpa_enhance
+    end
+    tests do
+      run.with COMMONS.collections, COMMONS.lang, JAVAX.connector, 
JAVAX.transaction, DOM4J, LOG4J, 
+        XERCES, XALAN, JAXEN, SAXON, OPENJPA
+    end
     package :jar
   end
 

Modified: 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java?view=diff&rev=526920&r1=526919&r2=526920
==============================================================================
--- 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 (original)
+++ 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 Mon Apr  9 14:10:03 2007
@@ -71,7 +71,7 @@
         // Sybase SQL Server
         // Informix Dynamic Server
         // Oracle 8 and Oracle >8
-        HIBERNATE_DIALECTS.put("Apache Derby", new 
DialectFactory.VersionInsensitiveMapper("org.hibernate.dialect.DerbyDialect"));
+        HIBERNATE_DIALECTS.put("Apache Derby", new 
DialectFactory.VersionInsensitiveMapper(DEFAULT_HIBERNATE_DIALECT));
     }
 
     private final DataSource _ds;

Modified: 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java?view=diff&rev=526920&r1=526919&r2=526920
==============================================================================
--- 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java
 (original)
+++ 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java
 Mon Apr  9 14:10:03 2007
@@ -37,6 +37,7 @@
 
     public DbConfStoreConnectionFactory(DataSource ds, boolean auto) {
         _ds = ds;
+        
System.out.println(getClass().getResource("/META-INF/persistence.xml"));
         HashMap propMap = new HashMap();
         propMap.put("javax.persistence.nonJtaDataSource", ds);
         propMap.put("openjpa.Log", "log4j");

Modified: 
incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java?view=diff&rev=526920&r1=526919&r2=526920
==============================================================================
--- 
incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java
 (original)
+++ 
incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java
 Mon Apr  9 14:10:03 2007
@@ -36,14 +36,13 @@
      * Test some complicated xsd/wsdl loading. 
      */
     public void setUp() throws Exception {
-//        File dir = new 
File(getClass().getResource("/complexImport/deploy.xml").getPath()).getParentFile();
-        File dir = new File("/tmp/relative-include/build/");
+        File dir = new 
File(getClass().getResource("/complexImport/deploy.xml").getPath()).getParentFile();
         du = new DeploymentUnitDir(dir);
     }
     
     public void testRegistry() {
         DocumentRegistry dr = du.getDocRegistry();
-        //assertNotNull(dr.getDefinitionForPortType(new 
QName("http://ode/bpel/unit-test.wsdl","HelloPortType";)));
+        assertNotNull(dr.getDefinitionForPortType(new 
QName("http://ode/bpel/unit-test.wsdl","HelloPortType";)));
     }
     
     public void testCompile() {

Modified: 
incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java?view=diff&rev=526920&r1=526919&r2=526920
==============================================================================
--- 
incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
 (original)
+++ 
incubator/ode/trunk/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
 Mon Apr  9 14:10:03 2007
@@ -35,6 +35,7 @@
     private File _testdd;
     
     public void setUp() throws Exception {
+        System.setProperty("openjpa.properties", "/openjpa.xml");
         _ps = new ProcessStoreImpl();
         _ps.loadAll();
         URL tdd= getClass().getResource("/testdd/deploy.xml");