directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r947701 - in /directory: apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/
Date Mon, 24 May 2010 16:19:04 GMT
Author: kayyagari
Date: Mon May 24 16:19:04 2010
New Revision: 947701

URL: http://svn.apache.org/viewvc?rev=947701&view=rev
Log:
o added ads-searchBaseDN property to the catalog based server which will be used by LDAP and
KDC server instances

Modified:
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
    directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif

Modified: directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=947701&r1=947700&r2=947701&view=diff
==============================================================================
--- directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
(original)
+++ directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
Mon May 24 16:19:04 2010
@@ -212,6 +212,12 @@ public class ConfigPartitionReader
         
         server.setReplProviderConfigs( getReplProviderConfigs() );
         
+        EntryAttribute searchBaseAttr = ldapServerEntry.get( ConfigSchemaConstants.ADS_SEARCH_BASE
);
+        if( searchBaseAttr != null )
+        {
+            server.setSearchBaseDn( searchBaseAttr.getString() );
+        }
+        
         return server;
     }
 
@@ -355,6 +361,12 @@ public class ConfigPartitionReader
             kdcServer.setBodyChecksumVerified( Boolean.parseBoolean( bdyCkhsmVerifyAttr.getString()
) );
         }
 
+        EntryAttribute searchBaseAttr = kdcEntry.get( ConfigSchemaConstants.ADS_SEARCH_BASE
);
+        if( searchBaseAttr != null )
+        {
+            kdcServer.setSearchBaseDn( searchBaseAttr.getString() );
+        }
+        
         return kdcServer;
     }
 

Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.260.ldif?rev=947701&r1=947700&r2=947701&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif
Mon May 24 16:19:04 2010
@@ -14,4 +14,5 @@ m-name: ads-catalogBasedServer
 m-typeobjectclass: ABSTRACT
 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 m-may: ads-enabled
+m-may: ads-searchBaseDN
 



Mime
View raw message