fix unit tets configuration

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
index 106e9cb7303c772b36fade82a2c3f36292d91b90..7741913b29ba0d8046fde00221677ada3c544592 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
@@ -37,18 +37,13 @@
        <servlet-name>RssFeedServlet</servlet-name>
        <url-pattern>/feeds/*</url-pattern>
   </servlet-mapping>
-  
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
-  </context-param>
+
 
    <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
-        classpath*:/META-INF/plexus/components.xml
+        classpath*:/spring-context.xml
         classpath*:/META-INF/spring-context.xml
-        target/test-classes/org/apache/maven/archiva/web/rss/RssFeedServletTest.xml
     </param-value>
   </context-param>
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
index f47bd657f0a43e584e4b4b5c9e18a5b7685c4234..7df481abd613b9ab2db805c1b20a10161a09883f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/web.xml
@@ -28,17 +28,11 @@
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
   </listener>
 
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
-  </context-param>
-
    <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
-        classpath*:/META-INF/plexus/components.xml
+        classpath*:/spring-context.xml
         classpath*:/META-INF/spring-context.xml
-        target/test-classes/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
     </param-value>
   </context-param>