You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/10/21 02:07:31 UTC

svn commit: r1025797 - in /directory/apacheds/branches/apacheds-config/server-config/src/main: java/org/apache/directory/server/config/ resources/ resources/config/ou=config/ads-directoryserviceid=default/ou=servers/

Author: elecharny
Date: Thu Oct 21 00:07:31 2010
New Revision: 1025797

URL: http://svn.apache.org/viewvc?rev=1025797&view=rev
Log:
Fixed some OCs

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

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java?rev=1025797&r1=1025796&r2=1025797&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java Thu Oct 21 00:07:31 2010
@@ -26,207 +26,248 @@ 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-directoryService objectClass
+    ADS_DIRECTORY_SERVICE_OC( "ads-directoryService", "1.3.6.1.4.1.18060.0.4.1.3.100" ),
 
-    String ADS_KERBEROS_SERVER_OC = "ads-kerberosServer";
+    ADS_CONFIG_ID( "ads-configId", "" ),
+    
+    ADS_COMPOSITE_ELEMENT_AT( "ads-compositeElement", "1.3.6.1.4.1.18060.0.4.1.2.0" ),
+
+    ADS_LDAP_SERVER_OC( "ads-ldapServer", "" ),
+
+    ADS_KERBEROS_SERVER_OC( "ads-kdcServer", "1.3.6.1.4.1.18060.0.4.1.3.400" ),
 
-    String ADS_SERVER_ID = "ads-serverId";
+    ADS_SERVER_ID( "ads-serverId", "" ),
 
-    String ADS_TRANSPORTS = "ads-transports";
+    ADS_TRANSPORTS( "ads-transports", "" ),
 
-    String ADS_KRB_ALLOWABLE_CLOCKSKEW = "ads-krbAllowableClockSkew";
+    ADS_KRB_ALLOWABLE_CLOCKSKEW( "ads-krbAllowableClockSkew", "" ),
 
-    String ADS_KRB_ENCRYPTION_TYPES = "ads-krbEncryptionTypes";
+    ADS_KRB_ENCRYPTION_TYPES( "ads-krbEncryptionTypes", "" ),
 
-    String ADS_KRB_EMPTY_ADDRESSES_ALLOWED = "ads-krbEmptyAddressesAllowed";
+    ADS_KRB_EMPTY_ADDRESSES_ALLOWED( "ads-krbEmptyAddressesAllowed", "" ),
 
-    String ADS_KRB_FORWARDABLE_ALLOWED = "ads-krbForwardableAllowed";
+    ADS_KRB_FORWARDABLE_ALLOWED( "ads-krbForwardableAllowed", "" ),
 
-    String ADS_KRB_PAENC_TIMESTAMP_REQUIRED = "ads-krbPaEncTimestampRequired";
+    ADS_KRB_PAENC_TIMESTAMP_REQUIRED( "ads-krbPaEncTimestampRequired", "" ),
 
-    String ADS_KRB_POSTDATED_ALLOWED = "ads-krbPostdatedAllowed";
+    ADS_KRB_POSTDATED_ALLOWED( "ads-krbPostdatedAllowed", "" ),
 
-    String ADS_KRB_PROXIABLE_ALLOWED = "ads-krbProxiableAllowed";
+    ADS_KRB_PROXIABLE_ALLOWED( "ads-krbProxiableAllowed", "" ),
 
-    String ADS_KRB_RENEWABLE_ALLOWED = "ads-krbRenewableAllowed";
+    ADS_KRB_RENEWABLE_ALLOWED( "ads-krbRenewableAllowed", "" ),
 
-    String ADS_KRB_KDC_PRINCIPAL = "ads-krbKdcPrincipal";
+    ADS_KRB_KDC_PRINCIPAL( "ads-krbKdcPrincipal", "" ),
 
