diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-12-06 16:23:47 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-12-06 16:23:47 +0000 |
| commit | 75f17a0d8b43c6c3813404f1a8ee144e2efeb640 (patch) | |
| tree | b04a5eefd5a492e93d323ec9a8e9ee85312df462 /archiva-modules/archiva-web | |
| parent | 2aa866124d04469c40cfc23e89a21c4cf1842e04 (diff) | |
| download | archiva-75f17a0d8b43c6c3813404f1a8ee144e2efeb640.tar.gz archiva-75f17a0d8b43c6c3813404f1a8ee144e2efeb640.zip | |
fix NPE and add alias
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1417978 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml index 7b4717ad1..b9a62bfe9 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml @@ -21,7 +21,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:task="http://www.springframework.org/schema/task" - xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context @@ -31,6 +30,8 @@ <context:property-placeholder location="classpath:application.properties"/> + <alias name="userConfiguration#archiva" alias="userConfiguration#default" /> + <bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager" init-method="initialize"/> @@ -139,7 +140,7 @@ <alias name="userManager#archiva" alias="userManager#configurable"/> <bean name="ldapConnectionFactory" class="org.apache.archiva.redback.common.ldap.connection.ConfigurableLdapConnectionFactory"> - <property name="userConf" ref="userConfiguration"/> + <property name="userConf" ref="userConfiguration#default"/> </bean> <!-- <component> |