diff options
7 files changed, 9 insertions, 1 deletions
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 14789259a..21797dcaf 100644 --- 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 488cf5d08..7eefdd9e5 100644 --- 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 4e9025ba2..1078848e4 100644 --- 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 00cea6f2a..d24c52141 100644 --- 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 05e2de5d4..412d7e9f3 100644 --- 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 884383bc5..9134bf53f 100644 --- 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 704358dec..9f90b50c9 100644 --- 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"/> |