-    String ADS_KRB_MAXIMUM_RENEWABLE_LIFETIME = "ads-krbMaximumRenewableLifetime";
+    ADS_KRB_MAXIMUM_RENEWABLE_LIFETIME( "ads-krbMaximumRenewableLifetime", "" ),
 
-    String ADS_KRB_MAXIMUM_TICKET_LIFETIME = "ads-krbMaximumTicketLifetime";
+    ADS_KRB_MAXIMUM_TICKET_LIFETIME( "ads-krbMaximumTicketLifetime", "" ),
 
-    String ADS_KRB_PRIMARY_REALM = "ads-krbPrimaryRealm";
+    ADS_KRB_PRIMARY_REALM( "ads-krbPrimaryRealm", "" ),
 
-    String ADS_KRB_BODY_CHECKSUM_VERIFIED = "ads-krbBodyChecksumVerified";
+    ADS_KRB_BODY_CHECKSUM_VERIFIED( "ads-krbBodyChecksumVerified", "" ),
 
-    String ADS_DNS_SERVER_OC = "ads-dnsServer";
+    ADS_DNS_SERVER_OC( "ads-dnsServer", "" ),
 
-    String ADS_DHCP_SERVER_OC = "ads-dhcpServer";
+    ADS_DHCP_SERVER_OC( "ads-dhcpServer", "" ),
 
-    String ADS_NTP_SERVER_OC = "ads-ntpServer";
+    ADS_NTP_SERVER_OC( "ads-ntpServer", "" ),
 
-    String ADS_HTTP_SERVER_OC = "ads-httpServer";
+    ADS_HTTP_SERVER_OC( "ads-httpServer", "" ),
 
-    String ADS_HTTP_CONFFILE = "ads-httpConfFile";
+    ADS_HTTP_CONFFILE( "ads-httpConfFile", "" ),
 
-    String ADS_DIRECTORYSERVICE_ID = "ads-directoryServiceId";
+    ADS_DIRECTORYSERVICE_ID( "ads-directoryServiceId", "" ),
 
-    String ADS_DS_REPLICA_ID = "ads-dsReplicaId";
+    ADS_DS_REPLICA_ID( "ads-dsReplicaId", "" ),
 
-    String ADS_DSINTERCEPTORS = "ads-dsInterceptors";
+    ADS_DSINTERCEPTORS( "ads-dsInterceptors", "" ),
 
-    String ADS_DSPARTITIONS = "ads-dsPartitions";
+    ADS_DSPARTITIONS( "ads-dsPartitions", "" ),
 
-    String ADS_DS_ACCESSCONTROL_ENABLED = "ads-dsAccessControlEnabled";
+    ADS_DS_ACCESSCONTROL_ENABLED( "ads-dsAccessControlEnabled", "" ),
 
-    String ADS_DS_ALLOW_ANONYMOUS_ACCESS = "ads-dsAllowAnonymousAccess";
+    ADS_DS_ALLOW_ANONYMOUS_ACCESS( "ads-dsAllowAnonymousAccess", "" ),
 
-    String ADS_DSCHANGELOG = "ads-dsChangeLog";
+    ADS_DSCHANGELOG( "ads-dsChangeLog", "" ),
 
-    String ADS_DS_DENORMALIZE_OPATTRS_ENABLED = "ads-dsDenormalizeOpAttrsEnabled";
+    ADS_DS_DENORMALIZE_OPATTRS_ENABLED( "ads-dsDenormalizeOpAttrsEnabled", "" ),
 
-    String ADS_DSJOURNAL = "ads-dsJournal";
+    ADS_DSJOURNAL( "ads-dsJournal", "" ),
 
-    String ADS_DS_MAXPDU_SIZE = "ads-dsMaxPDUSize";
+    ADS_DS_MAXPDU_SIZE( "ads-dsMaxPDUSize", "" ),
 
-    String ADS_DS_PASSWORD_HIDDEN = "ads-dsPasswordHidden";
+    ADS_DS_PASSWORD_HIDDEN( "ads-dsPasswordHidden", "" ),
 
