hack not anymore needed spring 3.2 is faster

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

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 180c5473a15aae37ba432b558dddefc416f2cafd..ea4f7ba3d16d0d13cf085c8f7b55825906770906 100644 (file)
--- 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
@@ -28,11 +28,6 @@
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
   </listener>
 
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>org.apache.archiva.redback.components.springutils.CachingWebApplicationContext</param-value>
-  </context-param>
-
   <servlet>
     <servlet-name>RssFeedServlet</servlet-name>
     <servlet-class>org.apache.archiva.web.rss.RssFeedServlet</servlet-class>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 9f90b50c94bc79b8d6117e1a3ff5f675e9d5f867..b55090452d63cc37f08a7c4914f80850550b6577 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -32,7 +32,7 @@
 
   <alias name="userConfiguration#archiva" alias="userConfiguration#default" />
 
-  <alias name="authorizer#rbac" alias="authorizer#default"/>
+  <alias name="authorizer#archiva" alias="authorizer#default"/>
 
   <bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager"
         init-method="initialize"/>

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
index 21eaa92b2ac507eab5142ac7fb2b0427654acc3c..158e4724a4f666a82dff4672e8a53a11907c4433 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
@@ -30,12 +30,8 @@
   <listener>
     <listener-class>org.apache.archiva.webdav.util.MavenIndexerCleaner</listener-class>
   </listener>
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>org.apache.archiva.redback.components.springutils.CachingWebApplicationContext</param-value>
-  </context-param>
 
-   <context-param>
+  <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
       classpath*:/META-INF/spring-context.xml

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
index 11ceaa7dd3634ea2f6ffd34bc1aa9f69e78810ed..d03192e4bdcc79830fdb40e4238481a988a415e7 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
@@ -30,10 +30,7 @@
   <listener>
     <listener-class>org.apache.archiva.webdav.util.MavenIndexerCleaner</listener-class>
   </listener>
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>org.apache.archiva.redback.components.springutils.CachingWebApplicationContext</param-value>
-  </context-param>
+
   <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>