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 73bd682be641375cf868c6a44f8771f73a74a793..3a4c26fed8a8f5be5acf92dafd61fc1bf16563d5 100644 (file)
--- 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 fab8a29304ada5ec4349d60418b1e89a15acf428..ce525d51d027ec5342a6949e999385f45939017e 100644 (file)
--- 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 8a628b1b65f62879a463ab36f800bad5537505aa..7860e21a103cc84a2527b2fbe1cb6fd6afd56d1a 100644 (file)
--- 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 f4de2d66f0bfc6a32cfa99a206b37d48b6f8d866..e23485c79c681ed50a787091f1424c3ac594e3f9 100644 (file)
--- 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>