You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/06 00:34:38 UTC

svn commit: r1429424 - in /archiva/trunk/archiva-modules/archiva-web: archiva-web-common/src/test/webapp/WEB-INF/ archiva-webapp/src/main/webapp/WEB-INF/ archiva-webdav/src/test/resources/WEB-INF/ archiva-webdav/src/test/resources/WEB-INF/repository-se...

Author: olamy
Date: Sat Jan  5 23:34:38 2013
New Revision: 1429424

URL: http://svn.apache.org/viewvc?rev=1429424&view=rev
Log:
hack not anymore needed spring 3.2 is faster

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml?rev=1429424&r1=1429423&r2=1429424&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/webapp/WEB-INF/feedServletTest-web.xml Sat Jan  5 23:34:38 2013
@@ -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>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1429424&r1=1429423&r2=1429424&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml Sat Jan  5 23:34:38 2013
@@ -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"/>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml?rev=1429424&r1=1429423&r2=1429424&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/repository-servlet-security-test/web.xml Sat Jan  5 23:34:38 2013
@@ -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

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml?rev=1429424&r1=1429423&r2=1429424&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml Sat Jan  5 23:34:38 2013
@@ -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>