Return-Path: 
 <commits-return-9664-apmail-archiva-commits-archive=archiva.apache.org@archiva.apache.org>
X-Original-To: apmail-archiva-commits-archive@www.apache.org
Delivered-To: apmail-archiva-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DF17BE761
	for <apmail-archiva-commits-archive@www.apache.org>;
 Sat,  5 Jan 2013 23:34:59 +0000 (UTC)
Received: (qmail 3385 invoked by uid 500); 5 Jan 2013 23:34:59 -0000
Delivered-To: apmail-archiva-commits-archive@archiva.apache.org
Received: (qmail 3341 invoked by uid 500); 5 Jan 2013 23:34:59 -0000
Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@archiva.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@archiva.apache.org>
List-Post: <mailto:commits@archiva.apache.org>
List-Id: <commits.archiva.apache.org>
Reply-To: dev@archiva.apache.org
Delivered-To: mailing list commits@archiva.apache.org
Received: (qmail 3334 invoked by uid 99); 5 Jan 2013 23:34:59 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Jan 2013 23:34:59 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Jan 2013 23:34:58 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 31F0723889BF;
	Sat,  5 Jan 2013 23:34:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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...
Date: Sat, 05 Jan 2013 23:34:38 -0000
To: commits@archiva.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130105233439.31F0723889BF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>