directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r987485 [1/2] - in /directory: apacheds/branches/apacheds-codec-merge/ldap-client-test/ apacheds/branches/apacheds-codec-merge/server-config/ apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/con...
Date Fri, 20 Aug 2010 12:57:57 GMT
Author: elecharny
Date: Fri Aug 20 12:57:55 2010
New Revision: 987485

URL: http://svn.apache.org/viewvc?rev=987485&view=rev
Log:
Merged trunk into the codec branch

Modified:
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/server-config/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (contents, props changed)
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=aciauthorizationinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=authenticationinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=collectiveattributeinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=defaultauthorizationinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=eventinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=exceptioninterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=normalizationinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=operationalattributeinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=referralinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=schemainterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=subentryinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=triggerinterceptor.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=dc.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=krb5principalname.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=objectclass.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=ou.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=uid.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=objectclass.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=ou.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=uid.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=pwdpolicy.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=tcp.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=udp.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=tcp.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=udp.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=tcp.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=udp.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=gracefulshutdownhandler.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=starttlshandler.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=cram-md5.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=digest-md5.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gss-spnego.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gssapi.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=ntlm.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=simple.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldap.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldaps.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=tcp.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=udp.ldif
    directory/apacheds/branches/apacheds-codec-merge/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (contents, props changed)
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/   (props changed)

Propchange: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:57:55 2010
@@ -2,4 +2,4 @@
 /directory/apacheds/branches/apacheds-schema/ldap-client-test:806623-896441
 /directory/apacheds/branches/apacheds-subtree/ldap-client-test:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/ldap-client-test:945827-946347
-/directory/apacheds/trunk/ldap-client-test:982368-982965
+/directory/apacheds/trunk/ldap-client-test:982368-987478

Propchange: directory/apacheds/branches/apacheds-codec-merge/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:57:55 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938
-/directory/apacheds/trunk/server-config:980025-980137
+/directory/apacheds/trunk/server-config:980025-980137,982368-987474

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Fri Aug 20 12:57:55 2010
@@ -112,6 +112,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 ;
@@ -190,7 +191,7 @@ public class ConfigPartitionReader
      * @return the LdapServer instance without a DirectoryService
      * @throws Exception
      */
-    public LdapServer getLdapServer() throws Exception
+    public LdapServer createLdapServer() throws Exception
     {
         EqualityNode<String> filter = new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
             ConfigSchemaConstants.ADS_LDAP_SERVER_OC ) );
@@ -221,7 +222,7 @@ public class ConfigPartitionReader
         LdapServer server = new LdapServer();
         server.setServiceId( getString( ConfigSchemaConstants.ADS_SERVER_ID, ldapServerEntry ) );
 
-        Transport[] transports = getTransports( ldapServerEntry.getDn() );
+        Transport[] transports = createTransports( ldapServerEntry.getDn() );
         server.setTransports( transports );
 
         EntryAttribute replProvImplAttr = ldapServerEntry.get( ConfigSchemaConstants.ADS_REPL_PROVIDER_IMPL );
@@ -241,7 +242,7 @@ public class ConfigPartitionReader
             }
         }
         
-        server.setReplProviderConfigs( getReplProviderConfigs() );
+        server.setReplProviderConfigs( createReplProviderConfigs() );
         
         EntryAttribute searchBaseAttr = ldapServerEntry.get( ConfigSchemaConstants.ADS_SEARCH_BASE );
         if( searchBaseAttr != null )
@@ -261,7 +262,7 @@ public class ConfigPartitionReader
             if( isEnabled( saslMechHandlerEntry ) )
             {
                 String mechanism = getString( ConfigSchemaConstants.ADS_LDAP_SERVER_SASL_MECH_NAME, saslMechHandlerEntry );
-                server.addSaslMechanismHandler( mechanism, getSaslMechHandler( saslMechHandlerEntry ) );
+                server.addSaslMechanismHandler( mechanism, createSaslMechHandler( saslMechHandlerEntry ) );
             }
         }
         
@@ -289,11 +290,24 @@ public class ConfigPartitionReader
         
         cursor.close();
         
+        EntryAttribute keyStoreAttr = ldapServerEntry.get( ConfigSchemaConstants.ADS_LDAP_SERVER_KEYSTORE_FILE );
+        if( keyStoreAttr != null )
+        {
+            server.setKeystoreFile( keyStoreAttr.getString() );
+            
+            EntryAttribute certPwdAttr = ldapServerEntry.get( ConfigSchemaConstants.ADS_LDAP_SERVER_CERT_PASSWORD );
+            if( certPwdAttr != null )
+            {
+                server.setCertificatePassword( certPwdAttr.getString() );
+            }
+        }
+        
+        
         return server;
     }
 
 
