now user.manager.impl=ldap is not needed anymore

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

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 ff6da7f43f73a79400192bb31c08c661ef49cd38..68856e9f76648f07c995c6b57adef86945fc15e5 100644 (file)
--- 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
@@ -137,6 +137,10 @@
   </bean>
   
   <alias name="userManager#archiva" alias="userManager#configurable"/>
+
+  <bean name="ldapConnectionFactory" class="org.apache.archiva.redback.common.ldap.connection.ConfigurableLdapConnectionFactory">
+    <property name="userConf" ref="userConfiguration"/>
+  </bean>
     
     <!-- <component>
       <role>org.apache.archiva.webdav.util.MimeTypes</role>
@@ -153,7 +157,7 @@
        Ldap Authentication can be enabled by setting enabling these components and setting the following configuration options in your security.properties file
 
        ============================================================
-       user.manager.impl=ldap
+
        ldap.bind.authenticator.enabled=true
        redback.default.admin=admin
        security.policy.password.expiration.enabled=false
@@ -184,12 +188,6 @@
     this component manages the connection to the ldap server
      -->
 
-
-    <bean name="ldapConnectionFactory" class="org.apache.archiva.redback.common.ldap.connection.ConfigurableLdapConnectionFactory">
-      <property name="userConf" ref="userConfiguration"/>
-    </bean>
-
-
     
     <!--