Author: olamy
Date: Fri Jan 4 18:33:38 2013
New Revision: 1429023
URL: http://svn.apache.org/viewvc?rev=1429023&view=rev
Log:
fix use of spring alias for authorizer
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml?rev=1429023&r1=1429022&r2=1429023&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
Fri Jan 4 18:33:38 2013
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml?rev=1429023&r1=1429022&r2=1429023&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
Fri Jan 4 18:33:38 2013
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml?rev=1429023&r1=1429022&r2=1429023&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml
Fri Jan 4 18:33:38 2013
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml?rev=1429023&r1=1429022&r2=1429023&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-rss-servlet.xml
Fri Jan 4 18:33:38 2013
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml?rev=1429023&r1=1429022&r2=1429023&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
Fri Jan 4 18:33:38 2013
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml?rev=1429023&r1=1429022&r2=1429023&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
Fri Jan 4 18:33:38 2013
@@ -50,4 +50,5 @@
</property>
</bean>
<alias name="userConfiguration#archiva" alias="userConfiguration#default"/>
+ <alias name="authorizer#rbac" alias="authorizer#default"/>
</beans>
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=1429023&r1=1429022&r2=1429023&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
Fri Jan 4 18:33:38 2013
@@ -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"/>