-    //String ADS_DS_REPLICATION = "ads-dsReplication";
+    //ADS_DS_REPLICATION( "ads-dsReplication", "" ),
 
-    String ADS_DS_SYNCPERIOD_MILLIS = "ads-dsSyncPeriodMillis";
+    ADS_DS_SYNCPERIOD_MILLIS( "ads-dsSyncPeriodMillis", "" ),
 
-    String ADS_DS_TEST_ENTRIES = "ads-dsTestEntries";
+    ADS_DS_TEST_ENTRIES( "ads-dsTestEntries", "" ),
 
-    String ADS_INTERCEPTOR_ID = "ads-interceptorId";
+    ADS_INTERCEPTOR_ID( "ads-interceptorId", "" ),
 
-    String ADS_INTERCEPTOR_CLASSNAME = "ads-interceptorClassName";
+    ADS_INTERCEPTOR_CLASSNAME( "ads-interceptorClassName", "" ),
 
-    String ADS_INTERCEPTOR_ORDER = "ads-interceptorOrder";
+    ADS_INTERCEPTOR_ORDER( "ads-interceptorOrder", "" ),
 
-    String ADS_JDBMPARTITION = "ads-jdbmPartition";
+    ADS_JDBMPARTITION( "ads-jdbmPartition", "" ),
 
-    String ADS_PARTITION_ID = "ads-partitionId";
+    ADS_PARTITION_ID( "ads-partitionId", "" ),
 
-    String ADS_PARTITION_SUFFIX = "ads-partitionSuffix";
+    ADS_PARTITION_SUFFIX( "ads-partitionSuffix", "" ),
 
-    String ADS_PARTITION_CACHE_SIZE = "ads-partitionCacheSize";
+    ADS_PARTITION_CACHE_SIZE( "ads-partitionCacheSize", "" ),
 
-    String ADS_JDBM_PARTITION_OPTIMIZER_ENABLED = "ads-jdbmPartitionOptimizerEnabled";
+    ADS_JDBM_PARTITION_OPTIMIZER_ENABLED( "ads-jdbmPartitionOptimizerEnabled", "" ),
 
-    String ADS_PARTITION_SYNCONWRITE = "ads-partitionSyncOnWrite";
+    ADS_PARTITION_SYNCONWRITE( "ads-partitionSyncOnWrite", "" ),
 
-    String ADS_PARTITION_INDEXED_ATTRIBUTES = "ads-partitionIndexedAttributes";
+    ADS_PARTITION_INDEXED_ATTRIBUTES( "ads-partitionIndexedAttributes", "" ),
 
-    String ADS_INDEX_ATTRIBUTE_ID = "ads-indexAttributeId";
+    ADS_INDEX_ATTRIBUTE_ID( "ads-indexAttributeId", "" ),
 
-    String ADS_JDBMINDEX = "ads-jdbmIndex";
+    ADS_JDBMINDEX( "ads-jdbmIndex", "" ),
 
-    String ADS_INDEX_CACHESIZE = "ads-indexCacheSize";
+    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", "" ),
+    
+    ADS_CHANGEPWD_POLICY_TOKEN_SIZE( "ads-chgPwdPolicyTokenSize", "" ),
+    
+    ADS_CHANGEPWD_SERVICE_PRINCIPAL( "ads-chgPwdServicePrincipal", "" ),
+    
+    ADS_CHANGEPWD_SERVER_OC( "ads-changePasswordServer", "" ),
+    
+    ADS_REPL_SEARCH_FILTER( "ads-replSearchFilter", "" ),
+    
+    ADS_REPL_LAST_SENT_CSN( "ads-replLastSentCsn", "" ),
     
-    String ADS_CHANGEPWD_POLICY_CATEGORY_COUNT = "ads-chgPwdPolicyCategoryCount";
+    ADS_REPL_ALIAS_DEREF_MODE( "ads-replAliasDerefMode", "" ),
     
