X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.server.ads.server%2FMETA-INF%2Fspring%2Fads.xml;h=6762fd33fcf39b1e5326484feb3b1a3c5ae579d1;hb=83dc7b38160651626d00f6048f20183e01ad323a;hp=6f7f6a6150cbfb04df7bb7ebf7192305b0939d84;hpb=c6c3aa132f6559ac1e2fa015cf2efba92802eba0;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 6f7f6a615..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
@@ -5,21 +5,19 @@
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-		<property name="ignoreUnresolvablePlaceholders" value="false" />
 		<property name="locations">
-			<value>osgibundle:ads.properties
-			</value>
+			<value>osgibundle:ads.properties</value>
 		</property>
 	</bean>
 
 	<bean class="org.argeo.server.ads.AdsContainer">
-		<property name="workingDirectory" value="${argeo.osgi.data.dir}/apacheds" />
+		<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>osgibundle:init.ldif</value>
+				<value>${argeo.ads.init.ldif}</value>
 			</list>
 		</property>
 	</bean>
@@ -31,26 +29,17 @@
 				<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>
-				-->
+				<!--<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>