From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 7 Mar 2010 21:03:40 +0000 (+0000)
Subject: Allows configuration of LDAP protocol (ldap or ldaps)
X-Git-Tag: argeo-commons-2.1.30~1641
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=31a0ddf37f5fe0f74b864f1bc9ab108881aa453b;p=lgpl%2Fargeo-commons.git

Allows configuration of LDAP protocol (ldap or ldaps)

git-svn-id: https://svn.argeo.org/commons/trunk@3416 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
index c3cea65d4..b479f1560 100644
--- a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/ldap.xml
@@ -26,7 +26,7 @@
 	<bean id="contextSource"
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
 		<constructor-arg
-			value="ldap://${argeo.ldap.host}:${argeo.ldap.port}/${argeo.ldap.rootdn}" />
+			value="${argeo.ldap.protocol}://${argeo.ldap.host}:${argeo.ldap.port}/${argeo.ldap.rootdn}" />
 		<property name="userDn" value="${argeo.ldap.manager.userdn}" />
 		<property name="password" value="${argeo.ldap.manager.password}" />
 	</bean>
diff --git a/security/modules/org.argeo.security.manager.ldap/ldap.properties b/security/modules/org.argeo.security.manager.ldap/ldap.properties
index 970468a8a..1b24ee3d1 100644
--- a/security/modules/org.argeo.security.manager.ldap/ldap.properties
+++ b/security/modules/org.argeo.security.manager.ldap/ldap.properties
@@ -1,4 +1,5 @@
 argeo.ldap.rootdn=dc=demo,dc=argeo,dc=org
+argeo.ldap.protocol=ldap
 argeo.ldap.host=localhost
 argeo.ldap.port=10389
 argeo.ldap.manager.userdn=uid=admin,ou=system