-    String ADS_CHANGEPWD_POLICY_PASSWORD_LENGTH = "ads-chgPwdPolicyPasswordLength";
+    ADS_SEARCH_BASE( "ads-searchBaseDN", "" ),
     
-    String ADS_CHANGEPWD_POLICY_TOKEN_SIZE = "ads-chgPwdPolicyTokenSize";
+    ADS_REPL_SEARCH_SCOPE( "ads-replSearchScope", "" ),
     
-    String ADS_CHANGEPWD_SERVICE_PRINCIPAL = "ads-chgPwdServicePrincipal";
+    ADS_REPL_REFRESH_N_PERSIST( "ads-replRefreshNPersist", "" ),
     
-    String ADS_CHANGEPWD_SERVER_OC = "ads-changePasswordServer";
+    ADS_REPL_PROV_HOST_NAME( "ads-replProvHostName", "" ),
     
-    String ADS_REPL_SEARCH_FILTER = "ads-replSearchFilter";
+    ADS_REPL_PROV_PORT( "ads-replProvPort", "" ),
     
-    String ADS_REPL_LAST_SENT_CSN = "ads-replLastSentCsn";
+    ADS_REPL_USER_DN( "ads-replUserDn", "" ),
     
-    String ADS_REPL_ALIAS_DEREF_MODE = "ads-replAliasDerefMode";
+    ADS_REPL_USER_PASSWORD( "ads-replUserPassword", "" ),
     
-    String ADS_SEARCH_BASE = "ads-searchBaseDN";
+    ADS_REPL_REFRESH_INTERVAL( "ads-replRefreshInterval", "" ),
     
-    String ADS_REPL_SEARCH_SCOPE = "ads-replSearchScope";
+    ADS_REPL_ATTRIBUTE( "ads-replAttribute", "" ),
     
-    String ADS_REPL_REFRESH_N_PERSIST = "ads-replRefreshNPersist";
+    ADS_REPL_SEARCH_SIZE_LIMIT( "ads-replSearchSizeLimit", "" ),
     
-    String ADS_REPL_PROV_HOST_NAME = "ads-replProvHostName";
+    ADS_REPL_SEARCH_TIMEOUT( "ads-replSearchTimeOut", "" ),
     
-    String ADS_REPL_PROV_PORT = "ads-replProvPort";
+    ADS_REPL_COOKIE( "ads-replCookie", "" ),
     
-    String ADS_REPL_USER_DN = "ads-replUserDn";
+    ADS_REPL_CONSUMER_OC( "ads-replConsumer", "" ),
     
-    String ADS_REPL_USER_PASSWORD = "ads-replUserPassword";
+    ADS_REPL_PROVIDER_OC( "ads-replProvider", "" ),
     
-    String ADS_REPL_REFRESH_INTERVAL = "ads-replRefreshInterval";
+    ADS_REPL_PROVIDER_IMPL( "ads-replProviderImpl", "" ),
     
-    String ADS_REPL_ATTRIBUTE = "ads-replAttribute";
+    ADS_REPL_ENABLE_PROVIDER( "ads-enableReplProvider", "" ),
     
-    String ADS_REPL_SEARCH_SIZE_LIMIT = "ads-replSearchSizeLimit";
+    ADS_REPL_PEER_CERTIFICATE( "ads-replPeerCertificate", "" ),
     
-    String ADS_REPL_SEARCH_TIMEOUT = "ads-replSearchTimeOut";
+    ADS_REPL_USE_TLS( "ads-replUseTls", "" ),
     
-    String ADS_REPL_COOKIE = "ads-replCookie";
+    ADS_LDAP_SERVER_SASL_MECH_HANDLER_OC( "ads-ldapServerSaslMechanismHandler", "" ),
     
-    String ADS_REPL_CONSUMER_OC = "ads-replConsumer";
+    ADS_LDAP_SERVER_SASL_MECH_NAME( "ads-ldapServerSaslMechName", "" ),
     
