directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1029081 [4/4] - in /directory/apacheds/trunk/server-config: ./ src/main/java/org/apache/directory/server/config/ src/main/java/org/apache/directory/server/config/beans/ src/main/resources/ src/main/resources/config/ src/main/resources/conf...
Date Sat, 30 Oct 2010 14:30:34 GMT
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java Sat Oct 30 14:30:31 2010
@@ -19,28 +19,48 @@
  */
 package org.apache.directory.server.config.beans;
 
+import org.apache.directory.shared.ldap.name.DN;
+
 
 /**
  * A class used to store the Replication Consumer configuration.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ReplConsumerBean extends BaseAdsBean
+public class ReplConsumerBean extends AdsBaseBean
 {
-    /** The replicaConsumer unique ID */
+    /** The consumer id */
+    private String replConsumerId;
+    
+    /** The replication unique ID */
     private String dsReplicaId;
     
-    /*
-    m-must: ads-replAliasDerefMode;
-    private String searchBaseDN;
+    /** The Alias Dereferencing mode */
+    private String replAliasDerefMode;
+    
+    /** The Search Base DN */
+    private DN searchBaseDN;
+    
+    /** The last CSN sent */
     private String replLastSentCsn;
-    m-must: ads-replSearchScope;
+    
+    /** The search scope */
+    private String replSearchScope;
+    
+    /** The replication search filter */
     private String replSearchFilter;
