X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.server.ads.server%2FMETA-INF%2Fspring%2Fserver.xml;h=2bf80b94177a0d44b197cc1bb097ce7217fc114b;hb=c6c3aa132f6559ac1e2fa015cf2efba92802eba0;hp=ca83c1f6f0cdc2c29e912b29e3ce3d9f164bf6d2;hpb=72cba68a5b5eb36a63bd59a297e3d1d432760a4e;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.server.ads.server/META-INF/spring/server.xml b/server/modules/org.argeo.server.ads.server/META-INF/spring/server.xml
index ca83c1f6f..2bf80b941 100644
--- a/server/modules/org.argeo.server.ads.server/META-INF/spring/server.xml
+++ b/server/modules/org.argeo.server.ads.server/META-INF/spring/server.xml
@@ -4,37 +4,6 @@
   "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
-	<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">uid=admin,ou=system</prop>
-				<prop key="java.naming.security.credentials">secret</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>
-
 	<bean id="configuration"
 		class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
 		<property name="workingDirectory" value="example.com" />
@@ -66,12 +35,17 @@
 		-->
 
 		<!--
-			<property name="ldifDirectory"> <value>example.ldif</value>
-			</property> <property name="ldifFilters"> <list> <bean
-			class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
-			</list> </property>
+		<property name="ldifDirectory">
+			<value>${argeo.ads.init.ldif}</value>
+		</property> -->
+
+		<!--
+			<property name="ldifFilters"> <list> <bean
+			class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"
+			/> </list> </property>
 		-->
 
+
 		<!--
 			the number of milliseconds before issuing a synch (flush to disk)
 		-->
@@ -123,7 +97,7 @@
 		-->
 		<property name="denormalizeOpAttrsEnabled" value="false" />
 
-		<property name="ldapPort" value="10389" />
+		<property name="ldapPort" value="${argeo.ldap.port}" />
 
 		<property name="systemPartitionConfiguration" ref="systemPartitionConfiguration" />
 
@@ -305,12 +279,12 @@
 			</set>
 		</property>
 		<property name="contextEntry">
-			<value>
+			<value><![CDATA[
 				objectClass: top
 				objectClass: organizationalUnit
-				objectClass: extensibleObject
+				objectClass:extensibleObject
 				ou: system
-      </value>
+				]]></value>
 		</property>
 	</bean>
 
@@ -319,7 +293,7 @@
 		class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
 		<property name="name" value="example" />
 		<property name="cacheSize" value="100" />
-		<property name="suffix" value="dc=example,dc=com" />
+		<property name="suffix" value="${argeo.ldap.rootdn}" />
 
 		<!--
 			the optimizer is enabled by default but may not always be what
@@ -367,12 +341,12 @@
 			</set>
 		</property>
 		<property name="contextEntry">
-			<value>
+			<value><![CDATA[
 				objectClass: top
 				objectClass: domain
 				objectClass: extensibleObject
 				dc: example
-      </value>
+				]]></value>
 		</property>
 	</bean>