From: Olivier Lamy <olamy@apache.org>
Date: Wed, 5 Oct 2011 19:29:30 +0000 (+0000)
Subject: cleanup spring configuration for unit tests in webapp
X-Git-Tag: archiva-1.4-M1~72
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=28fce4b89f97987a2366473447403672ce39ec67;p=archiva.git

cleanup spring configuration for unit tests in webapp

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1179396 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml
index 73bd682be..3a4c26fed 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml
@@ -35,8 +35,4 @@
   <bean name="archivaConfiguration#test" class="org.apache.archiva.configuration.TestConfiguration" />
   <alias name="archivaConfiguration#test" alias="archivaConfiguration#default" />
 
-  <bean id="jcr-config" class="org.apache.jackrabbit.core.config.RepositoryConfig" factory-method="create">
-    <constructor-arg value="${basedir}/appserver-base/conf/repository.xml"/>
-    <constructor-arg value="${appserver.base}/jcr"/>
-  </bean>
 </beans>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
index fab8a2930..ce525d51d 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
@@ -51,9 +51,4 @@
     </property>
   </bean>
 
-  <bean id="jcr-config" class="org.apache.jackrabbit.core.config.RepositoryConfig" factory-method="create">
-    <constructor-arg value="${basedir}/appserver-base/conf/repository.xml"/>
-    <constructor-arg value="${appserver.base}/jcr"/>
-  </bean>
-
 </beans>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-rss-servlet.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-rss-servlet.xml
index 8a628b1b6..7860e21a1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-rss-servlet.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-rss-servlet.xml
@@ -43,9 +43,4 @@
 
   <alias name="securitySystem#test" alias="securitySystem"/>
 
-  <bean id="jcr-config" class="org.apache.jackrabbit.core.config.RepositoryConfig" factory-method="create">
-    <constructor-arg value="${basedir}/appserver-base/conf/repository.xml"/>
-    <constructor-arg value="${appserver.base}/jcr"/>
-  </bean>
-
 </beans>
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
index f4de2d66f..e23485c79 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
@@ -41,9 +41,4 @@
   <bean name="metadataResolver#test" class="org.apache.archiva.webtest.memory.TestMetadataResolver"/>
   <alias name="metadataResolver#test" alias="metadataResolver#default"/>
 
-  <bean id="jcr-config" class="org.apache.jackrabbit.core.config.RepositoryConfig" factory-method="create">
-    <constructor-arg value="${basedir}/appserver-base/conf/repository.xml"/>
-    <constructor-arg value="${appserver.base}/jcr"/>
-  </bean>
-
 </beans>