-    m-may: ads-replRefreshNPersist;
-    m-may: ads-replUseTls;
-    m-may: ads-replStrictCertValidation;
-    m-may: ads-replPeerCertificate;
-    */
+    
+    /** Tells if we should persist */
+    private boolean replRefreshNPersist;
+    
+    /** Tells if TLS should be used during replication */
+    private boolean replUseTls;
+    
+    /** Tells if the certificate validation should be strict or not */
+    private boolean replStrictCertValidation;
+    
+    /** The peer certificate */
+    private String replPeerCertificate;
 
     /**
      * Create a new Replication Consumer instance
@@ -52,4 +72,238 @@ public class ReplConsumerBean extends Ba
         // Enabled by default
         setEnabled( true );
     }
+
+    
+    /**
+     * @return the replConsumerId
+     */
+    public String getReplConsumerId()
+    {
+        return replConsumerId;
+    }
+
+
+    /**
+     * @param replConsumerId the replConsumerId to set
+     */
+    public void setReplConsumerId( String replConsumerId )
+    {
+        this.replConsumerId = replConsumerId;
+    }
+
+    
+    /**
+     * @return the dsreplicaid
+     */
+    public String getDsreplicaid()
+    {
+        return dsReplicaId;
+    }
+
+    
+    /**
+     * @param dsreplicaid the dsreplicaid to set
+     */
+    public void setDsreplicaid( String dsreplicaid )
+    {
+        this.dsReplicaId = dsreplicaid;
+    }
+
+    
+    /**
+     * @return the replAliasDerefMode
+     */
+    public String getReplAliasDerefMode()
+    {
+        return replAliasDerefMode;
+    }
+
+    
+    /**
+     * @param replAliasDerefMode the replAliasDerefMode to set
+     */
+    public void setReplAliasDerefMode( String replAliasDerefMode )
+    {
+        this.replAliasDerefMode = replAliasDerefMode;
+    }
+
+    
+    /**
+     * @return the searchBaseDN
+     */
+    public DN getSearchBaseDN()
+    {
+        return searchBaseDN;
+    }
+
+    
+    /**
+     * @param searchBaseDN the searchBaseDN to set
+     */
+    public void setSearchBaseDN( DN searchBaseDN )
+    {
+        this.searchBaseDN = searchBaseDN;
+    }
+
+    
+    /**
+     * @return the replLastSentCsn
+     */
+    public String getReplLastSentCsn()
+    {
+        return replLastSentCsn;
+    }
+
+    
+    /**
+     * @param replLastSentCsn the replLastSentCsn to set
+     */
+    public void setReplLastSentCsn( String replLastSentCsn )
+    {
+        this.replLastSentCsn = replLastSentCsn;
+    }
+
+    
+    /**
+     * @return the replSearchScope
+     */
+    public String getReplSearchScope()
+    {
+        return replSearchScope;
+    }
+
+    
+    /**
+     * @param replSearchScope the replSearchScope to set
+     */
+    public void setReplSearchScope( String replSearchScope )
+    {
+        this.replSearchScope = replSearchScope;
+    }
+
+    
+    /**
+     * @return the replSearchFilter
+     */
+    public String getReplSearchFilter()
+    {
+        return replSearchFilter;
+    }
+
+    
+    /**
+     * @param replSearchFilter the replSearchFilter to set
+     */
+    public void setReplSearchFilter( String replSearchFilter )
+    {
+        this.replSearchFilter = replSearchFilter;
+    }
+
+    
+    /**
+     * @return the replRefreshNPersist
+     */
+    public boolean isReplRefreshNPersist()
+    {
+        return replRefreshNPersist;
+    }
+
+    
+    /**
+     * @param replRefreshNPersist the replRefreshNPersist to set
+     */
+    public void setReplRefreshNPersist( boolean replRefreshNPersist )
+    {
+        this.replRefreshNPersist = replRefreshNPersist;
+    }
+
+    
+    /**
+     * @return the replUseTls
+     */
+    public boolean isReplUseTls()
+    {
+        return replUseTls;
+    }
+
+    
+    /**
+     * @param replUseTls the replUseTls to set
+     */
+    public void setReplUseTls( boolean replUseTls )
+    {
+        this.replUseTls = replUseTls;
+    }
+
+    
+    /**
+     * @return the replStrictCertValidation
+     */
+    public boolean isReplStrictCertValidation()
+    {
+        return replStrictCertValidation;
+    }
+
+    
+    /**
+     * @param replStrictCertValidation the replStrictCertValidation to set
+     */
+    public void setReplStrictCertValidation( boolean replStrictCertValidation )
+    {
+        this.replStrictCertValidation = replStrictCertValidation;
+    }
+
+    
+    /**
+     * @return the replPeerCertificate
+     */
+    public String getReplPeerCertificate()
+    {
+        return replPeerCertificate;
+    }
+
+    
+    /**
+     * @param replPeerCertificate the replPeerCertificate to set
+     */
+    public void setReplPeerCertificate( String replPeerCertificate )
+    {
+        this.replPeerCertificate = replPeerCertificate;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "Replication consumer :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+
+        sb.append( tabs ).append( "  consumer ID : " ).append( replConsumerId ).append( '\n' );
+        sb.append( tabs ).append( "  replica ID : " ).append( dsReplicaId ).append( '\n' );
+        sb.append( tabs ).append( "  last sent CSN : " ).append( replLastSentCsn ).append( '\n' );
+        sb.append( tabs ).append( "  search base DN : " ).append( searchBaseDN.getName() ).append( '\n' );
+        sb.append( tabs ).append( "  search filter : " ).append( replSearchFilter ).append( '\n' );
+        sb.append( tabs ).append( "  search scope : " ).append( replSearchScope ).append( '\n' );
+        sb.append( tabs ).append( "  alias dereferencing mode : " ).append( replAliasDerefMode ).append( '\n' );
+
+        sb.append( toString( tabs, "  peer certificate", replPeerCertificate ) );
+        sb.append( toString( tabs, "  refresh and persist mode", replRefreshNPersist ) );
+        sb.append( toString( tabs, "  struct certivicate validation", replStrictCertValidation ) );
+        sb.append( toString( tabs, "  use TLS", replUseTls ) );
+
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java Sat Oct 30 14:30:31 2010
@@ -33,4 +33,22 @@ public class TcpTransportBean extends Tr
     {
         super();
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        return tabs + "TCP transport : \n" + super.toString( "  " + tabs);
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java Sat Oct 30 14:30:31 2010
@@ -24,13 +24,13 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class TransportBean extends BaseAdsBean
+public class TransportBean extends AdsBaseBean
 {
     /** The default backlog queue size */
-    protected static final int DEFAULT_BACKLOG_NB = 50;
+    private static final int DEFAULT_BACKLOG_NB = 50;
     
     /** The default number of threads */
-    protected static final int DEFAULT_NB_THREADS = 3;
+    private static final int DEFAULT_NB_THREADS = 3;
 
     /** The unique identifier for this transport */
     private String transportId;
@@ -41,17 +41,15 @@ public class TransportBean extends BaseA
     /** The port number */
     private int systemPort = -1;
     
-
     /** A flag set if SSL is enabled */
-    private boolean transportEnableSSL = false;
+    private boolean transportEnableSsl = false;
     
     /** The number of threads to use for the IoAcceptor executor */
     private int transportNbThreads = DEFAULT_NB_THREADS;
     
     /** The backlog for the transport services */
-    private int transportBacklog = DEFAULT_BACKLOG_NB;
+    private int transportBackLog = DEFAULT_BACKLOG_NB;
     
-
     /**
      * Create a new TransportBean instance
      */
@@ -99,7 +97,7 @@ public class TransportBean extends BaseA
      */
     public boolean isTransportEnableSSL()
     {
-        return transportEnableSSL;
+        return transportEnableSsl;
     }
     
     
@@ -110,7 +108,7 @@ public class TransportBean extends BaseA
      */
     public void setTransportEnableSSL( boolean transportEnableSSL )
     {
-        this.transportEnableSSL = transportEnableSSL;
+        this.transportEnableSsl = transportEnableSSL;
     }
     
     
@@ -139,7 +137,7 @@ public class TransportBean extends BaseA
      */
     public int getTransportBackLog()
     {
-        return transportBacklog;
+        return transportBackLog;
     }
     
     
@@ -150,7 +148,7 @@ public class TransportBean extends BaseA
      */
     public void setTransportBackLog( int transportBacklog )
     {
-        this.transportBacklog = transportBacklog;
+        this.transportBackLog = transportBacklog;
     }
 
 
@@ -170,4 +168,41 @@ public class TransportBean extends BaseA
     {
         this.transportId = transportId;
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( toString( tabs, "transport id", transportId ) );
+        sb.append( tabs ).append( "transport address : " );
+        
+        if ( transportAddress == null )
+        {
+            sb.append( "localhost" ).append( '\n' );
+        }
+        else
+        {
+            sb.append( transportAddress ).append( '\n' );
+        }
+
+        sb.append( tabs ).append( "transport port : " ).append( systemPort ).append( '\n' );
+        sb.append( tabs ).append( "transport backlog : " ).append( transportBackLog ).append( '\n' );
+        sb.append( tabs ).append( "transport nb threads : " ).append( transportNbThreads ).append( '\n' );
+        sb.append( toString( tabs, "SSL enabled", transportEnableSsl ) );
+
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java Sat Oct 30 14:30:31 2010
@@ -33,4 +33,22 @@ public class UdpTransportBean extends Tr
     {
         super();
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        return tabs + "UDP transport : \n" + super.toString( "  " + tabs);
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Propchange: directory/apacheds/trunk/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 14:30:31 2010
@@ -1,5 +1,6 @@
 /directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources:897934-898678
 /directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources:982369-987590
+/directory/apacheds/branches/apacheds-config/server-config/src/main/resources:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config/src/main/resources:980138-980938
 /directory/apacheds/branches/apacheds-replication/core-annotations/src/main/resources:749790-764110
 /directory/apacheds/branches/apacheds-replication/default-config/src/main/resources:749790-764110

Modified: directory/apacheds/trunk/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config.ldif?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config.ldif Sat Oct 30 14:30:31 2010
@@ -1,580 +1,561 @@
+version: 1
 dn: ou=config
 ou: config
+objectclass: top
+objectclass: organizationalUnit
+
+dn: ou=replProviders,ou=config
+ou: replProviders
 objectclass: organizationalUnit
 objectclass: top
 
 dn: ads-directoryServiceId=default,ou=config
-ads-dsPasswordHidden: false
+objectclass: top
+objectclass: ads-base
+objectclass: ads-directoryService
+ads-directoryserviceid: default
 ads-dsreplicaid: 1
 ads-dssyncperiodmillis: 15000
 ads-dsmaxpdusize: 2000000
 ads-dsallowanonymousaccess: true
-ads-enabled: true
 ads-dsaccesscontrolenabled: false
 ads-dsdenormalizeopattrsenabled: false
-objectclass: ads-directoryService
-objectclass: top
-ads-directoryserviceid: default
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-dsWorkingDirectory: /tmp
+ads-servers: changepasswordserver
+ads-servers: dns
+ads-servers: httpserver
+ads-servers: kerberos
+ads-servers: ldapserver
+ads-servers: ntp
+ads-partitions: example
+ads-partitions: system
+ads-interceptors: aciAuthorizationInterceptor
+ads-interceptors: authenticationInterceptor
+ads-interceptors: collectiveAttributeInterceptor
+ads-interceptors: defaultAuthorizationInterceptor
+ads-interceptors: eventInterceptor
+ads-interceptors: exceptionInterceptor
+ads-interceptors: keyderivationinterceptor
+ads-interceptors: normalizationInterceptor
+ads-interceptors: operationalAttributeInterceptor
+ads-interceptors: passwordpolicyinterceptor
+ads-interceptors: referralInterceptor
+ads-interceptors: schemaInterceptor
+ads-interceptors: subentryInterceptor
+ads-interceptors: triggerInterceptor
+ads-enabled: true
+
+dn: ads-changeLogId=defaultChangeLog,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-changeLog
+ads-changeLogId: defaultChangeLog
+ads-changeLogExposed: FALSE
+
+
+dn: ads-journalId=defaultJournal,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-journal
+ads-journalId: defaultJournal
+ads-journalFileName: Journal.txt
+ads-journalWorkingDir: /
+ads-journalRotation: 2
+
 
 dn: ou=interceptors,ads-directoryServiceId=default,ou=config
 ou: interceptors
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
 dn: ads-interceptorId=aciAuthorizationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 4
 ads-interceptorclassname: org.apache.directory.server.core.authz.AciAuthorizationInterceptor
 ads-interceptorid: aciAuthorizationInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 2
 ads-interceptorclassname: org.apache.directory.server.core.authn.AuthenticationInterceptor
 ads-interceptorid: authenticationInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=collectiveAttributeInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 12
 ads-interceptorclassname: org.apache.directory.server.core.collective.CollectiveAttributeInterceptor
 ads-interceptorid: collectiveAttributeInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=defaultAuthorizationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 5
 ads-interceptorclassname: org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor
 ads-interceptorid: defaultAuthorizationInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=eventInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 13
 ads-interceptorclassname: org.apache.directory.server.core.event.EventInterceptor
 ads-interceptorid: eventInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=exceptionInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 6
 ads-interceptorclassname: org.apache.directory.server.core.exception.ExceptionInterceptor
 ads-interceptorid: exceptionInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=keyderivationinterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-enabled: false
 ads-interceptororder: 9
 ads-interceptorclassname: org.apache.directory.server.core.kerberos.KeyDerivationInterceptor
 ads-interceptorid: keyderivationinterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
 dn: ads-interceptorId=normalizationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 1
 ads-interceptorclassname: org.apache.directory.server.core.normalization.NormalizationInterceptor
 ads-interceptorid: normalizationInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=operationalAttributeInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 7
 ads-interceptorclassname: org.apache.directory.server.core.operational.OperationalAttributeInterceptor
 ads-interceptorid: operationalAttributeInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=passwordpolicyinterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-enabled: false
 ads-interceptororder: 8
 ads-interceptorclassname: org.apache.directory.server.core.kerberos.PasswordPolicyInterceptor
 ads-interceptorid: passwordpolicyinterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
 dn: ads-interceptorId=referralInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 3
 ads-interceptorclassname: org.apache.directory.server.core.referral.ReferralInterceptor
 ads-interceptorid: referralInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=schemaInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 10
 ads-interceptorclassname: org.apache.directory.server.core.schema.SchemaInterceptor
 ads-interceptorid: schemaInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=subentryInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 11
 ads-interceptorclassname: org.apache.directory.server.core.subtree.SubentryInterceptor
 ads-interceptorid: subentryInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-interceptorId=triggerInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
-ads-enabled: true
+objectclass: top
+objectclass: ads-base
+objectclass: ads-interceptor
 ads-interceptororder: 14
 ads-interceptorclassname: org.apache.directory.server.core.trigger.TriggerInterceptor
 ads-interceptorid: triggerInterceptor
-objectclass: ads-interceptor
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
+
+dn: ads-pwdId=pwdPolicy,ads-directoryServiceId=default,ou=config
+objectClass: top
+objectClass: ads-base
+objectClass: ads-passwordPolicy
+ads-pwdId: pwdpolicy
+ads-pwdSafeModify: FALSE
+ads-pwdMaxAge: 0
+ads-pwdFailureCountInterval: 30
+ads-pwdAttribute: userPassword
+ads-pwdMaxFailure: 5
+ads-pwdLockout: TRUE
+ads-pwdMustChange: FALSE
+ads-pwdLockoutDuration: 0
+ads-pwdMinLength: 5
+ads-pwdInHistory: 5
+ads-pwdExpireWarning: 600
+ads-pwdMinAge: 0
+ads-pwdAllowUserChange: TRUE
+ads-pwdGraceAuthNLimit: 5
+ads-pwdCheckQuality: 2
+ads-enabled: true
 
 dn: ou=partitions,ads-directoryServiceId=default,ou=config
 ou: partitions
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-partitionsuffix: dc=example,dc=com
-ads-enabled: true
+dn: ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectClass: ads-base
+objectclass: ads-partition
+objectclass: ads-jdbmPartition
+ads-partitionSuffix: ou=system
 ads-jdbmpartitionoptimizerenabled: true
 ads-partitioncachesize: 100
 ads-partitionsynconwrite: true
-objectclass: ads-jdbmPartition
-objectclass: ads-partition
-objectclass: top
-ads-partitionid: example
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-partitionid: system
+ads-enabled: true
+ads-contextEntry: dn: ou=system\n
+ objectClass: top\n
+ objectClass: organizationalUnit\n
+ ou: system\n
+ description: The System context entry
 
-dn: ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+dn: ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ou: indexes
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.1,ou=indexes,ads-partitionId=example,ou=partitions,ads-dire
- ctoryServiceId=default,ou=config
-ads-enabled: true
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.1,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.1
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.2,ou=indexes,ads-partitionId=example,ou=partitions,ads-dire
- ctoryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.2,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.2
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.3,ou=indexes,ads-partitionId=example,ou=partitions,ads-dire
- ctoryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.3,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.3
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.4,ou=indexes,ads-partitionId=example,ou=partitions,ads-dire
- ctoryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.4,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.4
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.5,ou=indexes,ads-partitionId=example,ou=partitions,ads-dire
- ctoryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.5,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.5
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.6,ou=indexes,ads-partitionId=example,ou=partitions,ads-dire
- ctoryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.6,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.6
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.7,ou=indexes,ads-partitionId=example,ou=partitions,ads-dire
- ctoryServiceId=default,ou=config
 ads-enabled: true
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.7
-ads-indexcachesize: 100
-objectclass: ads-index
-objectclass: ads-jdbmIndex
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-indexAttributeId=dc,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou
- =config
-ads-enabled: true
-ads-indexattributeid: dc
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.7,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.7
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=krb5PrincipalName,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServi
- ceId=default,ou=config
 ads-enabled: true
-ads-indexattributeid: krb5PrincipalName
-ads-indexcachesize: 100
-objectclass: ads-index
-objectclass: ads-jdbmIndex
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-indexAttributeId=objectClass,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=d
- efault,ou=config
-ads-enabled: true
+dn: ads-indexAttributeId=objectClass,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: objectClass
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=ou,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou
- =config
 ads-enabled: true
+
+dn: ads-indexAttributeId=ou,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: ou
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=uid,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,o
- u=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=uid,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: uid
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-partitionsuffix: ou=system
 ads-enabled: true
+
+dn: ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectClass: ads-base
+objectclass: ads-partition
+objectclass: ads-jdbmPartition
+ads-partitionSuffix: dc=example,dc=com
 ads-jdbmpartitionoptimizerenabled: true
 ads-partitioncachesize: 100
 ads-partitionsynconwrite: true
-objectclass: ads-jdbmPartition
-objectclass: ads-partition
-objectclass: top
-ads-partitionid: system
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-partitionid: example
+ads-enabled: true
 
-dn: ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+dn: ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
 ou: indexes
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.1,ou=indexes,ads-partitionId=system,ou=partitions,ads-direc
- toryServiceId=default,ou=config
-ads-enabled: true
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.1,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.1
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.2,ou=indexes,ads-partitionId=system,ou=partitions,ads-direc
- toryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.2,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.2
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.3,ou=indexes,ads-partitionId=system,ou=partitions,ads-direc
- toryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.3,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.3
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.4,ou=indexes,ads-partitionId=system,ou=partitions,ads-direc
- toryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.4,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.4
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.5,ou=indexes,ads-partitionId=system,ou=partitions,ads-direc
- toryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.5,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.5
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.6,ou=indexes,ads-partitionId=system,ou=partitions,ads-direc
- toryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.6,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.6
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.7,ou=indexes,ads-partitionId=system,ou=partitions,ads-direc
- toryServiceId=default,ou=config
 ads-enabled: true
+
+dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.7,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
 ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.7
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=objectClass,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=de
- fault,ou=config
 ads-enabled: true
-ads-indexattributeid: objectClass
+
+dn: ads-indexAttributeId=dc,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: dc
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=ou,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=
- config
 ads-enabled: true
-ads-indexattributeid: ou
+
+dn: ads-indexAttributeId=krb5PrincipalName,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: krb5PrincipalName
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-indexAttributeId=uid,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou
- =config
 ads-enabled: true
-ads-indexattributeid: uid
+
+dn: ads-indexAttributeId=objectClass,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: objectClass
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
-dn: ou=pwdpolicy,ads-directoryServiceId=default,ou=config
-pwdsafemodify: FALSE
-ou: pwdpolicy
-ads-enabled: true
-pwdmaxage: 0
-pwdfailurecountinterval: 30
-pwdattribute: userPassword
-pwdmaxfailure: 5
-pwdlockout: TRUE
-pwdmustchange: FALSE
-pwdlockoutduration: 0
-pwdminlength: 5
-pwdinhistory: 5
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-pwdexpirewarning: 600
-pwdminage: 0
-pwdallowuserchange: TRUE
-pwdgraceauthnlimit: 5
-objectclass: pwdPolicy
-objectclass: organizationalunit
+dn: ads-indexAttributeId=ou,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: ou
+ads-indexcachesize: 100
+objectclass: ads-index
+objectclass: ads-jdbmIndex
 objectclass: top
-pwdcheckquality: 2
+ads-enabled: true
 
-dn: ou=replProviders,ou=config
-ou: replProviders
-objectclass: organizationalUnit
+dn: ads-indexAttributeId=uid,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: uid
+ads-indexcachesize: 100
+objectclass: ads-index
+objectclass: ads-jdbmIndex
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
-dn: ou=servers,ou=config
+dn: ou=servers,ads-directoryServiceId=default,ou=config
 ou: servers
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-serverId=changepasswordserver,ou=servers,ou=config
-ads-krbprimaryrealm: EXAMPLE.COM
-ads-krbemptyaddressesallowed: true
+dn: ads-serverId=changepasswordserver,ou=servers,ads-directoryServiceId=default,ou=config
+objectclass: ads-server
+objectclass: ads-changePasswordServer
+objectclass: ads-dsBasedServer
 ads-serverid: changepasswordserver
+ads-chgPwdServicePrincipal: kadmin/changepw@EXAMPLE.COM
 ads-enabled: false
-ads-chgpwdserviceprincipal: kadmin/changepw@EXAMPLE.COM
 ads-krballowableclockskew: 300000
-ads-searchbasedn: ou=users,dc=example,dc=com
-objectclass: ads-server
-objectclass: ads-changePasswordServer
-objectclass: ads-catalogBasedServer
-ads-krbencryptiontypes: des-cbc-md5
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-krbEmptyAddressesAllowed: true
+ads-krbEncryptionTypes: des-cbc-md5
+ads-krbPrimaryRealm: EXAMPLE.COM
+ads-searchBaseDN: ou=users,dc=example,dc=com
 
-dn: ou=transports,ads-serverId=changepasswordserver,ou=servers,ou=config
+dn: ou=transports,ads-serverId=changepasswordserver,ou=servers,ads-directoryServiceId=default,ou=config
 ou: transports
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-transportId=tcp,ou=transports,ads-serverId=changepasswordserver,ou=servers,ou=config
+dn: ads-transportId=tcp,ou=transports,ads-serverId=changepasswordserver,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60464
-ads-enabled: true
 ads-transportbacklog: 50
 ads-transportnbthreads: 2
 ads-transportid: tcp
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
-dn: ads-transportId=udp,ou=transports,ads-serverId=changepasswordserver,ou=servers,ou=config
+dn: ads-transportId=udp,ou=transports,ads-serverId=changepasswordserver,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60464
-ads-enabled: true
 ads-transportbacklog: 50
 ads-transportnbthreads: 2
 ads-transportid: udp
 objectclass: ads-transport
 objectclass: top
 objectclass: ads-udpTransport
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
-dn: ads-serverId=dns,ou=servers,ou=config
+dn: ads-serverId=dns,ou=servers,ads-directoryServiceId=default,ou=config
 ads-serverid: dns
 ads-enabled: false
 objectclass: ads-server
 objectclass: ads-dnsServer
-objectclass: ads-catalogBasedServer
+objectclass: ads-dsBasedServer
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ou=transports,ads-serverId=dns,ou=servers,ou=config
+dn: ou=transports,ads-serverId=dns,ou=servers,ads-directoryServiceId=default,ou=config
 ou: transports
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-transportId=tcp,ou=transports,ads-serverId=dns,ou=servers,ou=config
+dn: ads-transportId=tcp,ou=transports,ads-serverId=dns,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 8053
-ads-enabled: true
 ads-transportid: tcp
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
-dn: ads-transportId=udp,ou=transports,ads-serverId=dns,ou=servers,ou=config
+dn: ads-transportId=udp,ou=transports,ads-serverId=dns,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 8053
-ads-enabled: true
 ads-transportid: udp
 objectclass: ads-transport
 objectclass: ads-udpTransport
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
-dn: ads-serverId=httpserver,ou=servers,ou=config
+dn: ads-serverId=httpserver,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 7009
 ads-serverid: httpserver
 ads-enabled: false
 objectclass: ads-httpServer
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ou=webapps,ads-serverId=httpserver,ou=servers,ou=config
+dn: ou=webapps,ads-serverId=httpserver,ou=servers,ads-directoryServiceId=default,ou=config
 ou: webapps
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-Id=testapp,ou=webapps,ads-serverId=httpserver,ou=servers,ou=config
+dn: ads-Id=testapp,ou=webapps,ads-serverId=httpserver,ou=servers,ads-directoryServiceId=default,ou=config
 ads-httpwarfile: /path/to/foo/war
 ads-httpappctxpath: /foo
-ads-enabled: false
 ads-id: testapp
 objectclass: ads-httpWebApp
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-serverId=kerberos,ou=servers,ou=config
-ads-krbemptyaddressesallowed: true
 ads-enabled: false
-ads-krbmaximumrenewablelifetime: 604800000
-ads-krbbodychecksumverified: true
-ads-krbkdcprincipal: krbtgt/EXAMPLE.COM@EXAMPLE.COM
-ads-krbpaenctimestamprequired: true
-ads-krbforwardableallowed: true
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-ads-krbmaximumticketlifetime: 86400000
-ads-krbprimaryrealm: EXAMPLE.COM
-ads-serverid: kerberos
-ads-krbpostdatedallowed: true
-ads-krballowableclockskew: 300000
-ads-krbproxiableallowed: true
+
+dn: ads-serverId=kerberos,ou=servers,ads-directoryServiceId=default,ou=config
 objectclass: ads-server
-objectclass: ads-kerberosServer
-objectclass: ads-catalogBasedServer
+objectclass: ads-kdcServer
+objectclass: ads-dsBasedServer
 objectclass: top
-ads-krbrenewableallowed: true
-ads-krbencryptiontypes: des-cbc-md5
+ads-serverid: kerberos
+ads-enabled: false
+ads-krbAllowableClockSkew: 300000
+ads-krbBodyChecksumVerified: true
+ads-krbEmptyAddressesAllowed: true
+ads-krbEncryptionTypes: des-cbc-md5
+ads-krbForwardableAllowed: true
+ads-krbKdcPrincipal: krbtgt/EXAMPLE.COM@EXAMPLE.COM
+ads-krbmaximumrenewablelifetime: 604800000
+ads-krbMaximumTicketLifetime: 86400000
+ads-krbPaEncTimestampRequired: true
+ads-krbPostdatedAllowed: true
+ads-krbPrimaryRealm: EXAMPLE.COM
+ads-krbProxiableAllowed: true
+ads-krbRenewableAllowed: true
 
-dn: ou=transports,ads-serverId=kerberos,ou=servers,ou=config
+dn: ou=transports,ads-serverId=kerberos,ou=servers,ads-directoryServiceId=default,ou=config
 ou: transports
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-transportid=tcp,ou=transports,ads-serverId=kerberos,ou=servers,ou=config
+dn: ads-transportid=tcp,ou=transports,ads-serverId=kerberos,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60088
-ads-enabled: true
 ads-transportbacklog: 50
 ads-transportnbthreads: 4
 ads-transportaddress: 0.0.0.0
@@ -582,11 +563,10 @@ ads-transportid: tcp
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
-dn: ads-transportid=udp,ou=transports,ads-serverId=kerberos,ou=servers,ou=config
+dn: ads-transportid=udp,ou=transports,ads-serverId=kerberos,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60088
-ads-enabled: true
 ads-transportbacklog: 50
 ads-transportnbthreads: 4
 ads-transportaddress: localhost
@@ -594,176 +574,212 @@ ads-transportid: udp
 objectclass: ads-transport
 objectclass: ads-udpTransport
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
-dn: ads-serverId=ldapServer,ou=servers,ou=config
-ads-serverid: ldapServer
-ads-ldapserversaslrealms: example.com
-ads-ldapserversaslrealms: apache.org
-ads-enabled: true
-ads-enablereplprovider: false
-ads-ldapserversaslhost: ldap.example.com
-ads-ldapserversaslprincipal: ldap/ldap.example.com@EXAMPLE.COM
-ads-ldapserverconfidentialityrequired: false
-ads-searchbasedn: ou=users,ou=system
-ads-ldapservermaxtimelimit: 15000
-ads-ldapservermaxsizelimit: 1000
+dn: ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
 objectclass: ads-server
 objectclass: ads-ldapServer
-objectclass: ads-catalogBasedServer
+objectclass: ads-dsBasedServer
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-serverId: ldapServer
+ads-confidentialityRequired: false
+ads-maxSizeLimit: 1000
+ads-maxTimeLimit: 15000
+ads-saslHost: ldap.example.com
+ads-saslPrincipal: ldap/ldap.example.com@EXAMPLE.COM
+ads-saslRealms: example.com
+ads-saslRealms: apache.org
+ads-searchBaseDN: ou=users,ou=system
+ads-enabled: true
+ads-enableReplProvider: false
 
 dn: ou=extendedoperationhandlers,ads-serverId=ldapServer,ou=servers,ou=config
 ou: extendedoperationhandlers
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-extendedOpId=gracefulShutdownHandler,ou=extendedoperationhandlers,ads-serverId=ldapServer,ou=servers,ou=config
+dn: ads-transportid=ldap,ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-systemport: 10389
+ads-transportenablessl: false
+ads-transportbacklog: 50
+ads-transportnbthreads: 8
+ads-transportaddress: 0.0.0.0
+ads-transportid: ldap
+objectclass: ads-transport
+objectclass: ads-tcpTransport
+objectclass: top
 ads-enabled: true
+
+dn: ads-transportid=ldaps,ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-systemport: 10636
+ads-transportenablessl: true
+ads-transportaddress: localhost
+ads-transportid: ldaps
+objectclass: ads-transport
+objectclass: ads-tcpTransport
+objectclass: top
+ads-enabled: true
+
+dn: ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ou: extendedophandlers
+objectclass: organizationalUnit
+objectclass: top
+
+dn: ads-extendedOpId=gracefulShutdownHandler,ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
 ads-extendedOpId: gracefulShutdownHandler
-ads-ldapserverextendedophandlerclass: org.apache.directory.server.ldap.handlers.extended.GracefulShutdownHandl
- er
-objectclass: ads-ldapServerExtendedOpHandler
+ads-extendedOpHandlerclass: org.apache.directory.server.ldap.handlers.extended.GracefulShutdownHandler
+objectclass: ads-extendedOpHandler
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-extendedOpId=starttlshandler,ou=extendedoperationhandlers,ads-serverId=ldapServer,ou=servers,ou=config
 ads-enabled: true
 ads-extendedOpId: starttlshandler
-ads-ldapserverextendedophandlerclass: org.apache.directory.server.ldap.handlers.extended.StartTlsHandler
-objectclass: ads-ldapServerExtendedOpHandler
+ads-extendedOpHandlerclass: org.apache.directory.server.ldap.handlers.extended.StartTlsHandler
+objectclass: ads-extendedOpHandler
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
 dn: ads-extendedOpId=storedprochandler,ou=extendedoperationhandlers,ads-serverId=ldapServer,ou=servers,ou=config
 ads-enabled: false
 ads-extendedOpId: storedprochandler
-ads-ldapserverextendedophandlerclass: org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtend
- edOperationHandler
-objectclass: ads-ldapServerExtendedOpHandler
+ads-extendedOpHandlerclass: org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler
+objectclass: ads-extendedOpHandler
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ou=config
-ou: saslmechanisms
+dn: ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ou: saslmechhandlers
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-ldapServerSaslMechName=CRAM-MD5,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ou=config
-ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandle
- r
-ads-enabled: true
-objectclass: ads-ldapServerSaslMechanismHandler
+dn: ads-saslMechName=cram-md5,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler
+objectclass: ads-saslMechHandler
 objectclass: top
-ads-ldapserversaslmechname: CRAM-MD5
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-ldapServerSaslMechName=DIGEST-MD5,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ou=config
-ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHa
- ndler
+ads-saslMechName: CRAM-MD5
 ads-enabled: true
-objectclass: ads-ldapServerSaslMechanismHandler
-objectclass: top
-ads-ldapserversaslmechname: DIGEST-MD5
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-ldapServerSaslMechName=GSS-SPNEGO,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ou=config
-ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler
-ads-enabled: true
-objectclass: ads-ldapServerSaslMechanismHandler
+dn: ads-saslMechName=digest-md5,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHandler
+objectclass: ads-saslMechHandler
 objectclass: top
-ads-ldapserversaslmechname: GSS-SPNEGO
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-ads-ldapserverntlmmechprovider: com.foo.Bar
-
-dn: ads-ldapServerSaslMechName=GSSAPI,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ou=config
-ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler
+ads-saslMechName: DIGEST-MD5
 ads-enabled: true
-objectclass: ads-ldapServerSaslMechanismHandler
-objectclass: top
-ads-ldapserversaslmechname: GSSAPI
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-ldapServerSaslMechName=NTLM,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ou=config
-ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler
-ads-enabled: true
-objectclass: ads-ldapServerSaslMechanismHandler
+dn: ads-saslMechName=gss-spnego,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler
+objectclass: ads-saslMechHandler
 objectclass: top
-ads-ldapserversaslmechname: NTLM
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-ads-ldapserverntlmmechprovider: com.foo.Bar
-
-dn: ads-ldapServerSaslMechName=SIMPLE,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ou=config
-ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler
+ads-saslMechName: GSS-SPNEGO
+ads-ntlmMechProvider: com.foo.Bar
 ads-enabled: true
-objectclass: ads-ldapServerSaslMechanismHandler
-objectclass: top
-ads-ldapserversaslmechname: SIMPLE
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ou=transports,ads-serverId=ldapServer,ou=servers,ou=config
-ou: transports
-objectclass: organizationalUnit
+dn: ads-saslMechName=gssapi,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler
+objectclass: ads-saslMechHandler
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-
-dn: ads-transportid=ldap,ou=transports,ads-serverId=ldapServer,ou=servers,ou=config
-ads-systemport: 10389
-ads-transportenablessl: false
+ads-saslMechName: GSSAPI
 ads-enabled: true
-ads-transportbacklog: 50
-ads-transportnbthreads: 8
-ads-transportaddress: 0.0.0.0
-ads-transportid: ldap
-objectclass: ads-transport
-objectclass: ads-tcpTransport
-objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-transportid=ldaps,ou=transports,ads-serverId=ldapServer,ou=servers,ou=config
-ads-systemport: 10636
-ads-transportenablessl: true
+dn: ads-saslMechName=ntlm,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler
+objectclass: ads-saslMechHandler
+objectclass: top
+ads-saslMechName: NTLM
+ads-ntlmMechProvider: com.foo.Bar
 ads-enabled: true
-ads-transportaddress: localhost
-ads-transportid: ldaps
-objectclass: ads-transport
-objectclass: ads-tcpTransport
+
+dn: ads-saslMechName=simple,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ads-saslMechClassName: org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler
+objectclass: ads-saslMechHandler
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-saslMechName: SIMPLE
+ads-enabled: true
 
-dn: ads-serverId=ntp,ou=servers,ou=config
+dn: ads-serverId=ntp,ou=servers,ads-directoryServiceId=default,ou=config
 ads-serverid: ntp
 ads-enabled: false
 objectclass: ads-server
 objectclass: ads-ntpServer
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ou=transports,ads-serverId=ntp,ou=servers,ou=config
+dn: ou=transports,ads-serverId=ntp,ou=servers,ads-directoryServiceId=default,ou=config
 ou: transports
 objectclass: organizationalUnit
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
 
-dn: ads-transportId=tcp,ou=transports,ads-serverId=ntp,ou=servers,ou=config
+dn: ads-transportId=tcp,ou=transports,ads-serverId=ntp,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60123
-ads-enabled: true
 ads-transportid: tcp
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
 
-dn: ads-transportId=udp,ou=transports,ads-serverId=ntp,ou=servers,ou=config
+dn: ads-transportId=udp,ou=transports,ads-serverId=ntp,ou=servers,ads-directoryServiceId=default,ou=config
 ads-systemport: 60123
-ads-enabled: true
 ads-transportnbthreads: 1
 ads-transportid: udp
 objectclass: ads-transport
 objectclass: ads-udpTransport
 objectclass: top
-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+ads-enabled: true
+
+dn: ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-server
+objectclass: ads-httpServer
+ads-serverId: httpServer
+description: HTTP server
+ads-httpConfFile: test.conf
+
+dn: ou=httpWebApps,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
+ou: httpWebApps
+objectclass: organizationalUnit
+objectclass: top
+
+dn: ads-id=webApp1,ou=httpWebApps,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-httpWebApp
+ads-Id: webApp1
+ads-httpWarFile: war file 1
+ads-httpAppCtxPath: /home/app1
+
+dn: ads-id=webApp2,ou=httpWebApps,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-httpWebApp
+ads-Id: webApp2
+ads-httpWarFile: war file 2
+ads-httpAppCtxPath: /home/app2
+
+dn: ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
+ou: transports
+objectclass: organizationalUnit
+objectclass: top
 
+dn: ads-transportid=http-tcp,ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-transport
+objectclass: ads-tcpTransport
+ads-transportid: ntp-http
+ads-systemport: 123
+ads-transportenablessl: false
+ads-transportbacklog: 50
+ads-transportnbthreads: 8
+ads-transportaddress: 0.0.0.0
+ads-enabled: true
+
+dn: ads-transportid=http-udp,ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config
+objectclass: top
+objectclass: ads-base
+objectclass: ads-transport
+objectclass: ads-udpTransport
+ads-transportid: ntp-http
+ads-transportaddress: localhost
+ads-systemport: 456
+ads-transportenablessl: true
+ads-enabled: true

Modified: directory/apacheds/trunk/server-config/src/main/resources/config/ou=config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config/ou%3Dconfig.ldif?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config/ou=config.ldif (original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config.ldif Sat Oct 30 14:30:31 2010
@@ -1,5 +1,5 @@
 version: 1
 dn: ou=config
 ou: config
-objectclass: organizationalUnit
 objectclass: top
+objectclass: organizationalUnit

Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (original)
+++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java Sat Oct 30 14:30:31 2010
@@ -21,8 +21,7 @@
 package org.apache.directory.server.config;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.util.List;
@@ -30,12 +29,11 @@ import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import org.apache.directory.server.config.beans.ConfigBean;
+import org.apache.directory.server.config.beans.DirectoryServiceBean;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.partition.ldif.LdifPartition;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
-import org.apache.directory.server.core.schema.SchemaPartition;
 import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.server.protocol.shared.transport.Transport;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -44,8 +42,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
-import org.apache.mina.util.AvailablePortFinder;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -67,6 +63,8 @@ public class ConfigPartitionReaderTest
 
     private static SchemaManager schemaManager;
 
+    private static File workDir = new File( System.getProperty( "java.io.tmpdir" ) + "/server-work" );
+
 
     @BeforeClass
     public static void readConfig() throws Exception
@@ -102,9 +100,15 @@ public class ConfigPartitionReaderTest
             throw new Exception( "Schema load failed : " + LdapExceptionUtils.printErrors( errors ) );
         }
 
+    }
+
+
+    @Test
+    public void testReadFullConfig() throws Exception
+    {
         File configDir = new File( workDir, "config" ); // could be any directory, cause the config is now in a single file
         
-        String configFile = LdifConfigExtractor.extractSingleFileConfig( configDir, true );
+        String configFile = LdifConfigExtractor.extractSingleFileConfig( configDir, "config.ldif", true );
 
         SingleFileLdifPartition configPartition = new SingleFileLdifPartition( configFile );
         configPartition.setId( "config" );
@@ -115,60 +119,10 @@ public class ConfigPartitionReaderTest
         
         ConfigPartitionReader cpReader = new ConfigPartitionReader( configPartition, workDir );
         
-        dirService = cpReader.createDirectoryService();
-
-        SchemaPartition schemaPartition = dirService.getSchemaService().getSchemaPartition();
-
-        // Init the schema partition's wrapped LdifPartition
-        LdifPartition wrappedPartition = new LdifPartition();
-        wrappedPartition.setWorkingDirectory( new File( workDir, schemaPartition.getId() ).getAbsolutePath() );
-        schemaPartition.setWrappedPartition( wrappedPartition );
-        schemaPartition.setSchemaManager( schemaManager );
-
-        dirService.setWorkingDirectory( workDir );
-        dirService.setSchemaManager( schemaManager );
-        dirService.startup();
-
-        server = cpReader.createLdapServer();
-        server.setDirectoryService( dirService );
-
-        // this is a hack to use a different port than the one
-        // configured in the actual configuration data
-        // in case the configured port is already in use during the test run
-        Transport[] transports = server.getTransports();
+        ConfigBean configBean = cpReader.readConfig( "ou=config" );
         
-        for( Transport t : transports )
-        {
-            int port = t.getPort();
-            port = AvailablePortFinder.getNextAvailable( port );
-            t.setPort( port );
-            t.init();
-        }
-
-        server.start();
-    }
-
-
-    @AfterClass
-    public static void cleanup() throws Exception
-    {
-        server.stop();
-        dirService.shutdown();
-    }
-
-
-    @Test
-    public void testDirService()
-    {
-        assertTrue( dirService.isStarted() );
-        assertEquals( "default", dirService.getInstanceId() );
-    }
-    
-    
-    @Test
-    public void testLdapServer()
-    {
-        assertTrue( server.isStarted() );
-        assertEquals( dirService, server.getDirectoryService() );
+        assertNotNull( configBean );
+        DirectoryServiceBean directoryServiceBean = (DirectoryServiceBean)configBean.getDirectoryServiceBeans().get( 0 );
+        assertNotNull( directoryServiceBean );
     }
 }

Propchange: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 14:30:31 2010
@@ -1,5 +1,6 @@
 /directory/apacheds/branches/apacheds-cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:898675-899143
 /directory/apacheds/branches/apacheds-codec-merge/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:982369-987590
+/directory/apacheds/branches/apacheds-config/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:980138-980938
 /directory/apacheds/branches/apacheds-replication/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:749790-764110
 /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:806623-896441



Mime
View raw message