directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1029081 [3/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
Propchange: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 14:30:31 2010
@@ -1,4 +1,5 @@
 /directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:982369-987590
+/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:980138-980938
 /directory/apacheds/branches/apacheds-replication/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:749790-764110
 /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:806623-896441

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java Sat Oct 30 14:30:31 2010
@@ -26,207 +26,279 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface ConfigSchemaConstants
+public enum ConfigSchemaConstants
 {
-    String ADS_LDAP_SERVER_OC = "ads-ldapServer";
+    //------------------------------------------------------------------------------------
+    // The ObjectClasses
+    //------------------------------------------------------------------------------------
+    ADS_BASE_OC( "ads-base", "1.3.6.1.4.1.18060.0.4.1.3.1" ),
 
-    String ADS_KERBEROS_SERVER_OC = "ads-kerberosServer";
+    ADS_TRANSPORT_OC( "ads-transport", "1.3.6.1.4.1.18060.0.4.1.3.18" ),
 
-    String ADS_SERVER_ID = "ads-serverId";
+    ADS_TCP_TRANSPORT_OC( "ads-tpTransport", "1.3.6.1.4.1.18060.0.4.1.3.19" ),
 
-    String ADS_TRANSPORTS = "ads-transports";
+    ADS_UDP_TRANSPORT_OC( "ads-udpTransport", "1.3.6.1.4.1.18060.0.4.1.3.20" ),
 
-    String ADS_KRB_ALLOWABLE_CLOCKSKEW = "ads-krbAllowableClockSkew";
+    ADS_DIRECTORY_SERVICE_OC( "ads-directoryService", "1.3.6.1.4.1.18060.0.4.1.3.100" ),
 
-    String ADS_KRB_ENCRYPTION_TYPES = "ads-krbEncryptionTypes";
+    ADS_CHANGE_LOG_OC( "ads-changeLog", "1.3.6.1.4.1.18060.0.4.1.3.120" ),
 
-    String ADS_KRB_EMPTY_ADDRESSES_ALLOWED = "ads-krbEmptyAddressesAllowed";
+    ADS_INTERCEPTOR_LOG_OC( "ads-interceptor", "1.3.6.1.4.1.18060.0.4.1.3.130" ),
 
-    String ADS_KRB_FORWARDABLE_ALLOWED = "ads-krbForwardableAllowed";
+    ADS_JOURNAL_OC( "ads-journal", "1.3.6.1.4.1.18060.0.4.1.3.140" ),
 
-    String ADS_KRB_PAENC_TIMESTAMP_REQUIRED = "ads-krbPaEncTimestampRequired";
+    ADS_PARTITION_OC( "ads-partition", "1.3.6.1.4.1.18060.0.4.1.3.150" ),
 
-    String ADS_KRB_POSTDATED_ALLOWED = "ads-krbPostdatedAllowed";
+    ADS_JDBM_PARTITION_OC( "ads-jdbmPartition", "1.3.6.1.4.1.18060.0.4.1.3.151" ),
 
-    String ADS_KRB_PROXIABLE_ALLOWED = "ads-krbProxiableAllowed";
+    ADS_INDEX_OC( "ads-index", "1.3.6.1.4.1.18060.0.4.1.3.160" ),
+    
+    ADS_JDBM_INDEX_OC( "ads-jdbmIndex", "1.3.6.1.4.1.18060.0.4.1.3.161" ),
+
+    ADS_SERVER_OC( "ads-server", "1.3.6.1.4.1.18060.0.4.1.3.250" ),
+
+    ADS_DS_BASED_SERVER_OC( "ads-dsBasedServer", "1.3.6.1.4.1.18060.0.4.1.3.260" ),
+
+    ADS_LDAP_SERVER_OC( "ads-ldapServer", "1.3.6.1.4.1.18060.0.4.1.3.300" ),
 
-    String ADS_KRB_RENEWABLE_ALLOWED = "ads-krbRenewableAllowed";
+    ADS_KERBEROS_SERVER_OC( "ads-kdcServer", "1.3.6.1.4.1.18060.0.4.1.3.400" ),
 
-    String ADS_KRB_KDC_PRINCIPAL = "ads-krbKdcPrincipal";
+    ADS_DNS_SERVER_OC( "ads-dnsServer", "1.3.6.1.4.1.18060.0.4.1.3.500" ),
 
-    String ADS_KRB_MAXIMUM_RENEWABLE_LIFETIME = "ads-krbMaximumRenewableLifetime";
+    ADS_DHCP_SERVER_OC( "ads-dhcpServer", "1.3.6.1.4.1.18060.0.4.1.3.600" ),
+
+    ADS_NTP_SERVER_OC( "ads-ntpServer", "1.3.6.1.4.1.18060.0.4.1.3.700" ),
+
+    ADS_CHANGE_PASSWORD_SERVER_OC( "ads-changePasswordServer", "1.3.6.1.4.1.18060.0.4.1.3.800" ),
+    
+    ADS_LDAP_SERVER_SASL_MECH_HANDLER_OC( "ads-ldapServerSaslMechanismHandler", "1.3.6.1.4.1.18060.0.4.1.3.801" ),
+    
+    ADS_LDAP_SERVER_EXT_OP_HANDLER_OC( "ads-ldapServerExtendedOpHandler", "1.3.6.1.4.1.18060.0.4.1.3.802" ),
 
-    String ADS_KRB_MAXIMUM_TICKET_LIFETIME = "ads-krbMaximumTicketLifetime";
+    ADS_HTTP_WEB_APP_OC( "ads-httpWebApp", "1.3.6.1.4.1.18060.0.4.1.3.803" ),
 
-    String ADS_KRB_PRIMARY_REALM = "ads-krbPrimaryRealm";
+    ADS_HTTP_SERVER_OC( "ads-httpServer", "1.3.6.1.4.1.18060.0.4.1.3.804" ),
 
-    String ADS_KRB_BODY_CHECKSUM_VERIFIED = "ads-krbBodyChecksumVerified";
+    ADS_REPL_CONSUMER_OC( "ads-replConsumer", "1.3.6.1.4.1.18060.0.4.1.3.805" ),
+    
+    ADS_REPL_PROVIDER_OC( "ads-replProvider", "1.3.6.1.4.1.18060.0.4.1.3.806" ),
+    
+    ADS_PWD_POLICY_OC( "ads-pwdPolicy", "1.3.6.1.4.1.18060.0.4.1.3.900" ),
+    
+    
+    
+    ADS_CONFIG_ID( "ads-configId", "" ),
+    
+    ADS_COMPOSITE_ELEMENT_AT( "ads-compositeElement", "1.3.6.1.4.1.18060.0.4.1.2.0" ),
 
-    String ADS_DNS_SERVER_OC = "ads-dnsServer";
+    ADS_SERVER_ID( "ads-serverId", "" ),
 
-    String ADS_DHCP_SERVER_OC = "ads-dhcpServer";
+    ADS_TRANSPORTS( "ads-transports", "" ),
 
-    String ADS_NTP_SERVER_OC = "ads-ntpServer";
+    ADS_KRB_ALLOWABLE_CLOCKSKEW( "ads-krbAllowableClockSkew", "" ),
 
-    String ADS_HTTP_SERVER_OC = "ads-httpServer";
+    ADS_KRB_ENCRYPTION_TYPES( "ads-krbEncryptionTypes", "" ),
 
-    String ADS_HTTP_CONFFILE = "ads-httpConfFile";
+    ADS_KRB_EMPTY_ADDRESSES_ALLOWED( "ads-krbEmptyAddressesAllowed", "" ),
 
-    String ADS_DIRECTORYSERVICE_ID = "ads-directoryServiceId";
+    ADS_KRB_FORWARDABLE_ALLOWED( "ads-krbForwardableAllowed", "" ),
 
-    String ADS_DS_REPLICA_ID = "ads-dsReplicaId";
+    ADS_KRB_PAENC_TIMESTAMP_REQUIRED( "ads-krbPaEncTimestampRequired", "" ),
 
-    String ADS_DSINTERCEPTORS = "ads-dsInterceptors";
+    ADS_KRB_POSTDATED_ALLOWED( "ads-krbPostdatedAllowed", "" ),
 
-    String ADS_DSPARTITIONS = "ads-dsPartitions";
+    ADS_KRB_PROXIABLE_ALLOWED( "ads-krbProxiableAllowed", "" ),
 
-    String ADS_DS_ACCESSCONTROL_ENABLED = "ads-dsAccessControlEnabled";
+    ADS_KRB_RENEWABLE_ALLOWED( "ads-krbRenewableAllowed", "" ),
 
-    String ADS_DS_ALLOW_ANONYMOUS_ACCESS = "ads-dsAllowAnonymousAccess";
+    ADS_KRB_KDC_PRINCIPAL( "ads-krbKdcPrincipal", "" ),
 
-    String ADS_DSCHANGELOG = "ads-dsChangeLog";
+    ADS_KRB_MAXIMUM_RENEWABLE_LIFETIME( "ads-krbMaximumRenewableLifetime", "" ),
 
-    String ADS_DS_DENORMALIZE_OPATTRS_ENABLED = "ads-dsDenormalizeOpAttrsEnabled";
+    ADS_KRB_MAXIMUM_TICKET_LIFETIME( "ads-krbMaximumTicketLifetime", "" ),
 
-    String ADS_DSJOURNAL = "ads-dsJournal";
+    ADS_KRB_PRIMARY_REALM( "ads-krbPrimaryRealm", "" ),
 
-    String ADS_DS_MAXPDU_SIZE = "ads-dsMaxPDUSize";
+    ADS_KRB_BODY_CHECKSUM_VERIFIED( "ads-krbBodyChecksumVerified", "" ),
 
-    String ADS_DS_PASSWORD_HIDDEN = "ads-dsPasswordHidden";
+    ADS_HTTP_CONFFILE( "ads-httpConfFile", "" ),
 
-    String ADS_DS_REPLICATION = "ads-dsReplication";
+    ADS_DIRECTORYSERVICE_ID( "ads-directoryServiceId", "" ),
 
-    String ADS_DS_SYNCPERIOD_MILLIS = "ads-dsSyncPeriodMillis";
+    ADS_DS_REPLICA_ID( "ads-dsReplicaId", "" ),
 
-    String ADS_DS_TEST_ENTRIES = "ads-dsTestEntries";
+    ADS_DSINTERCEPTORS( "ads-dsInterceptors", "" ),
 
-    String ADS_INTERCEPTOR_ID = "ads-interceptorId";
+    ADS_DSPARTITIONS( "ads-dsPartitions", "" ),
 
-    String ADS_INTERCEPTOR_CLASSNAME = "ads-interceptorClassName";
+    ADS_DS_ACCESSCONTROL_ENABLED( "ads-dsAccessControlEnabled", "" ),
 
-    String ADS_INTERCEPTOR_ORDER = "ads-interceptorOrder";
+    ADS_DS_ALLOW_ANONYMOUS_ACCESS( "ads-dsAllowAnonymousAccess", "" ),
 
-    String ADS_JDBMPARTITION = "ads-jdbmPartition";
+    ADS_DSCHANGELOG( "ads-dsChangeLog", "" ),
 
-    String ADS_PARTITION_ID = "ads-partitionId";
+    ADS_DS_DENORMALIZE_OPATTRS_ENABLED( "ads-dsDenormalizeOpAttrsEnabled", "" ),
 
-    String ADS_PARTITION_SUFFIX = "ads-partitionSuffix";
+    ADS_DSJOURNAL( "ads-dsJournal", "" ),
 
-    String ADS_PARTITION_CACHE_SIZE = "ads-partitionCacheSize";
+    ADS_DS_MAXPDU_SIZE( "ads-dsMaxPDUSize", "" ),
 
-    String ADS_JDBM_PARTITION_OPTIMIZER_ENABLED = "ads-jdbmPartitionOptimizerEnabled";
+    ADS_DS_PASSWORD_HIDDEN( "ads-dsPasswordHidden", "" ),
 
-    String ADS_PARTITION_SYNCONWRITE = "ads-partitionSyncOnWrite";
+    //ADS_DS_REPLICATION( "ads-dsReplication", "" ),
 
-    String ADS_PARTITION_INDEXED_ATTRIBUTES = "ads-partitionIndexedAttributes";
+    ADS_DS_SYNCPERIOD_MILLIS( "ads-dsSyncPeriodMillis", "" ),
 
-    String ADS_INDEX_ATTRIBUTE_ID = "ads-indexAttributeId";
+    ADS_DS_TEST_ENTRIES( "ads-dsTestEntries", "" ),
 
-    String ADS_JDBMINDEX = "ads-jdbmIndex";
+    ADS_INTERCEPTOR_ID( "ads-interceptorId", "" ),
 
-    String ADS_INDEX_CACHESIZE = "ads-indexCacheSize";
+    ADS_INTERCEPTOR_CLASSNAME( "ads-interceptorClassName", "" ),
+
+    ADS_INTERCEPTOR_ORDER( "ads-interceptorOrder", "" ),
+
+    ADS_JDBMPARTITION( "ads-jdbmPartition", "" ),
+
+    ADS_PARTITION_ID( "ads-partitionId", "" ),
+
+    ADS_PARTITION_SUFFIX( "ads-partitionSuffix", "" ),
+
+    ADS_PARTITION_CACHE_SIZE( "ads-partitionCacheSize", "" ),
+
+    ADS_JDBM_PARTITION_OPTIMIZER_ENABLED( "ads-jdbmPartitionOptimizerEnabled", "" ),
+
+    ADS_PARTITION_SYNCONWRITE( "ads-partitionSyncOnWrite", "" ),
+
+    ADS_PARTITION_INDEXED_ATTRIBUTES( "ads-partitionIndexedAttributes", "" ),
+
+    ADS_INDEX_ATTRIBUTE_ID( "ads-indexAttributeId", "" ),
+
+    ADS_JDBMINDEX( "ads-jdbmIndex", "" ),
+
+    ADS_INDEX_CACHESIZE( "ads-indexCacheSize", "" ),
     
-    String ADS_INDEX_NUM_DUP_LIMIT = "ads-indexNumDupLimit";
+    ADS_INDEX_NUM_DUP_LIMIT( "ads-indexNumDupLimit", "" ),
 
-    String ADS_TRANSPORT_ID = "ads-transportId";
+    ADS_TRANSPORT_ID( "ads-transportId", "" ),
 
-    String ADS_TCP_TRANSPORT = "ads-tcpTransport";
+    ADS_TCP_TRANSPORT( "ads-tcpTransport", "" ),
 
-    String ADS_UDP_TRANSPORT = "ads-udpTransport";
+    ADS_UDP_TRANSPORT( "ads-udpTransport", "" ),
 
-    String ADS_SYSTEM_PORT = "ads-systemPort";
+    ADS_SYSTEM_PORT( "ads-systemPort", "" ),
 
-    String ADS_TRANSPORT_ADDRESS = "ads-transportAddress";
+    ADS_TRANSPORT_ADDRESS( "ads-transportAddress", "" ),
 
-    String ADS_TRANSPORT_BACKLOG = "ads-transportBacklog";
+    ADS_TRANSPORT_BACKLOG( "ads-transportBacklog", "" ),
 
-    String ADS_TRANSPORT_ENABLE_SSL = "ads-transportEnableSSL";
+    ADS_TRANSPORT_ENABLE_SSL( "ads-transportEnableSSL", "" ),
 
-    String ADS_TRANSPORT_NBTHREADS = "ads-transportNbThreads";
+    ADS_TRANSPORT_NBTHREADS( "ads-transportNbThreads", "" ),
 
-    String ADS_CHANGELOG_ENABLED = "ads-changeLogEnabled";
+    ADS_CHANGELOG_ENABLED( "ads-changeLogEnabled", "" ),
 
-    String ADS_CHANGELOG_EXPOSED = "ads-changeLogExposed";
+    ADS_CHANGELOG_EXPOSED( "ads-changeLogExposed", "" ),
 
-    String ADS_JOURNAL_FILENAME = "ads-journalFileName";
+    ADS_JOURNAL_FILENAME( "ads-journalFileName", "" ),
 
-    String ADS_JOURNAL_WORKINGDIR = "ads-journalWorkingDir";
+    ADS_JOURNAL_WORKINGDIR( "ads-journalWorkingDir", "" ),
 
-    String ADS_JOURNAL_ROTATION = "ads-journalRotation";
+    ADS_JOURNAL_ROTATION( "ads-journalRotation", "" ),
 
-    String ADS_JOURNAL_ENABLED = "ads-journalEnabled";
+    ADS_JOURNAL_ENABLED( "ads-journalEnabled", "" ),
 
-    String ADS_HTTP_WARFILE = "ads-httpWarFile";
+    ADS_HTTP_WARFILE( "ads-httpWarFile", "" ),
 
-    String ADS_HTTP_APP_CTX_PATH = "ads-httpAppCtxPath";
+    ADS_HTTP_APP_CTX_PATH( "ads-httpAppCtxPath", "" ),
 
-    String ADS_ENABLED = "ads-enabled";
+    ADS_ENABLED( "ads-enabled", "" ),
+    
+    ADS_CHANGEPWD_POLICY_CATEGORY_COUNT( "ads-chgPwdPolicyCategoryCount", "" ),
+    
+    ADS_CHANGEPWD_POLICY_PASSWORD_LENGTH( "ads-chgPwdPolicyPasswordLength", "" ),
     
-    String ADS_CHANGEPWD_POLICY_CATEGORY_COUNT = "ads-chgPwdPolicyCategoryCount";
+    ADS_CHANGEPWD_POLICY_TOKEN_SIZE( "ads-chgPwdPolicyTokenSize", "" ),
     
-    String ADS_CHANGEPWD_POLICY_PASSWORD_LENGTH = "ads-chgPwdPolicyPasswordLength";
+    ADS_CHANGEPWD_SERVICE_PRINCIPAL( "ads-chgPwdServicePrincipal", "" ),
     
-    String ADS_CHANGEPWD_POLICY_TOKEN_SIZE = "ads-chgPwdPolicyTokenSize";
+    ADS_REPL_SEARCH_FILTER( "ads-replSearchFilter", "" ),
     
-    String ADS_CHANGEPWD_SERVICE_PRINCIPAL = "ads-chgPwdServicePrincipal";
+    ADS_REPL_LAST_SENT_CSN( "ads-replLastSentCsn", "" ),
     
-    String ADS_CHANGEPWD_SERVER_OC = "ads-changePasswordServer";
+    ADS_REPL_ALIAS_DEREF_MODE( "ads-replAliasDerefMode", "" ),
     
-    String ADS_REPL_SEARCH_FILTER = "ads-replSearchFilter";
+    ADS_SEARCH_BASE( "ads-searchBaseDN", "" ),
     
-    String ADS_REPL_LAST_SENT_CSN = "ads-replLastSentCsn";
+    ADS_REPL_SEARCH_SCOPE( "ads-replSearchScope", "" ),
     
-    String ADS_REPL_ALIAS_DEREF_MODE = "ads-replAliasDerefMode";
+    ADS_REPL_REFRESH_N_PERSIST( "ads-replRefreshNPersist", "" ),
     
-    String ADS_SEARCH_BASE = "ads-searchBaseDN";
+    ADS_REPL_PROV_HOST_NAME( "ads-replProvHostName", "" ),
     
-    String ADS_REPL_SEARCH_SCOPE = "ads-replSearchScope";
+    ADS_REPL_PROV_PORT( "ads-replProvPort", "" ),
     
-    String ADS_REPL_REFRESH_N_PERSIST = "ads-replRefreshNPersist";
+    ADS_REPL_USER_DN( "ads-replUserDn", "" ),
     
-    String ADS_REPL_PROV_HOST_NAME = "ads-replProvHostName";
+    ADS_REPL_USER_PASSWORD( "ads-replUserPassword", "" ),
     
-    String ADS_REPL_PROV_PORT = "ads-replProvPort";
+    ADS_REPL_REFRESH_INTERVAL( "ads-replRefreshInterval", "" ),
     
-    String ADS_REPL_USER_DN = "ads-replUserDn";
+    ADS_REPL_ATTRIBUTE( "ads-replAttribute", "" ),
     
-    String ADS_REPL_USER_PASSWORD = "ads-replUserPassword";
+    ADS_REPL_SEARCH_SIZE_LIMIT( "ads-replSearchSizeLimit", "" ),
     
-    String ADS_REPL_REFRESH_INTERVAL = "ads-replRefreshInterval";
+    ADS_REPL_SEARCH_TIMEOUT( "ads-replSearchTimeOut", "" ),
     
-    String ADS_REPL_ATTRIBUTE = "ads-replAttribute";
+    ADS_REPL_COOKIE( "ads-replCookie", "" ),
     
-    String ADS_REPL_SEARCH_SIZE_LIMIT = "ads-replSearchSizeLimit";
+    ADS_REPL_PROVIDER_IMPL( "ads-replProviderImpl", "" ),
     
-    String ADS_REPL_SEARCH_TIMEOUT = "ads-replSearchTimeOut";
+    ADS_REPL_ENABLE_PROVIDER( "ads-enableReplProvider", "" ),
     
-    String ADS_REPL_COOKIE = "ads-replCookie";
+    ADS_REPL_PEER_CERTIFICATE( "ads-replPeerCertificate", "" ),
     
-    String ADS_REPL_CONSUMER_OC = "ads-replConsumer";
+    ADS_REPL_USE_TLS( "ads-replUseTls", "" ),
     
-    String ADS_REPL_PROVIDER_OC = "ads-replProvider";
+    ADS_LDAP_SERVER_SASL_MECH_NAME( "ads-ldapServerSaslMechName", "" ),
     
-    String ADS_REPL_PROVIDER_IMPL = "ads-replProviderImpl";
+    ADS_LDAP_SERVER_SASL_MECH_CLASS_NAME( "ads-ldapServerSaslMechClassName", "" ),
     
-    String ADS_REPL_ENABLE_PROVIDER = "ads-enableReplProvider";
+    ADS_LDAP_SERVER_NTLM_MECH_PROVIDER( "ads-ldapServerNtlmMechProvider", "" ),
     
-    String ADS_REPL_PEER_CERTIFICATE = "ads-replPeerCertificate";
+    ADS_LDAP_SERVER_EXT_OP_HANDLER_FQCN( "ads-ldapServerExtendedOpHandlerClass", "" ),
     
-    String ADS_REPL_USE_TLS = "ads-replUseTls";
+    ADS_LDAP_SERVER_KEYSTORE_FILE( "ads-ldapserverkeystorefile", "" ),
     
-    String ADS_LDAP_SERVER_SASL_MECH_HANDLER_OC = "ads-ldapServerSaslMechanismHandler";
+    ADS_LDAP_SERVER_CERT_PASSWORD( "ads-ldapServerCertificatePassword", "" );
     
-    String ADS_LDAP_SERVER_SASL_MECH_NAME = "ads-ldapServerSaslMechName";
+    /** The interned value */
+    private String value;
     
-    String ADS_LDAP_SERVER_SASL_MECH_CLASS_NAME = "ads-ldapServerSaslMechClassName";
+    /** The associated OID */
+    private String oid;
     
-    String ADS_LDAP_SERVER_NTLM_MECH_PROVIDER = "ads-ldapServerNtlmMechProvider";
+    /** A private constructor */
+    private ConfigSchemaConstants( String value, String oid )
+    {
+        this.value = value;
+        this.oid = oid;
+    }
     
-    String ADS_LDAP_SERVER_EXT_OP_HANDLER_OC = "ads-ldapServerExtendedOpHandler";
     
-    String ADS_LDAP_SERVER_EXT_OP_HANDLER_FQCN = "ads-ldapServerExtendedOpHandlerClass";
+    /**
+     * @return The interned String
+     */
+    public String getValue()
+    {
+        return value;
+    }
     
-    String ADS_LDAP_SERVER_KEYSTORE_FILE = "ads-ldapserverkeystorefile";
     
-    String ADS_LDAP_SERVER_CERT_PASSWORD = "ads-ldapServerCertificatePassword";
+    /**
+     * @return The associated OID
+     */
+    public String getOid()
+    {
+        return oid;
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java Sat Oct 30 14:30:31 2010
@@ -30,11 +30,9 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Stack;
 import java.util.Map.Entry;
+import java.util.Stack;
 import java.util.regex.Pattern;
 
 import org.apache.directory.server.i18n.I18n;
@@ -264,9 +262,14 @@ public class LdifConfigExtractor
      * @param overwrite flag to indicate to overwrite the config file if already present in the given config directory
      * @return complete path of the config file on disk
      */
-    public static String extractSingleFileConfig( File configDir, boolean overwrite )
+    public static String extractSingleFileConfig( File configDir, String file, boolean overwrite )
     {
-        File configFile = new File( configDir, LDIF_CONFIG_FILE );
+        if ( file == null )
+        {
+            file = LDIF_CONFIG_FILE;
+        }
+        
+        File configFile = new File( configDir, file );
 
         if ( !configDir.exists() )
         {
@@ -285,7 +288,7 @@ public class LdifConfigExtractor
         try
         {
             
-            URL configUrl = LdifConfigExtractor.class.getClassLoader().getResource( LDIF_CONFIG_FILE );
+            URL configUrl = LdifConfigExtractor.class.getClassLoader().getResource( file );
 
             LOG.debug( "URL of the config ldif file {}", configUrl );
 

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java Sat Oct 30 14:30:31 2010
@@ -19,13 +19,17 @@
  */
 package org.apache.directory.server.config.beans;
 
+
 /**
  * A class used to store the ChangeLog configuration.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ChangeLogBean extends BaseAdsBean
+public class ChangeLogBean extends AdsBaseBean
 {
+    /** The ChangeLog unique ID */
+    private String changeLogId;
+
     /** Tells if the ChangeLog is exposed to the users */
     private boolean changeLogExposed;
 
@@ -40,6 +44,24 @@ public class ChangeLogBean extends BaseA
         // Not enabled by default
         setEnabled( false );
     }
+
+
+    /**
+     * @return the changeLogId
+     */
+    public String getChangeLogId()
+    {
+        return changeLogId;
+    }
+
+
+    /**
+     * @param changeLogId the changeLogId to set
+     */
+    public void setChangeLogId( String changeLogId )
+    {
+        this.changeLogId = changeLogId;
+    }
     
     
     /**
@@ -58,4 +80,28 @@ public class ChangeLogBean extends BaseA
     {
         this.changeLogExposed = changeLogExposed;
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "ChangeLog :\n" );
+        sb.append( tabs ).append( "  changeLog id : " ).append( changeLogId ).append( '\n' );
+        sb.append( toString( tabs, "  changeLog exposed", changeLogExposed ) );
+        
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java Sat Oct 30 14:30:31 2010
@@ -19,8 +19,8 @@
  */
 package org.apache.directory.server.config.beans;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -28,7 +28,7 @@ import java.util.Set;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ChangePasswordServerBean extends CatalogBasedServerBean
+public class ChangePasswordServerBean extends DSBasedServerBean
 {
     /** The allowable clock skew. */
     private long krbAllowableClockSkew;
@@ -37,7 +37,7 @@ public class ChangePasswordServerBean ex
     private boolean krbEmptyAddressesAllowed;
     
     /** The encryption types. */
-    private Set<String> krbEncryptionTypes = new HashSet<String>();
+    private List<String> krbEncryptionTypes = new ArrayList<String>();
     
     /** The primary realm. */
     private String krbPrimaryRealm;
@@ -101,7 +101,7 @@ public class ChangePasswordServerBean ex
     /**
      * @return the krbEncryptionTypes
      */
-    public Set<String> getKrbEncryptionTypes()
+    public List<String> getKrbEncryptionTypes()
     {
         return krbEncryptionTypes;
     }
@@ -110,13 +110,27 @@ public class ChangePasswordServerBean ex
     /**
      * @param krbEncryptionTypes the krbEncryptionTypes to set
      */
-    public void setKrbEncryptionTypes( Set<String> krbEncryptionTypes )
+    public void setKrbEncryptionTypes( List<String> krbEncryptionTypes )
     {
         this.krbEncryptionTypes = krbEncryptionTypes;
     }
 
     
     /**
+     * Initialize the encryptionTypes set
+     * 
+     * @param krbEncryptionTypes the encryptionTypes to set
+     */
+    public void addKrbEncryptionTypes( String... krbEncryptionTypes )
+    {
+        for ( String encryptionType:krbEncryptionTypes )
+        {
+            this.krbEncryptionTypes.add( encryptionType );
+        }
+    }
+
+
+    /**
      * @return the krbPrimaryRealm
      */
     public String getKrbPrimaryRealm()
@@ -204,4 +218,45 @@ public class ChangePasswordServerBean ex
     {
         this.chgPwdServicePrincipal = chgPwdServicePrincipal;
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "ChangePasswordServer :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+        sb.append( toString( tabs, "  change password service principal", chgPwdServicePrincipal ) );
+        sb.append( toString( tabs, "  KRB primary realm", krbPrimaryRealm ) );
+        
+        if ( ( krbEncryptionTypes != null ) && ( krbEncryptionTypes.size() != 0 ) )
+        {
+            sb.append( tabs ).append( "  encryption types : \n" );
+
+            for ( String encryptionType : krbEncryptionTypes )
+            {
+                sb.append( tabs ).append( "    encryptionType : " ).append( encryptionType ).append( '\n' );
+            }
+        }
+        
+        sb.append( toString( tabs, "  change password policy category count", chgPwdPolicyCategoryCount ) );
+        sb.append( toString( tabs, "  change password policy password length", chgPwdPolicyPasswordLength ) );
+        sb.append( toString( tabs, "  change password policy token size", chgPwdPolicyTokenSize ) );
+        sb.append( toString( tabs, "  KRB allowable clock skew", krbAllowableClockSkew ) );
+        sb.append( toString( tabs, "  KRB empty addresses allowed", krbEmptyAddressesAllowed ) );
+
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.java Sat Oct 30 14:30:31 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DhcpServerBean extends CatalogBasedServerBean
+public class DhcpServerBean extends DSBasedServerBean
 {
     /**
      * Create a new DhcpServerBean instance
@@ -37,4 +37,27 @@ public class DhcpServerBean extends Cata
         // Enabled by default
         setEnabled( true );
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "DhcpServer :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java Sat Oct 30 14:30:31 2010
@@ -20,17 +20,16 @@
 package org.apache.directory.server.config.beans;
 
 
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.directory.server.core.PasswordPolicyConfiguration;
-
-
 /**
  * A class used to store the DirectoryService configuration.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DirectoryServiceBean extends BaseAdsBean
+public class DirectoryServiceBean extends AdsBaseBean
 {
     /** The DS instance Id */
     private String directoryServiceId;
@@ -60,29 +59,22 @@ public class DirectoryServiceBean extend
     private String dsTestEntries;
 
     /** The ChangeLog component */
-    private ChangeLogBean dsChangeLog;
+    private ChangeLogBean changeLog;
 
     /** The journal component */
-    private JournalBean dsJournal;
+    private JournalBean journal;
 
-    /** The replication component */
-    //private ReplicationBean dsReplication;
+    /** The servers */
+    private List<ServerBean> servers = new ArrayList<ServerBean>();
 
     /** The list of declared interceptors */
-    private Set<InterceptorBean> interceptors;
+    private List<InterceptorBean> interceptors = new ArrayList<InterceptorBean>();
 
     /** The set of associated partitions */
-    private Set<PartitionBean> partitions;
-
-    /** The reference to the replication provider component */
-    //private ReplicationProviderBean replicationProvider;
-
-    /** The reference to the replication consumer component */
-    //private ReplicationConsumerBean replicationConsumer;
+    private List<PartitionBean> partitions = new ArrayList<PartitionBean>();
 
     /** The reference to the Password Policy component */
-    private PasswordPolicyConfiguration passwordPolicy;
-
+    private PasswordPolicyBean passwordPolicy;
 
     /**
      * Create a new DnsServerBean instance
@@ -141,7 +133,7 @@ public class DirectoryServiceBean extend
      *
      * @return the interceptors in the server.
      */
-    public Set<InterceptorBean> getInterceptors()
+    public List<InterceptorBean> getInterceptors()
     {
         return interceptors;
     }
@@ -152,13 +144,27 @@ public class DirectoryServiceBean extend
      *
      * @param interceptors the interceptors to be used in the server.
      */
-    public void setInterceptors( Set<InterceptorBean> interceptors )
+    public void setInterceptors( List<InterceptorBean> interceptors )
     {
         this.interceptors = interceptors;
     }
 
 
     /**
+     * Adds the interceptors in the server.
+     *
+     * @param interceptors the interceptors to be added in the server.
+     */
+    public void addInterceptors( InterceptorBean... interceptors )
+    {
+        for ( InterceptorBean interceptor : interceptors )
+        {
+            this.interceptors.add( interceptor );
+        }
+    }
+
+
+    /**
      * @return the dsAccessControlEnabled
      */
     public boolean isDsAccessControlEnabled()
@@ -285,117 +291,224 @@ public class DirectoryServiceBean extend
 
 
     /**
-     * @return the dsChangeLog
+     * @return the ChangeLog
      */
-    public ChangeLogBean getDsChangeLog()
+    public ChangeLogBean getChangeLog()
     {
-        return dsChangeLog;
+        return changeLog;
     }
 
 
     /**
-     * @param dsChangeLog the dsChangeLog to set
+     * @param cChangeLog the ChangeLog to set
      */
-    public void setDsChangeLog( ChangeLogBean dsChangeLog )
+    public void setChangeLog( ChangeLogBean changeLog )
     {
-        this.dsChangeLog = dsChangeLog;
+        this.changeLog = changeLog;
     }
 
 
     /**
-     * @return the dsJournal
+     * @return the journal
      */
-    public JournalBean getDsJournal()
+    public JournalBean getJournal()
     {
-        return dsJournal;
+        return journal;
     }
 
 
     /**
-     * @param dsJournal the dsJournal to set
+     * @param journal the journal to set
      */
-    public void setDsJournal( JournalBean dsJournal )
+    public void setJournal( JournalBean journal )
     {
-        this.dsJournal = dsJournal;
+        this.journal = journal;
     }
 
 
     /**
-     * @return the dsReplication
-     *
-    public ReplicationBean getDsReplication()
+     * @return the partitions
+     */
+    public List<PartitionBean> getPartitions()
     {
-        return dsReplication;
+        return partitions;
     }
 
 
     /**
-     * @param dsReplication the dsReplication to set
-     *
-    public void setDsReplication( ReplicationBean dsReplication )
+     * @param partitions the partitions to set
+     */
+    public void setPartitions( List<PartitionBean> partitions )
     {
-        this.dsReplication = dsReplication;
+        this.partitions = partitions;
     }
 
 
     /**
-     * @return the partitions
+     * @param partitions the partitions to add
      */
-    public Set<PartitionBean> getPartitions()
+    public void addPartitions( PartitionBean... partitions )
     {
-        return partitions;
+        for ( PartitionBean partition : partitions )
+        {
+            this.partitions.add( partition );
+        }
     }
 
 
     /**
-     * @param partitions the partitions to set
+     * @return the servers
      */
-    public void setPartitions( Set<PartitionBean> partitions )
+    public List<ServerBean> getServers()
     {
-        this.partitions = partitions;
+        return servers;
     }
 
-
+    
     /**
-     * @return the replicationProvider
-     *
-    public ReplicationProviderBean getReplicationProvider()
+     * @return The LdapServerBean configuration
+     */
+    public LdapServerBean getLdapServerBean()
     {
-        return replicationProvider;
+        for ( ServerBean server : servers )
+        {
+            if ( server instanceof LdapServerBean )
+            {
+                return (LdapServerBean)server;
+            }
+        }
+        
+        return null;
     }
-
-
+    
+    
     /**
-     * @param replicationProvider the replicationProvider to set
-     *
-    public void setReplicationProvider( ReplicationProviderBean replicationProvider )
+     * @return The NtpServerBean configuration
+     */
+    public NtpServerBean getNtpServerBean()
     {
-        this.replicationProvider = replicationProvider;
+        for ( ServerBean server : servers )
+        {
+            if ( server instanceof NtpServerBean )
+            {
+                return (NtpServerBean)server;
+            }
+        }
+        
+        return null;
     }
-
+    
+    
+    /**
+     * @return The DnsServerBean configuration
+     */
+    public DnsServerBean getDnsServerBean()
+    {
+        for ( ServerBean server : servers )
+        {
+            if ( server instanceof DnsServerBean )
+            {
+                return (DnsServerBean)server;
+            }
+        }
+        
+        return null;
+    }
+    
+    
+    /**
+     * @return The DhcpServerBean configuration
+     */
+    public DhcpServerBean getDhcpServerBean()
+    {
+        for ( ServerBean server : servers )
+        {
+            if ( server instanceof DhcpServerBean )
+            {
+                return (DhcpServerBean)server;
+            }
+        }
+        
+        return null;
+    }
+    
+    
+    /**
+     * @return The HttpServerBean configuration
+     */
+    public HttpServerBean getHttpServerBean()
+    {
+        for ( ServerBean server : servers )
+        {
+            if ( server instanceof HttpServerBean )
+            {
+                return (HttpServerBean)server;
+            }
+        }
+        
+        return null;
+    }
+    
+    
+    /**
+     * @return The KdcServerBean configuration
+     */
+    public KdcServerBean getKdcServerBean()
+    {
+        for ( ServerBean server : servers )
+        {
+            if ( server instanceof KdcServerBean )
+            {
+                return (KdcServerBean)server;
+            }
+        }
+        
+        return null;
+    }
+    
+    
+    /**
+     * @return The ChangePasswordServerBean configuration
+     */
+    public ChangePasswordServerBean getChangePasswordServerBean()
+    {
+        for ( ServerBean server : servers )
+        {
+            if ( server instanceof ChangePasswordServerBean )
+            {
+                return (ChangePasswordServerBean)server;
+            }
+        }
+        
+        return null;
+    }
+    
 
     /**
-     * @return the replicationConsumer
-     *
-    public ReplicationConsumerBean getReplicationConsumer()
+     * @param servers the servers to set
+     */
+    public void setServers( List<ServerBean> servers )
     {
-        return replicationConsumer;
+        this.servers = servers;
     }
 
 
     /**
-     * @param replicationConsumer the replicationConsumer to set
-     *
-    public void setReplicationConsumer( ReplicationConsumerBean replicationConsumer )
+     * @param servers the servers to add
+     */
+    public void addServers( ServerBean... servers )
     {
-        this.replicationConsumer = replicationConsumer;
+        for ( ServerBean server : servers )
+        {
+            this.servers.add( server );
+        }
     }
 
-
+    
     /**
      * @return the passwordPolicy
      */
-    public PasswordPolicyConfiguration getPasswordPolicy()
+    public PasswordPolicyBean getPasswordPolicy()
     {
         return passwordPolicy;
     }
@@ -404,8 +517,80 @@ public class DirectoryServiceBean extend
     /**
      * @param passwordPolicy the passwordPolicy to set
      */
-    public void setPasswordPolicy( PasswordPolicyConfiguration passwordPolicy )
+    public void setPasswordPolicy( PasswordPolicyBean passwordPolicy )
     {
         this.passwordPolicy = passwordPolicy;
     }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( "DirectoryServiceBean : \n" );
+        sb.append( super.toString( "  " ) );
+        
+        // Dump the must attributes
+        sb.append( "  directoryService ID : " ).append( directoryServiceId ).append( '\n' );
+        sb.append( "  replica ID : " ).append( dsReplicaId ).append( '\n' );
+        sb.append( toString( "  ", "accessControl enabled", dsAccessControlEnabled ) );
+        sb.append( toString( "  ", "allow anonymous access", dsAllowAnonymousAccess ) );
+        sb.append( toString( "  ", "denormalized attributes enabled", dsDenormalizeOpAttrsEnabled ) );
+        sb.append( toString( "  ", "password hidden", dsPasswordHidden ) );
+        sb.append( "  max PDU size : " ).append( dsMaxPDUSize ).append( '\n' );
+        sb.append( "  sync period millisecond : " ).append( dsSyncPeriodMillis ).append( '\n' );
+        sb.append( toString( "  ", "test entries", dsTestEntries ) );
+        
+        sb.append( "  interceptors : \n" );
+        
+        if ( ( interceptors != null ) && ( interceptors.size() > 0 ) )
+        {
+            for ( InterceptorBean interceptor : interceptors )
+            {
+                sb.append( interceptor.toString( "    " ) );
+            }
+        }
+        
+        sb.append( "  partitions : \n" );
+        
+        if ( ( partitions != null ) && ( partitions.size() > 0 ) )
+        {
+            for ( PartitionBean partition : partitions )
+            {
+                sb.append( partition.toString( "    " ) );
+            }
+        }
+
+        if ( journal != null )
+        {
+            sb.append( journal.toString( "  " ) );
+        }
+        
+        if ( changeLog != null )
+        {
+            sb.append( changeLog.toString( "  " ) );
+        }
+        
+        if ( passwordPolicy != null )
+        {
+            sb.append( passwordPolicy.toString( "  " ) );
+        }
+        
+        sb.append( "  servers : \n" );
+        
+        if ( ( servers != null ) && ( servers.size() > 0 ) )
+        {
+            for ( ServerBean server : servers )
+            {
+                sb.append( server.toString( "    " ) );
+            }
+        }
+
+        sb.append( '\n' );
+
+        return sb.toString();
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DnsServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DnsServerBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DnsServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DnsServerBean.java Sat Oct 30 14:30:31 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DnsServerBean extends CatalogBasedServerBean
+public class DnsServerBean extends DSBasedServerBean
 {
     /**
      * Create a new DnsServerBean instance
@@ -37,4 +37,27 @@ public class DnsServerBean extends Catal
         // Enabled by default
         setEnabled( true );
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "DnsServer :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java Sat Oct 30 14:30:31 2010
@@ -19,22 +19,24 @@
  */
 package org.apache.directory.server.config.beans;
 
+import java.util.ArrayList;
+import java.util.List;
+
+
+
 
 /**
  * A class used to store the HttpServer configuration.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class HttpServerBean extends AdsServerBean
+public class HttpServerBean extends ServerBean
 {
-    /** The server identifier */
-    private String serverId;
-    
-    /** The port */
-    private int systemPort;
-    
     /** The configuration file */
     private String httpConfFile;
+    
+    /** The list of supported web apps */
+    private List<HttpWebAppBean> httpWebApps = new ArrayList<HttpWebAppBean>();
 
     /**
      * Create a new HttpServerBean instance
@@ -49,55 +51,83 @@ public class HttpServerBean extends AdsS
 
     
     /**
-     * @return the serverId
+     * @return the httpConfFile
      */
-    public String getServerId()
+    public String getHttpConfFile()
     {
-        return serverId;
+        return httpConfFile;
     }
 
     
     /**
-     * @param serverId the serverId to set
+     * @param httpConfFile the httpConfFile to set
      */
-    public void setServerId( String serverId )
+    public void setHttpConfFile( String httpConfFile )
     {
-        this.serverId = serverId;
+        this.httpConfFile = httpConfFile;
     }
 
     
     /**
-     * @return the systemPort
+     * @return the httpWebApps
      */
-    public int getSystemPort()
+    public List<HttpWebAppBean> getHttpWebApps()
     {
-        return systemPort;
+        return httpWebApps;
     }
 
     
     /**
-     * @param systemPort the systemPort to set
+     * @param httpWebApps the httpWebApps to set
      */
-    public void setSystemPort( int systemPort )
+    public void setHttpWebApps( List<HttpWebAppBean> httpWebApps )
     {
-        this.systemPort = systemPort;
+        this.httpWebApps = httpWebApps;
     }
 
     
     /**
-     * @return the httpConfFile
+     * @param httpWebApps the httpWebApps to add
      */
-    public String getHttpConfFile()
+    public void addHttpWebApps( HttpWebAppBean... httpWebApps )
     {
-        return httpConfFile;
+        for ( HttpWebAppBean httpWebApp : httpWebApps )
+        {   
+            this.httpWebApps.add( httpWebApp );
+        }
     }
 
     
     /**
-     * @param httpConfFile the httpConfFile to set
+     * {@inheritDoc}
      */
-    public void setHttpConfFile( String httpConfFile )
+    public String toString( String tabs )
     {
-        this.httpConfFile = httpConfFile;
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "HttpServer :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+        sb.append(  toString( tabs, "  http configuration file", httpConfFile ) );
+        
+        if ( ( httpWebApps != null ) && ( httpWebApps.size() > 0 ) )
+        {
+            sb.append( tabs ).append( "  web applications :\n" );
+            
+            for ( HttpWebAppBean httpWebApp : httpWebApps )
+            {
+                sb.append( httpWebApp.toString( tabs + "    " ) );
+            }
+        }
+
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
     }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java Sat Oct 30 14:30:31 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class HttpWebAppBean extends BaseAdsBean
+public class HttpWebAppBean extends AdsBaseBean
 {
     /** The server identifier */
     private String id;
@@ -100,4 +100,30 @@ public class HttpWebAppBean extends Base
     {
         this.httpWarFile = httpWarFile;
     }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "HttpWebApp :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+        sb.append( tabs ).append( "  id : " ).append( id ).append( '\n' );
+        sb.append( tabs ).append( "  war file : " ).append( httpWarFile ).append( '\n' );
+        sb.append(  toString( tabs, "  application context path", httpAppCtxPath ) );
+
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java Sat Oct 30 14:30:31 2010
@@ -20,12 +20,13 @@
 package org.apache.directory.server.config.beans;
 
 
+
 /**
  * A class used to store the Interceptors configuration.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class InterceptorBean implements Comparable<InterceptorBean>
+public class InterceptorBean extends AdsBaseBean implements Comparable<InterceptorBean>
 {
     /** The Interceptor ID */
     private String interceptorId;
@@ -118,4 +119,28 @@ public class InterceptorBean implements 
     {
         this.interceptorClassName = interceptorClassName;
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "interceptor[" ).append( interceptorOrder ).append( "] : " ).append( '\n' );
+        sb.append( tabs ).append( "  interceptor id : " ).append( interceptorId ).append( '\n' );
+        sb.append( tabs ).append( "  class name : " ).append(  interceptorClassName ).append( '\n' );
+        
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java Sat Oct 30 14:30:31 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class JdbmIndexBean<K, E> extends AdsIndexBean
+public class JdbmIndexBean<K, E> extends IndexBean
 {
     /** The default cache size */
     private static final int DEFAULT_INDEX_CACHE_SIZE = 100;
@@ -133,4 +133,31 @@ public class JdbmIndexBean<K, E> extends
     {
         this.indexWorkingDir = indexWorkingDir;
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "JdbmIndexBean :\n" );
+        sb.append( super.toString( tabs ) );
+        sb.append( toString( tabs, "  index file name", indexFileName ) );
+        sb.append( toString( tabs, "  index working directory", indexWorkingDir ) );
+        sb.append( toString( tabs, "  index cache size", indexCacheSize ) );
+        sb.append( toString( tabs, "  index num dup limit", indexNumDupLimit ) );
+        
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java Sat Oct 30 14:30:31 2010
@@ -19,9 +19,6 @@
  */
 package org.apache.directory.server.config.beans;
 
-import java.util.Set;
-
-import org.apache.directory.shared.ldap.entry.Entry;
 
 
 /**
@@ -32,14 +29,11 @@ import org.apache.directory.shared.ldap.
 public class JdbmPartitionBean extends PartitionBean
 {
     /** The Entry cache size for this partition */
-    protected int partitionCacheSize = -1;
+    private int partitionCacheSize = -1;
 
     /** Tells if the optimizer is enabled or not */
     private boolean jdbmPartitionOptimizerEnabled = true;
     
-    /** The set of indexed attributes */
-    private Set<JdbmIndexBean<String, Entry>> jdbmIndexes;
-
     /**
      * Create a new JdbmPartitionBean instance
      */
@@ -93,37 +87,26 @@ public class JdbmPartitionBean extends P
     
     
     /**
-     * Stores the list of index defined for this partition
-     * 
-     * @param jdbmIndexes The list of indexes to store
+     * {@inheritDoc}
      */
-    public void setIndexedAttributes( Set<JdbmIndexBean<String, Entry>> jdbmIndexes )
+    public String toString( String tabs )
     {
-        this.jdbmIndexes = jdbmIndexes;
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "JdbmPartitionBean :\n" );
+        sb.append( super.toString( tabs ) );
+        sb.append( tabs ).append( "  partition cache size : " ).append( partitionCacheSize ).append( '\n' );
+        sb.append( toString( tabs, "  jdbm partition optimizer enabled", jdbmPartitionOptimizerEnabled ) );
+        
+        return sb.toString();
     }
-
-
-    /**
-     * Add some indexes to this partition
-     * 
-     * @param jdbmIndexes The added jdbmIndexes
-     */
-    public void addJdbmIndexes( JdbmIndexBean<String, Entry>... jdbmIndexes )
-    {
-        for ( JdbmIndexBean<String, Entry> jdbmIndex : jdbmIndexes )
-        {
-            this.jdbmIndexes.add( jdbmIndex );
-        }
-    }
-
-
+    
+    
     /**
-     * Get the list of index defined for this partition
-     * 
-     * @return The list of defined indexes
+     * {@inheritDoc}
      */
-    public Set<JdbmIndexBean<String, Entry>> getJdbmIndexes()
+    public String toString()
     {
-        return jdbmIndexes;
+        return toString( "" );
     }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java Sat Oct 30 14:30:31 2010
@@ -24,8 +24,11 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class JournalBean extends BaseAdsBean
+public class JournalBean extends AdsBaseBean
 {
+    /** The journal unique Id */
+    private String journalId;
+    
     /** The journal file name */
     private String journalFileName;
     
@@ -46,6 +49,24 @@ public class JournalBean extends BaseAds
         // Not enabled by default
         setEnabled( false );
     }
+
+
+    /**
+     * @return the journalId
+     */
+    public String getJournalId()
+    {
+        return journalId;
+    }
+
+
+    /**
+     * @param journalId the journalId to set
+     */
+    public void setJournalId( String journalId )
+    {
+        this.journalId = journalId;
+    }
     
     
     /**
@@ -100,4 +121,30 @@ public class JournalBean extends BaseAds
     {
         this.journalRotation = journalRotation;
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "Journal :\n" );
+        sb.append( tabs ).append( "  journal id : " ).append( journalId ).append( '\n' );
+        sb.append( tabs ).append( "  journal file name : " ).append( journalFileName ).append( '\n' );
+        sb.append( toString( tabs, "  journal working dir", journalWorkingDir ) );
+        sb.append( toString( tabs, "  journal rotation", journalRotation ) );
+        
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java Sat Oct 30 14:30:31 2010
@@ -19,18 +19,17 @@
  */
 package org.apache.directory.server.config.beans;
 
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
-
 /**
  * A class used to store the KdcServer configuration.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class KdcServerBean extends CatalogBasedServerBean
+public class KdcServerBean extends DSBasedServerBean
 {
     /** The default allowable clockskew */
     private static final long DEFAULT_ALLOWABLE_CLOCKSKEW = 5 * 60000;
@@ -78,7 +77,7 @@ public class KdcServerBean extends Catal
     private boolean krbForwardableAllowed = DEFAULT_TGS_FORWARDABLE_ALLOWED;
 
     /** Whether pre-authentication by encrypted timestamp is required. */
-    private boolean krbPaEncTimestampRequired = DEFAULT_PA_ENC_TIMESTAMP_REQUIRED;
+    private boolean krbPAEncTimestampRequired = DEFAULT_PA_ENC_TIMESTAMP_REQUIRED;
 
     /** Whether postdated tickets are allowed. */
     private boolean krbPostdatedAllowed = DEFAULT_TGS_POSTDATED_ALLOWED;
@@ -102,7 +101,7 @@ public class KdcServerBean extends Catal
     private boolean krbBodyChecksumVerified = DEFAULT_VERIFY_BODY_CHECKSUM;
 
     /** The encryption types. */
-    private Set<EncryptionType> krbEncryptionTypes;
+    private List<String> krbEncryptionTypes = new ArrayList<String>();
 
     /** The service principal name. */
     private String krbKdcPrincipal = DEFAULT_PRINCIPAL;
@@ -144,7 +143,7 @@ public class KdcServerBean extends Catal
      *
      * @return The encryption types.
      */
-    public Set<EncryptionType> getKrbEncryptionTypes()
+    public List<String> getKrbEncryptionTypes()
     {
         return krbEncryptionTypes;
     }
@@ -155,16 +154,11 @@ public class KdcServerBean extends Catal
      * 
      * @param krbEncryptionTypes the encryptionTypes to set
      */
-    public void setKrbEncryptionTypes( EncryptionType... krbEncryptionTypes )
+    public void addKrbEncryptionTypes( String... krbEncryptionTypes )
     {
-        if ( krbEncryptionTypes != null )
+        for ( String encryptionType:krbEncryptionTypes )
         {
-            this.krbEncryptionTypes.clear();
-            
-            for ( EncryptionType encryptionType:krbEncryptionTypes )
-            {
-                this.krbEncryptionTypes.add( encryptionType );
-            }
+            this.krbEncryptionTypes.add( encryptionType );
         }
     }
 
@@ -212,7 +206,7 @@ public class KdcServerBean extends Catal
      */
     public boolean isKrbPaEncTimestampRequired()
     {
-        return krbPaEncTimestampRequired;
+        return krbPAEncTimestampRequired;
     }
 
 
@@ -221,7 +215,7 @@ public class KdcServerBean extends Catal
      */
     public void setKrbPaEncTimestampRequired( boolean krbPaEncTimestampRequired )
     {
-        this.krbPaEncTimestampRequired = krbPaEncTimestampRequired;
+        this.krbPAEncTimestampRequired = krbPaEncTimestampRequired;
     }
 
 
@@ -371,4 +365,49 @@ public class KdcServerBean extends Catal
     {
         this.krbKdcPrincipal = krbKdcPrincipal;
     }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "KDCServer :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+        sb.append( toString( tabs, "  body checksum verified", krbBodyChecksumVerified ) );
+        sb.append( toString( tabs, "  empty address alowed", krbEmptyAddressesAllowed ) );
+        sb.append( toString( tabs, "  forwardable allowed", krbForwardableAllowed ) );
+        sb.append( toString( tabs, "  PA encode timestamp required", krbPAEncTimestampRequired ) );
+        sb.append( toString( tabs, "  postdated allowed", krbPostdatedAllowed ) );
+        sb.append( toString( tabs, "  proxiable allowed", krbProxiableAllowed ) );
+        sb.append( toString( tabs, "  renew allowed", krbRenewableAllowed ) );
+        sb.append( toString( tabs, "  allowable clock skew", krbAllowableClockSkew ) );
+        sb.append( toString( tabs, "  KDC principal", krbKdcPrincipal ) );
+        sb.append( toString( tabs, "  maximum renewable lifetime", krbMaximumRenewableLifetime ) );
+        sb.append( toString( tabs, "  maximum ticket lifetime", krbMaximumTicketLifetime ) );
+        sb.append( toString( tabs, "  primary realm", krbPrimaryRealm ) );
+
+        if ( ( krbEncryptionTypes != null ) && ( krbEncryptionTypes.size() > 0 ) )
+        {
+            sb.append( tabs ).append( "  encryption types :\n" );
+            
+            for ( String encryptionType : krbEncryptionTypes )
+            {
+                sb.append( toString( tabs, "    encryption type", encryptionType ) );
+            }
+        }
+        
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java Sat Oct 30 14:30:31 2010
@@ -19,8 +19,8 @@
  */
 package org.apache.directory.server.config.beans;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -28,43 +28,46 @@ import java.util.Set;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdapServerBean extends CatalogBasedServerBean
+public class LdapServerBean extends DSBasedServerBean
 {
     /** */
-    private boolean ldapServerConfidentialityRequired;
+    private boolean confidentialityRequired;
     
     /** The maximum number of entries returned by the server */
-    private int ldapServerMaxSizeLimit;
+    private int maxSizeLimit;
     
     /** The maximum time to execute a request on the server */
-    private int ldapServerMaxTimeLimit;
+    private int maxTimeLimit;
     
     /** The SASL host */
-    private String ldapServerSaslHost;
+    private String saslHost;
     
     /** The SASL  principal */
-    private String ldapServerSaslPrincipal;
+    private String saslPrincipal;
     
     /** The SASL realms */
-    private Set<String> ldapServerSaslRealms = new HashSet<String>();;
+    private List<String> saslRealms = new ArrayList<String>();
     
     /** The keystore file */
-    private String ldapServerKeystoreFile;
+    private String keystoreFile;
     
     /** The certificate password */
-    private String ldapServerCertificatePassword;
-    
-    /** The ReplicationProvider configuration */
-    //private ReplicationProviderBean replProviderImpl;
+    private String certificatePassword;
     
     /** tells if the replication is enabled */
     private boolean enableReplProvider; 
     
+    /** The replication consumer Bean */
+    private ReplConsumerBean replConsumer;
+    
+    /** The replication producer Bean */
+    private ReplProviderBean replProvider;
+    
     /** The list of supported mechanisms */
-    private Set<LdapServerSaslMechanisHandlerBean> saslMechHandlers = new HashSet<LdapServerSaslMechanisHandlerBean>();
+    private List<SaslMechHandlerBean> saslMechHandlers = new ArrayList<SaslMechHandlerBean>();
     
-    /** The list of supported extedned operations */
-    private Set<LdapServerExtendedOpHandlerBean> extendedOps = new HashSet<LdapServerExtendedOpHandlerBean>();
+    /** The list of supported extended operation handlers */
+    private List<ExtendedOpHandlerBean> extendedOpHandlers = new ArrayList<ExtendedOpHandlerBean>();
 
     /**
      * Create a new LdapServerBean instance
@@ -83,7 +86,7 @@ public class LdapServerBean extends Cata
      */
     public boolean isLdapServerConfidentialityRequired()
     {
-        return ldapServerConfidentialityRequired;
+        return confidentialityRequired;
     }
 
     
@@ -92,7 +95,7 @@ public class LdapServerBean extends Cata
      */
     public void setLdapServerConfidentialityRequired( boolean ldapServerConfidentialityRequired )
     {
-        this.ldapServerConfidentialityRequired = ldapServerConfidentialityRequired;
+        this.confidentialityRequired = ldapServerConfidentialityRequired;
     }
 
     
@@ -101,7 +104,7 @@ public class LdapServerBean extends Cata
      */
     public int getLdapServerMaxSizeLimit()
     {
-        return ldapServerMaxSizeLimit;
+        return maxSizeLimit;
     }
 
     
@@ -110,7 +113,7 @@ public class LdapServerBean extends Cata
      */
     public void setLdapServerMaxSizeLimit( int ldapServerMaxSizeLimit )
     {
-        this.ldapServerMaxSizeLimit = ldapServerMaxSizeLimit;
+        this.maxSizeLimit = ldapServerMaxSizeLimit;
     }
 
     
@@ -119,7 +122,7 @@ public class LdapServerBean extends Cata
      */
     public int getLdapServerMaxTimeLimit()
     {
-        return ldapServerMaxTimeLimit;
+        return maxTimeLimit;
     }
 
     
@@ -128,7 +131,7 @@ public class LdapServerBean extends Cata
      */
     public void setLdapServerMaxTimeLimit( int ldapServerMaxTimeLimit )
     {
-        this.ldapServerMaxTimeLimit = ldapServerMaxTimeLimit;
+        this.maxTimeLimit = ldapServerMaxTimeLimit;
     }
 
     
@@ -137,7 +140,7 @@ public class LdapServerBean extends Cata
      */
     public String getLdapServerSaslHost()
     {
-        return ldapServerSaslHost;
+        return saslHost;
     }
 
     
@@ -146,7 +149,7 @@ public class LdapServerBean extends Cata
      */
     public void setLdapServerSaslHost( String ldapServerSaslHost )
     {
-        this.ldapServerSaslHost = ldapServerSaslHost;
+        this.saslHost = ldapServerSaslHost;
     }
 
     
@@ -155,7 +158,7 @@ public class LdapServerBean extends Cata
      */
     public String getLdapServerSaslPrincipal()
     {
-        return ldapServerSaslPrincipal;
+        return saslPrincipal;
     }
 
     
@@ -164,36 +167,36 @@ public class LdapServerBean extends Cata
      */
     public void setLdapServerSaslPrincipal( String ldapServerSaslPrincipal )
     {
-        this.ldapServerSaslPrincipal = ldapServerSaslPrincipal;
+        this.saslPrincipal = ldapServerSaslPrincipal;
     }
 
     
     /**
      * @return the ldapServerSaslRealms
      */
-    public Set<String> getLdapServerSaslRealms()
+    public List<String> getLdapServerSaslRealms()
     {
-        return ldapServerSaslRealms;
+        return saslRealms;
     }
 
     
     /**
      * @param ldapServerSaslRealms the ldapServerSaslRealms to set
      */
-    public void setLdapServerSaslRealms( Set<String> ldapServerSaslRealms )
+    public void setLdapServerSaslRealms( List<String> ldapServerSaslRealms )
     {
-        this.ldapServerSaslRealms = ldapServerSaslRealms;
+        this.saslRealms = ldapServerSaslRealms;
     }
 
     
     /**
      * @param ldapServerSaslRealms the ldapServerSaslRealms to add
      */
-    public void addLdapServerSaslRealms( String... ldapServerSaslRealms )
+    public void addSaslRealms( String... ldapServerSaslRealms )
     {
         for ( String saslRealm : ldapServerSaslRealms )
         {
-            this.ldapServerSaslRealms.add( saslRealm );
+            this.saslRealms.add( saslRealm );
         }
     }
 
@@ -203,7 +206,7 @@ public class LdapServerBean extends Cata
      */
     public String getLdapServerKeystoreFile()
     {
-        return ldapServerKeystoreFile;
+        return keystoreFile;
     }
 
     
@@ -212,7 +215,7 @@ public class LdapServerBean extends Cata
      */
     public void setLdapServerKeystoreFile( String ldapServerKeystoreFile )
     {
-        this.ldapServerKeystoreFile = ldapServerKeystoreFile;
+        this.keystoreFile = ldapServerKeystoreFile;
     }
 
     
@@ -221,7 +224,7 @@ public class LdapServerBean extends Cata
      */
     public String getLdapServerCertificatePassword()
     {
-        return ldapServerCertificatePassword;
+        return certificatePassword;
     }
 
     
@@ -230,7 +233,7 @@ public class LdapServerBean extends Cata
      */
     public void setLdapServerCertificatePassword( String ldapServerCertificatePassword )
     {
-        this.ldapServerCertificatePassword = ldapServerCertificatePassword;
+        this.certificatePassword = ldapServerCertificatePassword;
     }
 
     
@@ -273,7 +276,7 @@ public class LdapServerBean extends Cata
     /**
      * @return the saslMechHandlers
      */
-    public Set<LdapServerSaslMechanisHandlerBean> getSaslMechHandlers()
+    public List<SaslMechHandlerBean> getSaslMechHandlers()
     {
         return saslMechHandlers;
     }
@@ -282,7 +285,7 @@ public class LdapServerBean extends Cata
     /**
      * @param saslMechHandlers the saslMechHandlers to set
      */
-    public void setSaslMechHandlers( Set<LdapServerSaslMechanisHandlerBean> saslMechHandlers )
+    public void setSaslMechHandlers( List<SaslMechHandlerBean> saslMechHandlers )
     {
         this.saslMechHandlers = saslMechHandlers;
     }
@@ -291,9 +294,9 @@ public class LdapServerBean extends Cata
     /**
      * @param saslMechHandlers the saslMechHandlers to add
      */
-    public void setSaslMechHandlers( LdapServerSaslMechanisHandlerBean... saslMechHandlers )
+    public void setSaslMechHandlers( SaslMechHandlerBean... saslMechHandlers )
     {
-        for ( LdapServerSaslMechanisHandlerBean saslMechHandler : saslMechHandlers )
+        for ( SaslMechHandlerBean saslMechHandler : saslMechHandlers )
         {
             this.saslMechHandlers.add( saslMechHandler );
         }
@@ -303,29 +306,136 @@ public class LdapServerBean extends Cata
     /**
      * @return the extendedOps
      */
-    public Set<LdapServerExtendedOpHandlerBean> getExtendedOps()
+    public List<ExtendedOpHandlerBean> getExtendedOps()
     {
-        return extendedOps;
+        return extendedOpHandlers;
     }
 
     
     /**
      * @param extendedOps the extendedOps to set
      */
-    public void setExtendedOps( Set<LdapServerExtendedOpHandlerBean> extendedOps )
+    public void setExtendedOps( List<ExtendedOpHandlerBean> extendedOps )
     {
-        this.extendedOps = extendedOps;
+        this.extendedOpHandlers = extendedOps;
     }
 
     
     /**
      * @param extendedOps the extendedOps to add
      */
-    public void addExtendedOps( LdapServerExtendedOpHandlerBean... extendedOps )
+    public void addExtendedOps( ExtendedOpHandlerBean... extendedOps )
     {
-        for ( LdapServerExtendedOpHandlerBean extendedOp : extendedOps )
+        for ( ExtendedOpHandlerBean extendedOp : extendedOps )
         {   
-            this.extendedOps.add( extendedOp );
+            this.extendedOpHandlers.add( extendedOp );
+        }
+    }
+
+
+    /**
+     * @return the Replication Consumer Bean
+     */
+    public ReplConsumerBean getReplConsumer()
+    {
+        return replConsumer;
+    }
+
+
+    /**
+     * @param replConsumer the Replication Consumer Bean to set
+     */
+    public void setReplConsumer( ReplConsumerBean replConsumer )
+    {
+        this.replConsumer = replConsumer;
+    }
+
+
+    /**
+     * @return the replProvider
+     */
+    public ReplProviderBean getReplProvider()
+    {
+        return replProvider;
+    }
+
+
+    /**
+     * @param replProvider the replProvider to set
+     */
+    public void setReplProvider( ReplProviderBean replProvider )
+    {
+        this.replProvider = replProvider;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "LdapServer :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+        sb.append( tabs ).append( "  max size limit : " ).append( maxSizeLimit ).append( '\n' );
+        sb.append( tabs ).append( "  max time limit : " ).append( maxTimeLimit ).append( '\n' );
+        sb.append( toString( tabs, "  certificate password", certificatePassword ) );
+        sb.append( toString( tabs, "  keystore file", keystoreFile ) );
+        sb.append( toString( tabs, "  sasl principal", saslPrincipal ) );
+        sb.append( tabs ).append( "  sasl host : " ).append( saslHost ).append( '\n' );
+        sb.append( toString( tabs, "  confidentiality required", confidentialityRequired ) );
+        sb.append( toString( tabs, "  enable replication provider", enableReplProvider ) );
+        
+        if ( ( extendedOpHandlers != null ) && ( extendedOpHandlers.size() > 0 ) )
+        {
+            sb.append( tabs ).append( "  extended operation handlers :\n" );
+            
+            for ( ExtendedOpHandlerBean extendedOpHandler : extendedOpHandlers )
+            {
+                sb.append( extendedOpHandler.toString( tabs + "    " ) );
+            }
+        }
+        
+        if ( saslMechHandlers != null )
+        {
+            sb.append( tabs ).append( "  SASL mechanism handlers :\n" );
+            
+            for ( SaslMechHandlerBean saslMechHandler : saslMechHandlers )
+            {
+                sb.append( saslMechHandler.toString( tabs + "    " ) );
+            }
+        }
+        
+        if ( ( saslRealms != null ) && ( saslRealms.size() > 0 ) )
+        {
+            sb.append( tabs ).append( "  SASL realms :\n" );
+            
+            for ( String saslRealm : saslRealms )
+            {
+                sb.append( tabs ).append( "    " ).append( saslRealm ).append( "\n" );
+            }
+        }
+        
+        if ( replConsumer != null )
+        {
+            sb.append( tabs ).append( replConsumer.toString( tabs + "  " ) );
+        }
+        
+        if ( replProvider != null )
+        {
+            sb.append( tabs ).append( replProvider.toString( tabs + "  " ) );
         }
+        
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
     }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java Sat Oct 30 14:30:31 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class NtpServerBean extends AdsServerBean
+public class NtpServerBean extends ServerBean
 {
     /**
      * Create a new NtpServerBean instance
@@ -37,4 +37,27 @@ public class NtpServerBean extends AdsSe
         // Enabled by default
         setEnabled( true );
     }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( tabs ).append( "NtpServer :\n" );
+        sb.append( super.toString( tabs + "  " ) );
+
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }

Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java?rev=1029081&r1=1029080&r2=1029081&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java Sat Oct 30 14:30:31 2010
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.server.config.beans;
 
+import java.util.List;
+
 import org.apache.directory.shared.ldap.name.DN;
 
 /**
@@ -26,7 +28,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class PartitionBean extends BaseAdsBean
+public abstract class PartitionBean extends AdsBaseBean
 {
     /** The Partition identifier */
     private String partitionId;
@@ -37,6 +39,12 @@ public abstract class PartitionBean exte
     /** Tells if the data should be flushed to disk immediately */
     private boolean partitionSyncOnWrite;
 
+    /** The list of declared indexes */
+    private List<IndexBean> indexes;
+    
+    /** The partition's ContextEntry */
+    private String contextEntry;
+
     /**
      * Create a new PartitionBean instance
      */
@@ -44,6 +52,7 @@ public abstract class PartitionBean exte
     {
     }
 
+    
     /**
      * @return the partitionId
      */
@@ -52,6 +61,7 @@ public abstract class PartitionBean exte
         return partitionId;
     }
 
+    
     /**
      * @param partitionId the partitionId to set
      */
@@ -60,6 +70,7 @@ public abstract class PartitionBean exte
         this.partitionId = partitionId;
     }
 
+    
     /**
      * @return the partitionSuffix
      */
@@ -68,6 +79,7 @@ public abstract class PartitionBean exte
         return partitionSuffix;
     }
 
+    
     /**
      * @param partitionSuffix the partitionSuffix to set
      */
@@ -76,6 +88,7 @@ public abstract class PartitionBean exte
         this.partitionSuffix = partitionSuffix;
     }
 
+    
     /**
      * @return the partitionSyncOnWrite
      */
@@ -84,6 +97,7 @@ public abstract class PartitionBean exte
         return partitionSyncOnWrite;
     }
 
+    
     /**
      * @param partitionSyncOnWrite the partitionSyncOnWrite to set
      */
@@ -91,4 +105,76 @@ public abstract class PartitionBean exte
     {
         this.partitionSyncOnWrite = partitionSyncOnWrite;
     }
+    
+    
+    /**
+     * @return the indexes
+     */
+    public List<IndexBean> getIndexes()
+    {
+        return indexes;
+    }
+
+
+    /**
+     * @param partitions the indexes to set
+     */
+    public void setIndexes( List<IndexBean> indexes )
+    {
+        this.indexes = indexes;
+    }
+
+
+    /**
+     * @param contextEntry the contextEntry to set
+     */
+    public void setContextEntry( String contextEntry )
+    {
+        this.contextEntry = contextEntry;
+    }
+
+
+    /**
+     * @return the contextEntry
+     */
+    public String getContextEntry()
+    {
+        return contextEntry;
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString( String tabs )
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( super.toString( tabs + "  " ) );
+        sb.append( tabs ).append( "  partition ID : " ).append( partitionId ).append( '\n' );
+        sb.append( tabs ).append( "  suffix : " ).append( partitionSuffix.getName() ).append( '\n' );
+        sb.append( toString( tabs, "  sync on write", partitionSyncOnWrite ) );
+        sb.append( toString( tabs, "  contextEntry", contextEntry ) );
+        
+        sb.append( tabs ).append( "  indexes : \n" );
+        
+        if ( indexes != null )
+        {
+            for ( IndexBean index : indexes )
+            {
+                sb.append( index.toString( tabs + "    " ) );
+            }
+        }
+        
+        return sb.toString();
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String toString()
+    {
+        return toString( "" );
+    }
 }



Mime
View raw message