aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-webapp/src
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-01-15 15:40:06 +0000
committerOlivier Lamy <olamy@apache.org>2013-01-15 15:40:06 +0000
commit5ed310269070fbae4ef3a2fe35f2385fa8ca7669 (patch)
tree088b0df20ca9614b84217c57d4df5dc739caf3d4 /archiva-modules/archiva-web/archiva-webapp/src
parent1866f236909d03b564cbe8da56e9936819426337 (diff)
downloadarchiva-5ed310269070fbae4ef3a2fe35f2385fa8ca7669.tar.gz
archiva-5ed310269070fbae4ef3a2fe35f2385fa8ca7669.zip
move together all alias to be more readable
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1433463 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp/src')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml20
1 files changed, 11 insertions, 9 deletions
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 e7f2a03cf..3d082ea37 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
@@ -34,6 +34,17 @@
<alias name="authorizer#rbac" alias="authorizer#default"/>
+ <alias name="repositoryStatisticsManager#default" alias="repositoryStatisticsManager"/>
+ <!-- TODO olamy need to find a more dynamic way if using jcr impl -->
+ <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
+
+ <alias name="environmentCheck#archiva-locked-admin-check" alias="environmentCheck#locked-admin-check"/>
+ <alias name="userManager#archiva" alias="userManager#configurable"/>
+ <alias name="authenticator#archiva" alias="authenticator#user-manager"/>
+
+ <alias name="ldapConnectionFactory#archiva" alias="ldapConnectionFactory"/>
+ <alias name="ldapConnectionFactory#archiva" alias="ldapConnectionFactory#configurable"/>
+
<bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager"
init-method="initialize"/>
@@ -43,10 +54,6 @@
<task:scheduler id="springScheduler" pool-size="2"/>
<task:annotation-driven executor="springExecutor" scheduler="springScheduler"/>
- <alias name="repositoryStatisticsManager#default" alias="repositoryStatisticsManager"/>
- <!-- TODO olamy need to find a more dynamic way if using jcr impl -->
- <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
-
<bean id="mailSession" class="org.springframework.jndi.JndiObjectFactoryBean">
<property name="jndiName" value="java:comp/env/mail/Session">
</property>
@@ -141,12 +148,7 @@
</property>
</bean>
- <alias name="environmentCheck#archiva-locked-admin-check" alias="environmentCheck#locked-admin-check"/>
- <alias name="userManager#archiva" alias="userManager#configurable"/>
- <alias name="authenticator#archiva" alias="authenticator#user-manager"/>
- <alias name="ldapConnectionFactory#archiva" alias="ldapConnectionFactory"/>
- <alias name="ldapConnectionFactory#archiva" alias="ldapConnectionFactory#configurable"/>
<!--
<bean name="mimeTpes" class="org.apache.archiva.webdav.util.MimeTypes">