svn commit: r985693 - in /directory/apacheds/trunk/server-config/src/main: java/org/apache/directory/server/config/ resources/config/ou=config/ou=servers/

[ka...@apache.org]

Author: kayyagari
Date: Sun Aug 15 15:42:36 2010
New Revision: 985693

URL: http://svn.apache.org/viewvc?rev=985693&view=rev
Log:
o applied patch provided by Andreas Oberritter
o removed 'ads-serverDS' attribute
o added all the default values used in the change password server to the config

Modified:
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
    directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif
    directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif
    directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif
    directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=985693&r1=985692&r2=985693&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Sun Aug 15 15:42:36 2010
@@ -667,6 +667,13 @@ public class ConfigPartitionReader
         {
             chgPwdServer.setServicePrincipal( servicePrincipal.getString() );
         }
+
+        EntryAttribute searchBaseAttr = chgPwdEntry.get( ConfigSchemaConstants.ADS_SEARCH_BASE );
+
+        if ( searchBaseAttr != null )
+        {
+            chgPwdServer.setSearchBaseDn( searchBaseAttr.getString() );
+        }
         
         return chgPwdServer;
     }

Modified: directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dchangepasswordserver.ldif?rev=985693&r1=985692&r2=985693&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif (original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif Sun Aug 15 15:42:36 2010
@@ -1,9 +1,14 @@
 version: 1
 dn: ads-serverId=changepasswordserver,ou=servers,ou=config
-ads-serverds: ads-directoryServiceId=default,ou=directoryService,ou=config
-ads-serverid: changepasswordserver
-ads-enabled: false
 objectclass: ads-server
 objectclass: ads-changePasswordServer
 objectclass: ads-catalogBasedServer
-objectclass: top
+ads-serverid: changepasswordserver
+ads-chgPwdServicePrincipal: kadmin/changepw@EXAMPLE.COM
+ads-enabled: false
+ads-krballowableclockskew: 300000
+ads-krbEmptyAddressesAllowed: true
+ads-krbEncryptionTypes: des-cbc-md5
+ads-krbPrimaryRealm: EXAMPLE.COM
+ads-searchBaseDN: ou=users,dc=example,dc=com
+

Modified: directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Ddns.ldif?rev=985693&r1=985692&r2=985693&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif (original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif Sun Aug 15 15:42:36 2010
@@ -1,6 +1,5 @@
 version: 1
 dn: ads-serverId=dns,ou=servers,ou=config
-ads-serverds: ads-directoryServiceId=default,ou=directoryService,ou=config
 ads-serverid: dns
 ads-enabled: false
 objectclass: ads-server

Modified: directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dkerberos.ldif?rev=985693&r1=985692&r2=985693&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif (original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif Sun Aug 15 15:42:36 2010
@@ -1,6 +1,5 @@
 version: 1
 dn: ads-serverId=kerberos,ou=servers,ou=config
-ads-serverds: ads-directoryServiceId=default,ou=directoryService,ou=config
 ads-serverid: kerberos
 ads-enabled: false
 objectclass: ads-server

Modified: directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver.ldif?rev=985693&r1=985692&r2=985693&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif (original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif Sun Aug 15 15:42:36 2010
@@ -1,7 +1,6 @@
 version: 1
 dn: ads-serverId=ldapServer,ou=servers,ou=config
 ads-ldapserverallowanonymousaccess: false
-ads-serverds: ads-directoryServiceId=default,ou=directoryService,ou=config
 ads-serverid: ldapServer
 ads-ldapserversaslrealms: example.com
 ads-ldapserversaslrealms: apache.org