fix use of spring alias for authorizer

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

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
index 14789259a29b954a10f44e5154513d24ec966b27..21797dcaf66b39e970c15d853ba700365fb1a252 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
@@ -86,4 +86,6 @@
   <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
 
   <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
+  <alias name="authorizer#rbac" alias="authorizer#default"/>
 </beans>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
index 488cf5d086e7cb07cd3436ae3ef1242e44e53dd8..7eefdd9e5f9bd34c5b0d28706990436dbe0b3f77 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
@@ -118,5 +118,5 @@
   </bean>
 
   <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
-
+  <alias name="authorizer#rbac" alias="authorizer#default"/>
 </beans>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
index 4e9025ba2c4705abcc53d5774cd931bd9e6f6709..1078848e458b212e17c4d1220a85433956cf64c6 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
@@ -53,4 +53,5 @@
 
   <bean name="repositorySessionFactory" class="org.apache.archiva.webtest.memory.TestRepositorySessionFactory"/>
   <alias name="userConfiguration#archiva" alias="userConfiguration#default"/>
+  <alias name="authorizer#rbac" alias="authorizer#default"/>
 </beans>

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
index 00cea6f2a31f9a9a50c327feabcaeb077268cc67..d24c52141995f1887356159306972c98f8f157c1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
@@ -66,4 +66,5 @@
   
   <bean name="RoleManagerStub" class="org.apache.archiva.web.rss.RoleManagerStub"/>
   <alias name="userConfiguration#archiva" alias="userConfiguration#default"/>
+  <alias name="authorizer#rbac" alias="authorizer#default"/>
 </beans>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
index 05e2de5d40af418a66e2f5df42faed62cd226da2..412d7e9f348f41fca81982c59a51b356627c9c25 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
@@ -82,4 +82,5 @@
 
   <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
   <alias name="userConfiguration#archiva" alias="userConfiguration#default"/>
+  <alias name="authorizer#rbac" alias="authorizer#default"/>
 </beans>
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
index 884383bc55d228aee580bda3d3e9142522fe4513..9134bf53fef7046e9edeaa04be33c22e429e31fc 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
@@ -50,4 +50,5 @@
     </property>
   </bean>
   <alias name="userConfiguration#archiva" alias="userConfiguration#default"/>
+  <alias name="authorizer#rbac" alias="authorizer#default"/>
 </beans>

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 704358dec2930798c2d1eafbc3eff9a5f3dc7bfe..9f90b50c94bc79b8d6117e1a3ff5f675e9d5f867 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,6 +32,8 @@
 
   <alias name="userConfiguration#archiva" alias="userConfiguration#default" />
 
+  <alias name="authorizer#rbac" alias="authorizer#default"/>
+
   <bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager"
         init-method="initialize"/>