removing and renaming unused application contexts

diff --git a/.gitattributes b/.gitattributes
index 65bcc803c7e2c6c1647a55f49276615edb85ea3c..fa6f13924bcbc3581b89c6d74c0fa3361a2b0ba6 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -2034,8 +2034,7 @@ cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/lsid/LSIDMetadat
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/lsid/LSIDRegistryTest.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext-securityTest.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
-cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text
-cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContextSecurity.xml -text
+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContextSecurity.unused.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.cdmlib-services.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/test/function/ConcurrentSessionTest.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/validation/ValidationTest.xml -text

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml
deleted file mode 100644 (file)
index e886ce6..0000000
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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:context="http://www.springframework.org/schema/context"\r
-       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">
-
-
-    <import resource="classpath:/eu/etaxonomy/cdm/services.xml" />
-    <import resource="classpath:/eu/etaxonomy/cdm/hsql-datasource.xml" />
-    
-</beans>
\ No newline at end of file

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContextSecurity.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContextSecurity.unused.xml
similarity index 100%
rename from cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContextSecurity.xml
rename to cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContextSecurity.unused.xml