(no commit message)

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/CdmEntityDaoBaseTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/CdmEntityDaoBaseTest.java
index db3640401f7efd55ed203db7bd5b4ad01d1177f5..6028444b51a8e8e2a8d97dac1579f014b0e8327c 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/CdmEntityDaoBaseTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/CdmEntityDaoBaseTest.java
@@ -35,7 +35,7 @@ import eu.etaxonomy.cdm.test.unit.CdmUnitTestBase;
  *\r
  */\r
 @RunWith(SpringJUnit4ClassRunner.class)\r
-@ContextConfiguration(locations={"/applicationContext-test.xml"})\r
+@ContextConfiguration(locations={"/applicationContext.xml"})\r
 @TransactionConfiguration(defaultRollback=false)   //TODO rollback=true does not work yet because of Terms\r
 @Transactional\r
 public class CdmEntityDaoBaseTest {\r

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFactory.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFactory.java
index b02b066d5c602cd4edeabce99b538d68a0ab06fc..87334f958d22ab589c93e96ea896b7000daf1913 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFactory.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFactory.java
@@ -15,7 +15,7 @@ public class TestSessionFactory {
        \r
        \r
        private boolean testFromApplication(){\r
-               String appContextString = "applicationContext-test.xml";\r
+               String appContextString = "applicationContext.xml";\r
                ClassPathXmlApplicationContext appContext = new ClassPathXmlApplicationContext(appContextString);\r
                appContext.close();\r
                return true;\r

diff --git a/cdmlib-persistence/src/test/resources/applicationContext.xml b/cdmlib-persistence/src/test/resources/applicationContext.xml
index 7437a6b14ff71c3081646b40cd169f31fd44f8d6..dd8ca0887a0d3b3ad7490c9ec772fbb7235860fd 100644 (file)
--- a/cdmlib-persistence/src/test/resources/applicationContext.xml
+++ b/cdmlib-persistence/src/test/resources/applicationContext.xml
@@ -9,6 +9,6 @@
 
 
        <import resource="cdm-persistence.xml" />
-       <import resource="cdm-jdbc-datasource.xml" />
+       <import resource="cdm-hsql-datasource.xml" />
     
 </beans>
\ No newline at end of file

diff --git a/cdmlib-persistence/src/test/resources/db.properties b/cdmlib-persistence/src/test/resources/db.properties
index 79e7e7d4b090c568204580e0a644fff241b8693e..708c2bece3f09ec2c7514483328b0ff25c7fa90d 100644 (file)
--- a/cdmlib-persistence/src/test/resources/db.properties
+++ b/cdmlib-persistence/src/test/resources/db.properties
@@ -1,11 +1,11 @@
 hibernate.hbm2ddl.auto=create
-hibernate.show_sql=true
+hibernate.show_sql=false
 
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
-db.driver_class=com.mysql.jdbc.Driver
-db.url=jdbc:mysql://192.168.2.10/cdm_build
-db.username=edit
-db.password=wp5
+#hibernate.dialect=org.hibernate.dialect.MySQLDialect
+#db.driver_class=com.mysql.jdbc.Driver
+#db.url=jdbc:mysql://192.168.2.10/cdm_build
+#db.username=edit
+#db.password=wp5
 
 #hibernate.dialect=org.hibernate.dialect.SQLServerDialect
 #db.driver_class=com.microsoft.jdbc.sqlserver.SQLServerDriver