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 c3cea65d4a4882682932946bf18e35ccc6fb083e..b479f1560da8c2bc3289abe3ea89ba757d40c34c 100644 (file)
--- 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 970468a8a7972cfb082b82ba7f68fec6b65b1cfc..1b24ee3d16d6551659255c792b9dbb6eff23b4a3 100644 (file)
--- 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