fix spring context for unit tests

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

6 files changed, 52 insertions, 2 deletions

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadArtifactsTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadArtifactsTest.java
index ff1c7322e..6f8959cf0 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadArtifactsTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadArtifactsTest.java
@@ -86,7 +86,7 @@ public class DownloadArtifactsTest
 
     protected String getSpringConfigLocation()
     {
-        return "classpath*:META-INF/spring-context.xml classpath*:spring-context-artifacts-download.xml";
+        return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-artifacts-download.xml";
     }
 
     @Before
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
index 118ff0dc8..3d24a30df 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
@@ -66,7 +66,7 @@ public class DownloadMergedIndexTest
 
     protected String getSpringConfigLocation()
     {
-        return "classpath*:META-INF/spring-context.xml classpath*:spring-context-merge-index-download.xml";
+        return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-merge-index-download.xml";
     }
 
     @After
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
index 4478e93dc..4478e93dc 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml
index 94cbba3c7..180c5473a 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml
@@ -47,6 +47,7 @@
     <param-name>contextConfigLocation</param-name>
     <param-value>
       classpath*:/META-INF/spring-context.xml
+      classpath*:/spring-context-test-common.xml
       classpath*:/spring-context-rss-servlet.xml
     </param-value>
   </context-param>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/junit-4.9.jar b/archiva-modules/archiva-web/archiva-webapp-js/src/test/junit-4.9.jar
deleted file mode 100644
index 142081561..000000000
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/junit-4.9.jar
+++ /dev/null
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/repository.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/repository.xml
new file mode 100644
index 000000000..0be86ebbd
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/repository.xml
@@ -0,0 +1,49 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
+    "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+
+<Repository>
+  <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+  <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+    <param name="path" value="${rep.home}/repository"/>
+</FileSystem>  -->
+  <Security appName="Jackrabbit">
+    <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security"/>
+    <AccessManager class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/>
+    <LoginModule class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule"/>
+  </Security>
+  <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
+  <Workspace name="${wsp.name}">
+    <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+      <param name="path" value="${wsp.home}"/>
+    </FileSystem>
+    <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>
+    <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+      <param name="path" value="${wsp.home}/index"/>
+    </SearchIndex>
+  </Workspace>
+  <Versioning rootPath="${rep.home}/version">
+    <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+      <param name="path" value="${rep.home}/version"/>
+    </FileSystem>
+    <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>
+  </Versioning>
+</Repository>