X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmodules%2Forg.argeo.server.ads.server%2FMETA-INF%2Fspring%2Fads.xml;h=6762fd33fcf39b1e5326484feb3b1a3c5ae579d1;hb=b26964e3e284d4fd2f8806baddce928dedf85656;hp=593234f1b0caa2fd42f1dd46a13c59d8b18d8920;hpb=eb1255435a5afaf329a781ff4041391c71275537;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml b/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml
index 593234f1b..6762fd33f 100644
--- a/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml
+++ b/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml
@@ -1,9 +1,48 @@
-<beans:beans xmlns="http://www.springframework.org/schema/security"
-	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-              http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<ldap-server root="dc=demo,dc=argeo,dc=org" port="10389"
-		ldif="file:init.ldif" />
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="locations">
+			<value>osgibundle:ads.properties</value>
+		</property>
+	</bean>
 
-</beans:beans>
+	<bean class="org.argeo.server.ads.AdsContainer">
+		<property name="workingDirectory" value="${osgi.instance.area}/apacheds" />
+		<property name="deleteWorkingDirOnExit" value="true" />
+		<property name="configuration" ref="configuration" />
+		<property name="environment" ref="environment" />
+		<property name="ldifs">
+			<list>
+				<value>${argeo.ads.init.ldif}</value>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="environment"
+		class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+		<property name="properties">
+			<props>
+				<prop key="java.naming.security.authentication">simple</prop>
+				<prop key="java.naming.security.principal">${argeo.ldap.manager.userdn}</prop>
+				<prop key="java.naming.security.credentials">${argeo.ldap.manager.password}</prop>
+				<!--<prop key="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop> -->
+				<!--<prop key="kdc.java.naming.security.credentials">secret</prop> -->
+				<!-- <prop key="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop> -->
+				<!-- <prop key="changepw.java.naming.security.credentials">secret</prop> -->
+				<!-- Set this key to a space delimited set of attributeType descriptions 
+					and their OID's if you want an attributeType to be handled as binary content. 
+					The server will use the schema to derive the set of attributeTypes to treat 
+					as binary. The union if the values you provide here will be taken as the 
+					set of binaries. Note to be consistent you must add both the OID and all 
+					the names an attributeType can have. -->
+				<!-- <prop key="java.naming.ldap.attributes.binary"></prop> -->
+			</props>
+		</property>
+	</bean>
+
+
+</beans>