-    public KdcServer getKdcServer() throws Exception
+    public KdcServer createKdcServer() throws Exception
     {
         EqualityNode<String> filter = new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
             ConfigSchemaConstants.ADS_KERBEROS_SERVER_OC ) );
@@ -325,7 +339,7 @@ public class ConfigPartitionReader
 
         kdcServer.setServiceId( getString( ConfigSchemaConstants.ADS_SERVER_ID, kdcEntry ) );
 
-        Transport[] transports = getTransports( kdcEntry.getDn() );
+        Transport[] transports = createTransports( kdcEntry.getDn() );
         kdcServer.setTransports( transports );
 
         // MAY attributes
@@ -440,7 +454,7 @@ public class ConfigPartitionReader
     }
 
 
-    public DnsServer getDnsServer() throws Exception
+    public DnsServer createDnsServer() throws Exception
     {
         EqualityNode<String> filter = new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
             ConfigSchemaConstants.ADS_DNS_SERVER_OC ) );
@@ -472,7 +486,7 @@ public class ConfigPartitionReader
 
         dnsServer.setServiceId( getString( ConfigSchemaConstants.ADS_SERVER_ID, dnsEntry ) );
 
-        Transport[] transports = getTransports( dnsEntry.getDn() );
+        Transport[] transports = createTransports( dnsEntry.getDn() );
         dnsServer.setTransports( transports );
 
         return dnsServer;
@@ -480,7 +494,7 @@ public class ConfigPartitionReader
 
 
     //TODO making this method invisible cause there is no DhcpServer exists as of now
-    private DhcpService getDhcpServer() throws Exception
+    private DhcpService createDhcpServer() throws Exception
     {
         EqualityNode<String> filter = new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
             ConfigSchemaConstants.ADS_DHCP_SERVER_OC ) );
@@ -515,7 +529,7 @@ public class ConfigPartitionReader
     }
 
 
-    public NtpServer getNtpServer() throws Exception
+    public NtpServer createNtpServer() throws Exception
     {
         EqualityNode<String> filter = new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
             ConfigSchemaConstants.ADS_NTP_SERVER_OC ) );
@@ -547,14 +561,14 @@ public class ConfigPartitionReader
 
         ntpServer.setServiceId( getString( ConfigSchemaConstants.ADS_SERVER_ID, ntpEntry ) );
 
-        Transport[] transports = getTransports( ntpEntry.getDn() );
+        Transport[] transports = createTransports( ntpEntry.getDn() );
         ntpServer.setTransports( transports );
 
         return ntpServer;
     }
 
     
-    public ChangePasswordServer getChangePwdServer() throws Exception
+    public ChangePasswordServer createChangePwdServer() throws Exception
     {
         EqualityNode<String> filter = new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
             ConfigSchemaConstants.ADS_CHANGEPWD_SERVER_OC ) );
@@ -585,7 +599,7 @@ public class ConfigPartitionReader
 
         chgPwdServer.setServiceId( getString( ConfigSchemaConstants.ADS_SERVER_ID, chgPwdEntry ) );
 
-        Transport[] transports = getTransports( chgPwdEntry.getDn() );
+        Transport[] transports = createTransports( chgPwdEntry.getDn() );
         chgPwdServer.setTransports( transports );
 
         // MAY attributes
@@ -653,12 +667,19 @@ public class ConfigPartitionReader
         {
             chgPwdServer.setServicePrincipal( servicePrincipal.getString() );
         }
+
+        EntryAttribute searchBaseAttr = chgPwdEntry.get( ConfigSchemaConstants.ADS_SEARCH_BASE );
+
+        if ( searchBaseAttr != null )
+        {
+            chgPwdServer.setSearchBaseDn( searchBaseAttr.getString() );
+        }
         
         return chgPwdServer;
     }
 
     
-    public HttpServer getHttpServer() throws Exception
+    public HttpServer createHttpServer() throws Exception
     {
         EqualityNode<String> filter = new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
             ConfigSchemaConstants.ADS_HTTP_SERVER_OC ) );
@@ -702,15 +723,10 @@ public class ConfigPartitionReader
             httpServer.setConfFile( confFileAttr.getString() );
         }
 