-    String ADS_REPL_PROVIDER_OC = "ads-replProvider";
+    ADS_LDAP_SERVER_SASL_MECH_CLASS_NAME( "ads-ldapServerSaslMechClassName", "" ),
     
-    String ADS_REPL_PROVIDER_IMPL = "ads-replProviderImpl";
+    ADS_LDAP_SERVER_NTLM_MECH_PROVIDER( "ads-ldapServerNtlmMechProvider", "" ),
     
-    String ADS_REPL_ENABLE_PROVIDER = "ads-enableReplProvider";
+    ADS_LDAP_SERVER_EXT_OP_HANDLER_OC( "ads-ldapServerExtendedOpHandler", "" ),
     
-    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/branches/apacheds-config/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif?rev=1025797&r1=1025796&r2=1025797&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif Thu Oct 21 00:07:31 2010
@@ -489,7 +489,7 @@ ads-enabled: false
 
 dn: ads-serverId=kerberos,ou=servers,ads-directoryServiceId=default,ou=config
 objectclass: ads-server
-objectclass: ads-kerberosServer
+objectclass: ads-kdcServer
 objectclass: ads-dsBasedServer
 objectclass: top
 ads-serverid: kerberos

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou%3Dconfig/ads-directoryserviceid%3Ddefault/ou%3Dservers/ads-serverid%3Dchangepasswordserver.ldif?rev=1025797&r1=1025796&r2=1025797&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver.ldif (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver.ldif Thu Oct 21 00:07:31 2010
@@ -2,7 +2,7 @@ version: 1
 dn: ads-serverId=changepasswordserver,ou=servers,ou=config
 objectclass: ads-server
 objectclass: ads-changePasswordServer
-objectclass: ads-catalogBasedServer
+objectclass: ads-dsBasedServer
 ads-serverid: changepasswordserver
 ads-chgPwdServicePrincipal: kadmin/changepw@EXAMPLE.COM
 ads-enabled: false

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou%3Dconfig/ads-directoryserviceid%3Ddefault/ou%3Dservers/ads-serverid%3Ddns.ldif?rev=1025797&r1=1025796&r2=1025797&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns.ldif (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns.ldif Thu Oct 21 00:07:31 2010
@@ -4,5 +4,5 @@ ads-serverid: dns
 ads-enabled: false
 objectclass: ads-server
 objectclass: ads-dnsServer
-objectclass: ads-catalogBasedServer
+objectclass: ads-dsBasedServer
 objectclass: top

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou%3Dconfig/ads-directoryserviceid%3Ddefault/ou%3Dservers/ads-serverid%3Dkerberos.ldif?rev=1025797&r1=1025796&r2=1025797&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos.ldif (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos.ldif Thu Oct 21 00:07:31 2010
@@ -1,8 +1,8 @@
 version: 1
 dn: ads-serverId=kerberos,ou=servers,ou=config
 objectclass: ads-server
-objectclass: ads-kerberosServer
-objectclass: ads-catalogBasedServer
+objectclass: ads-kdcServer
+objectclass: ads-dsBasedServer
 objectclass: top
 ads-serverid: kerberos
 ads-enabled: false

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou%3Dconfig/ads-directoryserviceid%3Ddefault/ou%3Dservers/ads-serverid%3Dldapserver.ldif?rev=1025797&r1=1025796&r2=1025797&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver.ldif (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver.ldif Thu Oct 21 00:07:31 2010
@@ -2,7 +2,7 @@ version: 1
 dn: ads-serverId=ldapServer,ou=servers,ou=config
 objectclass: ads-server
 objectclass: ads-ldapServer
-objectclass: ads-catalogBasedServer
+objectclass: ads-dsBasedServer
 objectclass: top
 ads-serverid: ldapServer
 ads-ldapServerConfidentialityRequired: false