X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.manager.ldap%2FMETA-INF%2Fspring%2Fldap.xml;h=c3cea65d4a4882682932946bf18e35ccc6fb083e;hb=c6c3aa132f6559ac1e2fa015cf2efba92802eba0;hp=534bfe5df342ad9088f9b9db13438c85066f70f0;hpb=72cba68a5b5eb36a63bd59a297e3d1d432760a4e;p=lgpl%2Fargeo-commons.git

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 534bfe5df..c3cea65d4 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
@@ -5,6 +5,16 @@
               http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
 
 
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+		<property name="locations">
+			<value>osgibundle:ldap.properties
+			</value>
+		</property>
+	</bean>
+
 	<bean id="_authenticationManager" class="org.springframework.security.providers.ProviderManager">
 		<property name="providers">
 			<list>
@@ -15,9 +25,10 @@
 
 	<bean id="contextSource"
 		class="org.springframework.security.ldap.DefaultSpringSecurityContextSource">
-		<constructor-arg value="ldap://localhost:10389/dc=demo,dc=argeo,dc=org" />
-		<property name="userDn" value="uid=admin,ou=system" />
-		<property name="password" value="secret" />
+		<constructor-arg
+			value="ldap://${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>
 
 	<bean id="authenticationProvider"
@@ -66,9 +77,8 @@
 		name="usernameMapper"> <bean
 		class="org.springframework.security.ldap.DefaultLdapUsernameToDnMapper">
 		<constructor-arg value="ou=users" /> <constructor-arg value="uid" />
-		</bean> </property> </bean>
-	<bean id="userDetailsMapper" class="org.argeo.security.ldap.ArgeoUserDetailsContextMapper">
-		<property name="userNatureMappers" ref="userNatureMappers" />
-	</bean>
+		</bean> </property> </bean> <bean id="userDetailsMapper"
+		class="org.argeo.security.ldap.ArgeoUserDetailsContextMapper">
+		<property name="userNatureMappers" ref="userNatureMappers" /> </bean>
 	-->
 </beans>