-        EntryAttribute webAppsAttr = httpEntry.get( ConfigSchemaConstants.ADS_HTTP_WEBAPPS );
-
-        if ( webAppsAttr != null )
-        {
-            DN webAppsDN = new DN( webAppsAttr.getString(), schemaManager );
+        DN webAppsDN = new DN( httpEntry.getDn().getName(), schemaManager );
 
-            Set<WebApp> webApps = getWebApps( webAppsDN );
-            httpServer.setWebApps( webApps );
-        }
+        Set<WebApp> webApps = createWebApps( webAppsDN );
+        httpServer.setWebApps( webApps );
 
         return httpServer;
     }
@@ -722,7 +738,7 @@ public class ConfigPartitionReader
      *
      * @throws Exception
      */
-    public DirectoryService getDirectoryService() throws Exception
+    public DirectoryService createDirectoryService() throws Exception
     {
         AttributeType adsDirectoryServiceidAt = schemaManager.getAttributeType( ConfigSchemaConstants.ADS_DIRECTORYSERVICE_ID );
         PresenceNode filter = new PresenceNode( adsDirectoryServiceidAt );
@@ -752,13 +768,13 @@ public class ConfigPartitionReader
         dirService.setInstanceId( getString( ConfigSchemaConstants.ADS_DIRECTORYSERVICE_ID, dsEntry ) );
         dirService.setReplicaId( getInt( ConfigSchemaConstants.ADS_DS_REPLICA_ID, dsEntry ) );
 
-        List<Interceptor> interceptors = getInterceptors( dsEntry.getDn() );
+        List<Interceptor> interceptors = createInterceptors( dsEntry.getDn() );
         dirService.setInterceptors( interceptors );
         
         AuthenticationInterceptor authnInterceptor = ( AuthenticationInterceptor ) dirService.getInterceptor( AuthenticationInterceptor.class.getName() );
-        authnInterceptor.setPwdPolicyConfig( getPwdPolicyConfig( dsEntry.getDn() ) );
+        authnInterceptor.setPwdPolicyConfig( createPwdPolicyConfig( dsEntry.getDn() ) );
 
-        Map<String, Partition> partitions = getPartitions( dsEntry.getDn() );
+        Map<String, Partition> partitions = createPartitions( dsEntry.getDn() );
 
         Partition systemPartition = partitions.remove( "system" );
 
@@ -790,7 +806,7 @@ public class ConfigPartitionReader
         if ( changeLogAttr != null )
         {
             DN clDN = new DN( changeLogAttr.getString(), schemaManager );
-            ChangeLog cl = getChangeLog( clDN );
+            ChangeLog cl = createChangeLog( clDN );
             dirService.setChangeLog( cl );
         }
 
@@ -806,7 +822,7 @@ public class ConfigPartitionReader
         if ( journalAttr != null )
         {
             DN journalDN = new DN( journalAttr.getString(), schemaManager );
-            dirService.setJournal( getJournal( journalDN ) );
+            dirService.setJournal( createJournal( journalDN ) );
         }
 
         EntryAttribute maxPduAttr = dsEntry.get( ConfigSchemaConstants.ADS_DS_MAXPDU_SIZE );
@@ -842,7 +858,7 @@ public class ConfigPartitionReader
         if ( testEntryAttr != null )
         {
             String entryFilePath = testEntryAttr.getString();
-            dirService.setTestEntries( getTestEntries( entryFilePath ) );
+            dirService.setTestEntries( createTestEntries( entryFilePath ) );
         }
 
         if ( !isEnabled( dsEntry ) )
@@ -856,7 +872,7 @@ public class ConfigPartitionReader
     }
 
 
