(no commit message)

diff --git a/.gitattributes b/.gitattributes
index 9d900357674666c30e06a0e5ece5048d09df3515..6114257df339f9dad22d3b37f282c999474d08d6 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -260,6 +260,7 @@ cdmlibrary/src/test/java/eu/etaxonomy/cdm/test/unit/CdmUnitTestBase.java -text
 cdmlibrary/src/test/java/extern/TestJarMain.java -text
 cdmlibrary/src/test/resources/appInitContext.xml -text
 cdmlibrary/src/test/resources/applicationContext-test.xml -text
+cdmlibrary/src/test/resources/test.cdm.datasource.xml -text
 docs/layers.graffle -text
 docs/layers.png -text
 musiclib-hibernatetest/listAnnotatedClasses.py -text

diff --git a/cdmlibrary/src/test/resources/applicationContext-test.xml b/cdmlibrary/src/test/resources/applicationContext-test.xml
index 6cf871adb9f860ae7459d72f7575d84b6ba51759..219991174e5cee0cffea4cca103eb72c26c4c664 100644 (file)
--- a/cdmlibrary/src/test/resources/applicationContext-test.xml
+++ b/cdmlibrary/src/test/resources/applicationContext-test.xml
@@ -9,13 +9,6 @@
 
 
        <import resource="sessionfactory.xml" />
-
-       <bean id="mysqlDataSource"\r
-               class="org.springframework.jdbc.datasource.DriverManagerDataSource">\r
-               <property name="driverClassName" value="com.mysql.jdbc.Driver"/>\r
-               <property name="url" value="jdbc:mysql://192.168.2.10/cdm_test_lib"/>\r
-               <property name="username" value="edit" />\r
-               <property name="password" value="wp5" />\r
-       </bean>\r
-\r
+       <import resource="test.cdm.datasource.xml" />\r
+       
 </beans>
\ No newline at end of file

diff --git a/cdmlibrary/src/test/resources/test.cdm.datasource.xml b/cdmlibrary/src/test/resources/test.cdm.datasource.xml
new file mode 100644 (file)
index 0000000..3629c05
--- /dev/null
+++ b/cdmlibrary/src/test/resources/test.cdm.datasource.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans 
+    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    http://www.springframework.org/schema/context
+    http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+        
+    <bean id="defaultDataSource" 
+        class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+        <property name="url" value="jdbc:mysql://192.168.2.10/cdm_test_andreas"/>
+        <property name="username" value="edit"/>
+        <property name="password" value="wp5"/>
+    </bean>
+        
+</beans>
+