From: m.doering <m.doering@localhost>
Date: Mon, 3 Mar 2008 17:42:26 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_1.1.0~72
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/44d321c8da49ac5cbdcfb9bd874c6e90b5c6b6e7

---

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 db3640401f..6028444b51 100644
--- 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;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={"/applicationContext-test.xml"})
+@ContextConfiguration(locations={"/applicationContext.xml"})
 @TransactionConfiguration(defaultRollback=false)   //TODO rollback=true does not work yet because of Terms
 @Transactional
 public class CdmEntityDaoBaseTest {
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 b02b066d5c..87334f958d 100644
--- 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 {
 	
 	
 	private boolean testFromApplication(){
-		String appContextString = "applicationContext-test.xml";
+		String appContextString = "applicationContext.xml";
 		ClassPathXmlApplicationContext appContext = new ClassPathXmlApplicationContext(appContextString);
 		appContext.close();
 		return true;
diff --git a/cdmlib-persistence/src/test/resources/applicationContext.xml b/cdmlib-persistence/src/test/resources/applicationContext.xml
index 7437a6b14f..dd8ca0887a 100644
--- 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 79e7e7d4b0..708c2bece3 100644
--- 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