-    private List<SyncreplConfiguration> getReplProviderConfigs() throws Exception
+    private List<SyncreplConfiguration> createReplProviderConfigs() throws Exception
     {
         EqualityNode<String> filter = new EqualityNode<String>( OBJECT_CLASS_AT, new StringValue(
             ConfigSchemaConstants.ADS_REPL_PROVIDER_OC ) );
@@ -993,7 +1009,7 @@ public class ConfigPartitionReader
      * @return a list of instantiated Interceptor objects
      * @throws Exception
      */
-    private List<Interceptor> getInterceptors( DN dirServiceDN ) throws Exception
+    private List<Interceptor> createInterceptors( DN dirServiceDN ) throws Exception
     {
         AttributeType adsInterceptorIdAt = schemaManager.getAttributeType( ConfigSchemaConstants.ADS_INTERCEPTOR_ID );
         PresenceNode filter = new PresenceNode( adsInterceptorIdAt );
@@ -1045,7 +1061,7 @@ public class ConfigPartitionReader
     }
 
 
-    private Map<String, Partition> getPartitions( DN dirServiceDN ) throws Exception
+    private Map<String, Partition> createPartitions( DN dirServiceDN ) throws Exception
     {
         AttributeType adsPartitionIdeAt = schemaManager.getAttributeType( ConfigSchemaConstants.ADS_PARTITION_ID );
         PresenceNode filter = new PresenceNode( adsPartitionIdeAt );
@@ -1070,7 +1086,7 @@ public class ConfigPartitionReader
 
             if ( ocAttr.contains( ConfigSchemaConstants.ADS_JDBMPARTITION ) )
             {
-                JdbmPartition partition = getJdbmPartition( partitionEntry );
+                JdbmPartition partition = createJdbmPartition( partitionEntry );
                 partitions.put( partition.getId(), partition );
             }
             else
@@ -1085,7 +1101,7 @@ public class ConfigPartitionReader
     }
 
 
-    private JdbmPartition getJdbmPartition( Entry partitionEntry ) throws Exception
+    public JdbmPartition createJdbmPartition( Entry partitionEntry ) throws Exception
     {
         JdbmPartition partition = new JdbmPartition();
         partition.setSchemaManager( schemaManager );
@@ -1117,14 +1133,14 @@ public class ConfigPartitionReader
             partition.setSyncOnWrite( Boolean.parseBoolean( syncAttr.getString() ) );
         }
 
-        Set<Index<?, Entry, Long>> indexedAttributes = getIndexes( partitionEntry.getDn() );
+        Set<Index<?, Entry, Long>> indexedAttributes = createIndexes( partitionEntry.getDn() );
         partition.setIndexedAttributes( indexedAttributes );
 
         return partition;
     }
 
 
