(no commit message)

diff --git a/.gitattributes b/.gitattributes
index 9e5894a73ed06272ae58b23b45ffe6ada787f2b9..f917700d3df367191e87fdfedacce96f42dd98f6 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -220,6 +220,7 @@ cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/INameCacheStrategy.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/IStrategy.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/StrategyBase.java -text
 cdmlibrary/src/main/java/eu/etaxonomy/cdm/strategy/ZooNameCacheStrategy.java -text
+cdmlibrary/src/main/resources/applicationContext.xml -text
 cdmlibrary/src/main/resources/editCdm-spring-cfg-test.xml -text
 cdmlibrary/src/main/resources/editCdm.spring.cfg.xml -text
 cdmlibrary/src/main/resources/log4j.properties -text

diff --git a/cdmlibrary/src/main/resources/applicationContext.xml b/cdmlibrary/src/main/resources/applicationContext.xml
new file mode 100644 (file)
index 0000000..05d123a
--- /dev/null
+++ b/cdmlibrary/src/main/resources/applicationContext.xml
@@ -0,0 +1,15 @@
+<?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">
+    
+    <context:annotation-config/>
+    
+    <import resource="services.xml"/>
+    
+</beans>
+

diff --git a/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml b/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
index dee5b3249ec16f0447b9738526f4f45707b6abd8..30795d312c830309fb2b4a2c12aeb06aef71951e 100644 (file)
--- a/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
+++ b/cdmlibrary/src/main/resources/editCdm.spring.cfg.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
- <beans xmlns="http://www.springframework.org/schema/beans"\r
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-    xmlns:aop="http://www.springframework.org/schema/aop"\r
-    xsi:schemaLocation="http://www.springframework.org/schema/beans \r
-          http://www.springframework.org/schema/beans/spring-beans-2.0.xsd\r
-          http://www.springframework.org/schema/aop\r
-          http://www.springframework.org/schema/aop/spring-aop-2.0.xsd" >\r
+<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">
+               
+     <context:annotation-config/>\r
    \r
    <bean id="mysqlDataSource" \r
                        class="org.springframework.jdbc.datasource.DriverManagerDataSource">\r
@@ -18,8 +20,7 @@
        <bean id="localDataSource" \r
                        class="eu.etaxonomy.cdm.database.LocalHsqldb" \r
                        init-method="init"\r
-                       destroy-method="destroy"\r
-                       >\r
+                       destroy-method="destroy">\r
         <property name="username" value="sa"/>\r
         <property name="password" value=""/>\r
         <property name="startServer" value="false"/>\r