Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 2002 invoked from network); 14 Feb 2011 17:39:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Feb 2011 17:39:14 -0000 Received: (qmail 71793 invoked by uid 500); 14 Feb 2011 17:39:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 71735 invoked by uid 500); 14 Feb 2011 17:39:12 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 71728 invoked by uid 99); 14 Feb 2011 17:39:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Feb 2011 17:39:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Feb 2011 17:39:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 96E2323889E3; Mon, 14 Feb 2011 17:38:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1070592 - in /directory: apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/ apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ apacheds/branches/m1/core/src/main/java/org... Date: Mon, 14 Feb 2011 17:38:45 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110214173845.96E2323889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Feb 14 17:38:44 2011 New Revision: 1070592 URL: http://svn.apache.org/viewvc?rev=1070592&view=rev Log: o Created the Dn.ROOT_DSE constant o Using it in the sever when it's semantically relevant Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java directory/apacheds/branches/m1/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java directory/shared/branches/m1/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java directory/shared/branches/m1/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original) +++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Mon Feb 14 17:38:44 2011 @@ -286,7 +286,7 @@ public class SubschemaSubentryIT extends assertNotNull( attrs ); SchemaEntityFactory factory = new SchemaEntityFactory(); - Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.EMPTY_DN, service.getSchemaManager() ); + Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.ROOT_DSE, service.getSchemaManager() ); SyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, serverEntry, service .getSchemaManager().getRegistries(), schemaName ); @@ -1424,7 +1424,7 @@ public class SubschemaSubentryIT extends assertNotNull( attrs ); SchemaEntityFactory factory = new SchemaEntityFactory(); - Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.EMPTY_DN, service.getSchemaManager() ); + Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.ROOT_DSE, service.getSchemaManager() ); AttributeType at = factory.getAttributeType( service.getSchemaManager(), serverEntry, service .getSchemaManager().getRegistries(), "nis" ); @@ -1487,7 +1487,7 @@ public class SubschemaSubentryIT extends assertNotNull( attrs ); SchemaEntityFactory factory = new SchemaEntityFactory(); - Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.EMPTY_DN, service.getSchemaManager() ); + Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.ROOT_DSE, service.getSchemaManager() ); AttributeType at = factory.getAttributeType( service.getSchemaManager(), serverEntry, service .getSchemaManager().getRegistries(), "nis" ); @@ -1551,7 +1551,7 @@ public class SubschemaSubentryIT extends assertNotNull( attrs ); SchemaEntityFactory factory = new SchemaEntityFactory(); - Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.EMPTY_DN, service.getSchemaManager() ); + Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.ROOT_DSE, service.getSchemaManager() ); AttributeType at = factory.getAttributeType( service.getSchemaManager(), serverEntry, service .getSchemaManager().getRegistries(), "nis" ); Modified: directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java (original) +++ directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java Mon Feb 14 17:38:44 2011 @@ -130,7 +130,7 @@ public class LdapJndiProperties if ( url.trim().equals( "" ) ) { - props.providerDn = Dn.EMPTY_DN; + props.providerDn = Dn.ROOT_DSE; } else { Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Mon Feb 14 17:38:44 2011 @@ -80,32 +80,32 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.subtree.SubentryInterceptor; import org.apache.directory.server.core.trigger.TriggerInterceptor; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; import org.apache.directory.shared.ldap.codec.api.LdapCodecService; +import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService; +import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.csn.Csn; import org.apache.directory.shared.ldap.model.csn.CsnFactory; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.exception.LdapNoPermissionException; -import org.apache.directory.shared.ldap.model.ldif.ChangeType; -import org.apache.directory.shared.ldap.model.ldif.LdifEntry; -import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.name.Rdn; -import org.apache.directory.shared.util.exception.NotImplementedException; -import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.cursor.Cursor; import org.apache.directory.shared.ldap.model.entry.DefaultEntry; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.entry.EntryAttribute; import org.apache.directory.shared.ldap.model.entry.Modification; import org.apache.directory.shared.ldap.model.entry.Value; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.model.exception.LdapOperationException; +import org.apache.directory.shared.ldap.model.ldif.ChangeType; +import org.apache.directory.shared.ldap.model.ldif.LdifEntry; import org.apache.directory.shared.ldap.model.ldif.LdifReader; +import org.apache.directory.shared.ldap.model.name.Dn; +import org.apache.directory.shared.ldap.model.name.Rdn; import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.model.schema.SchemaManager; -import org.apache.directory.shared.util.DateUtils; import org.apache.directory.shared.ldap.util.tree.DnNode; +import org.apache.directory.shared.util.DateUtils; import org.apache.directory.shared.util.Strings; +import org.apache.directory.shared.util.exception.NotImplementedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1502,7 +1502,7 @@ public class DefaultDirectoryService imp adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), this ); // @TODO - NOTE: Need to find a way to instantiate without dependency on DPN - partitionNexus = new DefaultPartitionNexus( new DefaultEntry( schemaManager, Dn.EMPTY_DN ) ); + partitionNexus = new DefaultPartitionNexus( new DefaultEntry( schemaManager, Dn.ROOT_DSE ) ); partitionNexus.setDirectoryService( this ); partitionNexus.initialize( ); Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDnFactory.java Mon Feb 14 17:38:44 2011 @@ -78,7 +78,7 @@ public class DefaultDnFactory implements if ( dn.trim().length() == 0 ) { - return Dn.EMPTY_DN; + return Dn.ROOT_DSE; } Dn cachedDn = null; Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Mon Feb 14 17:38:44 2011 @@ -149,7 +149,7 @@ public class DefaultOperationManager imp StringBuilder urlString = new StringBuilder(); - if ( ( ldapUrl.getDn() == null ) || ( ldapUrl.getDn() == Dn.EMPTY_DN ) ) + if ( ( ldapUrl.getDn() == null ) || ( ldapUrl.getDn() == Dn.ROOT_DSE ) ) { ldapUrl.setDn( parentEntry.getDn() ); } Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java Mon Feb 14 17:38:44 2011 @@ -768,7 +768,7 @@ public class AdministrativePointIntercep CoreSession adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService ); - SearchOperationContext searchOperationContext = new SearchOperationContext( adminSession, Dn.EMPTY_DN, filter, + SearchOperationContext searchOperationContext = new SearchOperationContext( adminSession, Dn.ROOT_DSE, filter, controls ); searchOperationContext.setAliasDerefMode( AliasDerefMode.NEVER_DEREF_ALIASES ); Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Mon Feb 14 17:38:44 2011 @@ -191,7 +191,7 @@ public class AciAuthorizationInterceptor CoreSession adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService ); - SearchOperationContext searchOperationContext = new SearchOperationContext( adminSession, Dn.EMPTY_DN, filter, + SearchOperationContext searchOperationContext = new SearchOperationContext( adminSession, Dn.ROOT_DSE, filter, controls ); searchOperationContext.setAliasDerefMode( AliasDerefMode.NEVER_DEREF_ALIASES ); @@ -237,7 +237,7 @@ public class AciAuthorizationInterceptor CoreSession adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService ); - SearchOperationContext searchOperationContext = new SearchOperationContext( adminSession, Dn.EMPTY_DN, filter, + SearchOperationContext searchOperationContext = new SearchOperationContext( adminSession, Dn.ROOT_DSE, filter, controls ); searchOperationContext.setAliasDerefMode( AliasDerefMode.NEVER_DEREF_ALIASES ); Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java Mon Feb 14 17:38:44 2011 @@ -42,8 +42,6 @@ import org.apache.directory.shared.ldap. */ public class RelatedUserClassFilter implements ACITupleFilter { - private static final Dn ROOTDSE_NAME = Dn.EMPTY_DN; - private final SubtreeEvaluator subtreeEvaluator; @@ -169,7 +167,7 @@ public class RelatedUserClassFilter impl { for ( SubtreeSpecification subtreeSpec : subtree.getSubtreeSpecifications() ) { - if ( subtreeEvaluator.evaluate( subtreeSpec, ROOTDSE_NAME, userName, userEntry ) ) + if ( subtreeEvaluator.evaluate( subtreeSpec, Dn.ROOT_DSE, userName, userEntry ) ) { return true; } Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Feb 14 17:38:44 2011 @@ -57,17 +57,10 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.interceptor.context.UnbindOperationContext; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.model.message.extended.NoticeOfDisconnect; -import org.apache.directory.shared.ldap.model.message.controls.Cascade; -import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT; import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue; import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue; import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue; import org.apache.directory.shared.ldap.extras.controls.SyncStateValue; -import org.apache.directory.shared.ldap.model.message.controls.EntryChange; -import org.apache.directory.shared.ldap.model.message.controls.PagedResults; -import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch; -import org.apache.directory.shared.ldap.model.message.controls.Subentries; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.cursor.EmptyCursor; import org.apache.directory.shared.ldap.model.cursor.SingletonCursor; @@ -87,6 +80,13 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.filter.ExprNode; import org.apache.directory.shared.ldap.model.filter.PresenceNode; import org.apache.directory.shared.ldap.model.filter.SearchScope; +import org.apache.directory.shared.ldap.model.message.controls.Cascade; +import org.apache.directory.shared.ldap.model.message.controls.EntryChange; +import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT; +import org.apache.directory.shared.ldap.model.message.controls.PagedResults; +import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch; +import org.apache.directory.shared.ldap.model.message.controls.Subentries; +import org.apache.directory.shared.ldap.model.message.extended.NoticeOfDisconnect; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.name.DnUtils; import org.apache.directory.shared.ldap.model.schema.AttributeType; @@ -760,7 +760,7 @@ public class DefaultPartitionNexus exten // return nothing if ( noAttribute ) { - Entry serverEntry = new DefaultEntry( schemaManager, Dn.EMPTY_DN ); + Entry serverEntry = new DefaultEntry( schemaManager, Dn.ROOT_DSE ); return new BaseEntryFilteringCursor( new SingletonCursor( serverEntry ), searchContext ); } @@ -771,7 +771,7 @@ public class DefaultPartitionNexus exten return new BaseEntryFilteringCursor( new SingletonCursor( rootDSE ), searchContext ); } - Entry serverEntry = new DefaultEntry( schemaManager, Dn.EMPTY_DN ); + Entry serverEntry = new DefaultEntry( schemaManager, Dn.ROOT_DSE ); Entry rootDSE = getRootDSE( new GetRootDSEOperationContext( searchContext.getSession() ) ); Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Mon Feb 14 17:38:44 2011 @@ -394,7 +394,7 @@ public class DefaultSchemaService implem } Set setOids = new HashSet(); - Entry attrs = new DefaultEntry( getSchemaManager(), Dn.EMPTY_DN ); + Entry attrs = new DefaultEntry( getSchemaManager(), Dn.ROOT_DSE ); boolean returnAllOperationalAttributes = false; synchronized( lock ) Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original) +++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Mon Feb 14 17:38:44 2011 @@ -51,7 +51,6 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.partition.ByPassConstants; import org.apache.directory.server.core.partition.PartitionNexus; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.model.message.controls.Subentries; import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator; import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; @@ -77,6 +76,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.filter.SearchScope; import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.controls.Subentries; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.model.subtree.AdministrativeRole; @@ -577,7 +577,7 @@ public class SubentryInterceptor extends } } - Entry attrs = new DefaultEntry( schemaManager, Dn.EMPTY_DN ); + Entry attrs = new DefaultEntry( schemaManager, Dn.ROOT_DSE ); attrs.put( ocFinalState ); return getSubentryAdminRoles( attrs ); } Modified: directory/apacheds/branches/m1/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/apacheds/branches/m1/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original) +++ directory/apacheds/branches/m1/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Mon Feb 14 17:38:44 2011 @@ -54,7 +54,7 @@ public class GetCatalog implements Direc String filter = "(objectClass=" + ApacheSchemaConstants.APACHE_CATALOG_ENTRY_OC + ")"; EntryFilteringCursor list = session.search( - Dn.EMPTY_DN, + Dn.ROOT_DSE, SearchScope.SUBTREE, FilterParser.parse(session.getDirectoryService().getSchemaManager(), filter), AliasDerefMode.DEREF_ALWAYS, Modified: directory/shared/branches/m1/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java (original) +++ directory/shared/branches/m1/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java Mon Feb 14 17:38:44 2011 @@ -109,6 +109,9 @@ public class Dn implements Cloneable, Se /** A null Dn */ public static final Dn EMPTY_DN = new Dn(); + /** The rootDSE */ + public static final Dn ROOT_DSE = new Dn(); + /** the schema manager */ private transient SchemaManager schemaManager; Modified: directory/shared/branches/m1/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1070592&r1=1070591&r2=1070592&view=diff ============================================================================== --- directory/shared/branches/m1/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original) +++ directory/shared/branches/m1/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Mon Feb 14 17:38:44 2011 @@ -137,7 +137,7 @@ public class DefaultSchemaManager implem public DefaultSchemaManager( SchemaLoader loader ) { // Default to the the root (one schemaManager for all the entries - namingContext = Dn.EMPTY_DN; + namingContext = Dn.ROOT_DSE; this.schemaLoader = loader; errors = new ArrayList(); registries = new Registries( this );