-    private Set<Index<?, Entry, Long>> getIndexes( DN partitionDN ) throws Exception
+    private Set<Index<?, Entry, Long>> createIndexes( DN partitionDN ) throws Exception
     {
         AttributeType adsIndexAttributeIdAt = schemaManager.getAttributeType( ConfigSchemaConstants.ADS_INDEX_ATTRIBUTE_ID );
         PresenceNode filter = new PresenceNode( adsIndexAttributeIdAt );
@@ -1150,7 +1166,7 @@ public class ConfigPartitionReader
 
             if ( ocAttr.contains( ConfigSchemaConstants.ADS_JDBMINDEX ) )
             {
-                indexes.add( getJdbmIndex( indexEntry ) );
+                indexes.add( createJdbmIndex( indexEntry ) );
             }
             else
             {
@@ -1162,7 +1178,7 @@ public class ConfigPartitionReader
     }
 
 
-    private JdbmIndex<?, Entry> getJdbmIndex( Entry indexEntry ) throws Exception
+    public JdbmIndex<?, Entry> createJdbmIndex( Entry indexEntry ) throws Exception
     {
         JdbmIndex<String, Entry> index = new JdbmIndex<String, Entry>();
         index.setAttributeId( getString( ConfigSchemaConstants.ADS_INDEX_ATTRIBUTE_ID, indexEntry ) );
@@ -1184,7 +1200,7 @@ public class ConfigPartitionReader
     }
 
 
-    private Transport[] getTransports( DN adsServerDN ) throws Exception
+    private Transport[] createTransports( DN adsServerDN ) throws Exception
     {
         AttributeType adsTransportIdAt = schemaManager.getAttributeType( ConfigSchemaConstants.ADS_TRANSPORT_ID );
         PresenceNode filter = new PresenceNode( adsTransportIdAt );
@@ -1206,7 +1222,7 @@ public class ConfigPartitionReader
                 continue;
             }
 
-            transports.add( getTransport( transportEntry ) );
+            transports.add( createTransport( transportEntry ) );
         }
 
         return transports.toArray( new Transport[]
@@ -1216,7 +1232,7 @@ public class ConfigPartitionReader
 
     //This will suppress PMD.AvoidUsingHardCodedIP warnings in this class
     @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
-    private Transport getTransport( Entry transportEntry ) throws Exception
+    public Transport createTransport( Entry transportEntry ) throws Exception
     {
         Transport transport = null;
 
@@ -1268,7 +1284,7 @@ public class ConfigPartitionReader
     }
 
 
-    private ChangeLog getChangeLog( DN changelogDN ) throws Exception
+    public ChangeLog createChangeLog( DN changelogDN ) throws Exception
     {
         long id = configPartition.getEntryId( changelogDN );
         Entry clEntry = configPartition.lookup( id );
@@ -1292,7 +1308,7 @@ public class ConfigPartitionReader
     }
 
 
-    private Journal getJournal( DN journalDN ) throws Exception
+    public Journal createJournal( DN journalDN ) throws Exception
     {
         long id = configPartition.getEntryId( journalDN );
         Entry jlEntry = configPartition.lookup( id );
@@ -1328,7 +1344,7 @@ public class ConfigPartitionReader
     }
 
 
-    private List<LdifEntry> getTestEntries( String entryFilePath ) throws Exception
+    private List<LdifEntry> createTestEntries( String entryFilePath ) throws Exception
     {
         List<LdifEntry> entries = new ArrayList<LdifEntry>();
 
@@ -1368,12 +1384,12 @@ public class ConfigPartitionReader
     }
 
 
-    private Set<WebApp> getWebApps( DN webAppsDN ) throws Exception
+    private Set<WebApp> createWebApps( DN webAppsDN ) throws Exception
     {
         AttributeType adsHttpWarFileAt = schemaManager.getAttributeType( ConfigSchemaConstants.ADS_HTTP_WARFILE );
         PresenceNode filter = new PresenceNode( adsHttpWarFileAt );
         SearchControls controls = new SearchControls();
-        controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
+        controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         IndexCursor<Long, Entry, Long> cursor = se.cursor( webAppsDN, AliasDerefMode.NEVER_DEREF_ALIASES, filter,
             controls );
 
@@ -1409,7 +1425,7 @@ public class ConfigPartitionReader
      * @return an instance of the MechanismHandler type
      * @throws Exception
      */
-    private MechanismHandler getSaslMechHandler( Entry saslMechHandlerEntry ) throws Exception
+    public MechanismHandler createSaslMechHandler( Entry saslMechHandlerEntry ) throws Exception
     {
         String mechClassName = saslMechHandlerEntry.get( ConfigSchemaConstants.ADS_LDAP_SERVER_SASL_MECH_CLASS_NAME ).getString();
         
@@ -1439,7 +1455,7 @@ public class ConfigPartitionReader
      * @return the {@link PasswordPolicyConfiguration} object, null if the pwdpolicy entry is not present or disabled
      * @throws Exception
      */
-    private PasswordPolicyConfiguration getPwdPolicyConfig( DN dirServiceDN ) throws Exception
+    public PasswordPolicyConfiguration createPwdPolicyConfig( DN dirServiceDN ) throws Exception
     {
         AttributeType ocAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
         EqualityNode<String> filter = new EqualityNode<String>( ocAt, new StringValue( PWD_POLICY_OC ) );

Propchange: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:57:55 2010
@@ -3,4 +3,4 @@
 /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:980025-980137
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:980025-980137,982368-987474

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java Fri Aug 20 12:57:55 2010
@@ -72,7 +72,8 @@ public interface ConfigSchemaConstants
 
     String ADS_HTTP_CONFFILE = "ads-httpConfFile";
 
-    String ADS_HTTP_WEBAPPS = "ads-httpWebApps";
+    //TODO unused, better to be remove or reuse after renaming
+    //String ADS_HTTP_WEBAPPS = "ads-httpWebApps";
 
     String ADS_DIRECTORYSERVICE_ID = "ads-directoryServiceId";
 
@@ -221,4 +222,8 @@ public interface ConfigSchemaConstants
     String ADS_LDAP_SERVER_EXT_OP_HANDLER_OC = "ads-ldapServerExtendedOpHandler";
     
     String ADS_LDAP_SERVER_EXT_OP_HANDLER_FQCN = "ads-ldapServerExtendedOpHandlerClass";
+    
+    String ADS_LDAP_SERVER_KEYSTORE_FILE = "ads-ldapserverkeystorefile";
+    
+    String ADS_LDAP_SERVER_CERT_PASSWORD = "ads-ldapServerCertificatePassword";
 }

Propchange: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:57:55 2010
@@ -6,4 +6,4 @@
 /directory/apacheds/branches/apacheds-schema/default-config/src/main/resources:806623-896441
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:980025-980137
+/directory/apacheds/trunk/server-config/src/main/resources:980025-980137,982368-987474

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default.ldif Fri Aug 20 12:57:55 2010
@@ -9,3 +9,4 @@ ads-dsdenormalizeopattrsenabled: false
 objectclass: ads-directoryService
 objectclass: top
 ads-directoryserviceid: default
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=aciauthorizationinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Daciauthorizationinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=aciauthorizationinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=aciauthorizationinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: aciAuthorizationInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=authenticationinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Dauthenticationinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=authenticationinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=authenticationinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: authenticationInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=collectiveattributeinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Dcollectiveattributeinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=collectiveattributeinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=collectiveattributeinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: collectiveAttributeInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=defaultauthorizationinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Ddefaultauthorizationinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=defaultauthorizationinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=defaultauthorizationinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: defaultAuthorizationInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=eventinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Deventinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=eventinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=eventinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: eventInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=exceptioninterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Dexceptioninterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=exceptioninterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=exceptioninterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: exceptionInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=normalizationinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Dnormalizationinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=normalizationinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=normalizationinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: normalizationInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=operationalattributeinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Doperationalattributeinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=operationalattributeinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=operationalattributeinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: operationalAttributeInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=referralinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Dreferralinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=referralinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=referralinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: referralInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=schemainterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Dschemainterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=schemainterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=schemainterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: schemaInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=subentryinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Dsubentryinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=subentryinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=subentryinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: subentryInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=triggerinterceptor.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dinterceptors/ads-interceptorid%3Dtriggerinterceptor.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=triggerinterceptor.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=interceptors/ads-interceptorid=triggerinterceptor.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-interceptorclassname: org.apache.dir
 ads-interceptorid: triggerInterceptor
 objectclass: ads-interceptor
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example.ldif Fri Aug 20 12:57:55 2010
@@ -9,3 +9,4 @@ objectclass: ads-jdbmPartition
 objectclass: ads-partition
 objectclass: top
 ads-partitionid: example
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.1.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.2.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.3.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.4.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.5.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.6.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.7.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=dc.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3Ddc.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=dc.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=dc.ldif Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=krb5principalname.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3Dkrb5principalname.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=krb5principalname.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=krb5principalname.ldif Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=objectclass.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3Dobjectclass.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=objectclass.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=objectclass.ldif Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=ou.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3Dou.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=ou.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=ou.ldif Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=uid.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dexample/ou%3Dindexes/ads-indexattributeid%3Duid.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=uid.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=example/ou=indexes/ads-indexattributeid=uid.ldif Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system.ldif Fri Aug 20 12:57:55 2010
@@ -9,3 +9,4 @@ objectclass: ads-jdbmPartition
 objectclass: ads-partition
 objectclass: top
 ads-partitionid: system
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.1.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.1.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.2.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.2.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.3.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.3.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.4.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.5.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.6.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3D1.3.6.1.4.1.18060.0.4.1.2.7.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=1.3.6.1.4.1.18060.0.4.1.2.7.ldif Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=objectclass.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3Dobjectclass.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=objectclass.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=objectclass.ldif Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=ou.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3Dou.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=ou.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=ou.ldif Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=uid.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpartitions/ads-partitionid%3Dsystem/ou%3Dindexes/ads-indexattributeid%3Duid.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=uid.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=partitions/ads-partitionid=system/ou=indexes/ads-indexattributeid=uid.ldif Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=pwdpolicy.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Ddirectoryservice/ads-directoryserviceid%3Ddefault/ou%3Dpwdpolicy.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=pwdpolicy.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=directoryservice/ads-directoryserviceid=default/ou=pwdpolicy.ldif Fri Aug 20 12:57:55 2010
@@ -19,3 +19,4 @@ pwdMinAge: 0
 pwdAllowUserChange: TRUE
 pwdGraceAuthNLimit: 5
 pwdCheckQuality: 2
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dchangepasswordserver.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver.ldif Fri Aug 20 12:57:55 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/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=tcp.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dchangepasswordserver/ou%3Dtransports/ads-transportid%3Dtcp.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=tcp.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=tcp.ldif Fri Aug 20 12:57:55 2010
@@ -8,3 +8,4 @@ ads-transportid: tcp
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=udp.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dchangepasswordserver/ou%3Dtransports/ads-transportid%3Dudp.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=udp.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=udp.ldif Fri Aug 20 12:57:55 2010
@@ -8,3 +8,4 @@ ads-transportid: udp
 objectclass: ads-transport
 objectclass: top
 objectclass: ads-udpTransport
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Ddns.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns.ldif Fri Aug 20 12:57:55 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



Mime
View raw message