You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/11/23 22:34:14 UTC

svn commit: r1413073 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml

Author: olamy
Date: Fri Nov 23 21:34:13 2012
New Revision: 1413073

URL: http://svn.apache.org/viewvc?rev=1413073&view=rev
Log:
now user.manager.impl=ldap is not needed anymore

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml?rev=1413073&r1=1413072&r2=1413073&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml Fri Nov 23 21:34:13 2012
@@ -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>
-
-
     
     <!--