Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3ACC5979D for ; Sat, 12 Nov 2011 05:52:02 +0000 (UTC) Received: (qmail 15854 invoked by uid 500); 12 Nov 2011 05:52:02 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 15813 invoked by uid 500); 12 Nov 2011 05:52:02 -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 15806 invoked by uid 99); 12 Nov 2011 05:52:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Nov 2011 05:52:02 +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; Sat, 12 Nov 2011 05:51:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4DD5D23889EC for ; Sat, 12 Nov 2011 05:51:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1201197 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/api/ core-api/src/main/java/org/apache/directory/server/core/api/interceptor/ core-api/src/main/java/org/apache/directory/server/core/api/inter... Date: Sat, 12 Nov 2011 05:51:27 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111112055129.4DD5D23889EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sat Nov 12 05:51:26 2011 New Revision: 1201197 URL: http://svn.apache.org/viewvc?rev=1201197&view=rev Log: Renamed rootDSE to rootDse (as we renamed DN to Dn, etc...) Added: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDseOperationContext.java - copied, changed from r1201184, directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDSEOperationContext.java Removed: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDSEOperationContext.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationEnum.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java Sat Nov 12 05:51:26 2011 @@ -934,7 +934,7 @@ public class LdapCoreSessionConnection i throw new IllegalArgumentException( "The entry Dn must not be null" ); } - if ( entryDn.isRootDSE() ) + if ( entryDn.isRootDse() ) { throw new IllegalArgumentException( "The RootDSE cannot be moved" ); } @@ -944,7 +944,7 @@ public class LdapCoreSessionConnection i throw new IllegalArgumentException( "The new Dn must not be null" ); } - if ( newDn.isRootDSE() ) + if ( newDn.isRootDse() ) { throw new IllegalArgumentException( "The RootDSE cannot be the target" ); } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationEnum.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationEnum.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationEnum.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationEnum.java Sat Nov 12 05:51:26 2011 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.server.core.api; @@ -25,67 +25,67 @@ package org.apache.directory.server.core * @author Apache Directory Project */ public enum OperationEnum { - ADD( "add" ), - BIND( "bind" ), - COMPARE( "compare" ), - DELETE( "delete" ), - GET_ROOT_DSE( "getRootDSE" ), - HAS_ENTRY( "hasEntry" ), - LIST( "list" ), - LOOKUP( "lookup" ), - MODIFY( "modify" ), - MOVE( "move" ), - MOVE_AND_RENAME( "moveAndRename" ), - RENAME( "rename" ), - SEARCH( "search" ), - UNBIND( "unbind" ); - - /** The associated method name */ - private String methodName; - - /** A list of all the operations */ - private static OperationEnum[] operations = new OperationEnum[] - { - ADD, - BIND, - COMPARE, - DELETE, - GET_ROOT_DSE, - HAS_ENTRY, - LIST, - LOOKUP, - MODIFY, - MOVE, - MOVE_AND_RENAME, - RENAME, - SEARCH, - UNBIND - }; - - /** - * The private constructor - * @param methodName The associated method name - */ - private OperationEnum( String methodName ) - { - this.methodName = methodName; - } - - - /** - * @return The associated method name - */ - public String getMethodName() - { - return methodName; - } - - - /** - * @return The list of all the operations - */ - public static OperationEnum[] getOperations() - { - return operations; - } + ADD( "add" ), + BIND( "bind" ), + COMPARE( "compare" ), + DELETE( "delete" ), + GET_ROOT_DSE( "getRootDse" ), + HAS_ENTRY( "hasEntry" ), + LIST( "list" ), + LOOKUP( "lookup" ), + MODIFY( "modify" ), + MOVE( "move" ), + MOVE_AND_RENAME( "moveAndRename" ), + RENAME( "rename" ), + SEARCH( "search" ), + UNBIND( "unbind" ); + + /** The associated method name */ + private String methodName; + + /** A list of all the operations */ + private static OperationEnum[] operations = new OperationEnum[] + { + ADD, + BIND, + COMPARE, + DELETE, + GET_ROOT_DSE, + HAS_ENTRY, + LIST, + LOOKUP, + MODIFY, + MOVE, + MOVE_AND_RENAME, + RENAME, + SEARCH, + UNBIND + }; + + /** + * The private constructor + * @param methodName The associated method name + */ + private OperationEnum( String methodName ) + { + this.methodName = methodName; + } + + + /** + * @return The associated method name + */ + public String getMethodName() + { + return methodName; + } + + + /** + * @return The list of all the operations + */ + public static OperationEnum[] getOperations() + { + return operations; + } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/OperationManager.java Sat Nov 12 05:51:26 2011 @@ -26,7 +26,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; @@ -57,13 +57,13 @@ public interface OperationManager /** - * Get the RooDSE entry. + * Get the RooDse entry. * - * @param getRootDseContext The getRootDSE() context - * @return The rootDSE if found - * @throws LdapException If we can't get back the rootDSE entry + * @param getRootDseContext The getRootDse() context + * @return The rootDse if found + * @throws LdapException If we can't get back the rootDse entry */ - Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException; + Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException; /** Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java Sat Nov 12 05:51:26 2011 @@ -31,7 +31,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; @@ -181,9 +181,9 @@ public abstract class BaseInterceptor im /** * {@inheritDoc} */ - public Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException + public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException { - return nexus.getRootDSE( getRootDseContext ); + return nexus.getRootDse( getRootDseContext ); } @@ -469,7 +469,7 @@ public abstract class BaseInterceptor im /** * {@inheritDoc} */ - public Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException + public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException { // Nothing to do return null; @@ -483,11 +483,11 @@ public abstract class BaseInterceptor im * @return the rootDSE * @throws LdapException If something went wrong */ - protected final Entry next( GetRootDSEOperationContext getRootDseContext ) throws LdapException + protected final Entry next( GetRootDseOperationContext getRootDseContext ) throws LdapException { Interceptor interceptor = getNextInterceptor( getRootDseContext ); - return interceptor.getRootDSE( getRootDseContext ); + return interceptor.getRootDse( getRootDseContext ); } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/Interceptor.java Sat Nov 12 05:51:26 2011 @@ -27,7 +27,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; @@ -154,13 +154,13 @@ public interface Interceptor /** - * Filters {@link DefaultPartitionNexus#getRootDSE( GetRootDseOperationContext )} call. + * Filters {@link DefaultPartitionNexus#getRootDse( GetRootDseOperationContext )} call. * * @param getRootDseContext The getRoot() operation context * @return The RootDSE entry, if found * @throws LdapException If we can't get back the RootDSE entry */ - Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException; + Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException; /** Copied: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDseOperationContext.java (from r1201184, directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDSEOperationContext.java) URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDseOperationContext.java?p2=directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDseOperationContext.java&p1=directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDSEOperationContext.java&r1=1201184&r2=1201197&rev=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDSEOperationContext.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDseOperationContext.java Sat Nov 12 05:51:26 2011 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.server.core.api.interceptor.context; @@ -26,17 +26,17 @@ import org.apache.directory.shared.ldap. /** - * A GetRootDSE context used for Interceptors. It contains all the informations - * needed for the getRootDSE operation, and used by all the interceptors + * A GetRootDse context used for Interceptors. It contains all the informations + * needed for the getRootDse operation, and used by all the interceptors * * @author Apache Directory Project */ -public class GetRootDSEOperationContext extends AbstractOperationContext +public class GetRootDseOperationContext extends AbstractOperationContext { /** - * Creates a new instance of GetRootDSEOperationContext. + * Creates a new instance of GetRootDseOperationContext. */ - public GetRootDSEOperationContext( CoreSession session ) + public GetRootDseOperationContext( CoreSession session ) { super( session ); setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.GET_ROOT_DSE ) ); @@ -44,11 +44,11 @@ public class GetRootDSEOperationContext /** - * Creates a new instance of GetRootDSEOperationContext. + * Creates a new instance of GetRootDseOperationContext. * - * @param dn The entry Dn used to get the rootDSE + * @param dn The entry Dn used to get the rootDse */ - public GetRootDSEOperationContext( CoreSession session, Dn dn ) + public GetRootDseOperationContext( CoreSession session, Dn dn ) { super( session, dn ); setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.GET_ROOT_DSE ) ); @@ -60,7 +60,7 @@ public class GetRootDSEOperationContext */ public String getName() { - return "GetRootDSE"; + return "GetRootDse"; } @@ -69,6 +69,6 @@ public class GetRootDSEOperationContext */ public String toString() { - return "GetRootDSEContext with Dn '" + getDn().getName() + "'"; + return "GetRootDseContext with Dn '" + getDn().getName() + "'"; } } Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java (original) +++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java Sat Nov 12 05:51:26 2011 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import java.util.Set; import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.name.Dn; @@ -55,7 +55,7 @@ public interface PartitionNexus extends * * @return the attributes of the RootDSE */ - public Entry getRootDSE( GetRootDSEOperationContext getRootDSEContext ); + public Entry getRootDse( GetRootDseOperationContext getRootDseContext ); /** Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockInterceptor.java Sat Nov 12 05:51:26 2011 @@ -29,7 +29,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; @@ -120,7 +120,7 @@ public class MockInterceptor extends Bas /** * {@inheritDoc} */ - public Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException + public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException { interceptors.add( this ); return next( getRootDseContext ); Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java (original) +++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java Sat Nov 12 05:51:26 2011 @@ -27,7 +27,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; @@ -68,7 +68,7 @@ public class MockOperationManager implem { } - public Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException + public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException { return null; } Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java Sat Nov 12 05:51:26 2011 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.server.core.authz; @@ -72,7 +72,7 @@ public class AuthzAuthnIT extends Abstra * @throws Exception if the test encounters an error */ @Test - public void testAuthnWithRootDSE() throws Exception + public void testAuthnWithRootDse() throws Exception { createUser( "billyd", "billyd" ); @@ -122,21 +122,21 @@ public class AuthzAuthnIT extends Abstra // Note: In order to read contents of the bound context // user will need appropriate Read permissions. createAccessControlSubentry( "grantBrowseForTheWholeNamingContext", "{ maximum 0 }", // !!!!! Replace this with "{ minimum 1 }" for practicing ! - "{ " + - " identificationTag \"browseACI\", " + - " precedence 14, " + + "{ " + + " identificationTag \"browseACI\", " + + " precedence 14, " + " authenticationLevel none, " + - " itemOrUserFirst userFirst: " + + " itemOrUserFirst userFirst: " + " { " + - " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " + + " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " + " userPermissions " + - " { " + - " { " + + " { " + + " { " + " protectedItems { entry }, " + - " grantsAndDenials { grantBrowse } " + - " } " + - " } " + - " } " + + " grantsAndDenials { grantBrowse } " + + " } " + + " } " + + " } " + "}" ); Dn userName = new Dn( "uid=billyd,ou=users,ou=system" ); Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Sat Nov 12 05:51:26 2011 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.server.core.authz.support; @@ -113,7 +113,7 @@ public class MaxImmSubFilterTest extends @Test - public void testRootDSE() throws Exception + public void testRootDse() throws Exception { MaxImmSubFilter filter = new MaxImmSubFilter( schemaManager ); Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java Sat Nov 12 05:51:26 2011 @@ -21,7 +21,7 @@ package org.apache.directory.server.core import static org.junit.Assert.assertNotNull; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.model.entry.Entry; @@ -41,12 +41,12 @@ public class GetRootDsePerfIT extends Ab * A GetRootDSE performance test */ @Test - public void testPerfGetRootDSE() throws Exception + public void testPerfGetRootDse() throws Exception { - GetRootDSEOperationContext getRootDseContext = new GetRootDSEOperationContext( getService().getAdminSession() ); - Entry rootDSE = getService().getOperationManager().getRootDSE( getRootDseContext ); + GetRootDseOperationContext getRootDseContext = new GetRootDseOperationContext( getService().getAdminSession() ); + Entry rootDse = getService().getOperationManager().getRootDse( getRootDseContext ); - assertNotNull( rootDSE ); + assertNotNull( rootDse ); int nbIterations = 150000; long t0 = System.currentTimeMillis(); @@ -68,7 +68,7 @@ public class GetRootDsePerfIT extends Ab t00 = System.currentTimeMillis(); } - rootDSE = getService().getOperationManager().getRootDSE( getRootDseContext ); + rootDse = getService().getOperationManager().getRootDse( getRootDseContext ); } long t1 = System.currentTimeMillis(); Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java Sat Nov 12 05:51:26 2011 @@ -120,8 +120,8 @@ public final class PartitionIT extends A * Confirm presence and publishing of foo and bar partitions as * namingContexts as values innamingContexts attribute of the rootDSE */ - LdapContext rootDSE = getRootContext( getService() ); - Attribute namingContexts = rootDSE.getAttributes( "", new String[] + LdapContext rootDse = getRootContext( getService() ); + Attribute namingContexts = rootDse.getAttributes( "", new String[] { "namingContexts" } ).get( "namingContexts" ); assertTrue( namingContexts.contains( "dc=foo,dc=com" ) ); assertTrue( namingContexts.contains( "dc=bar,dc=com" ) ); @@ -143,22 +143,22 @@ public final class PartitionIT extends A */ public void addLookupDelete( String partitionSuffix ) throws Exception { - LdapContext rootDSE = getRootContext( getService() ); + LdapContext rootDse = getRootContext( getService() ); Attributes attrs = new BasicAttributes( "objectClass", "organizationalUnit", true ); attrs.put( "ou", "people" ); String entryDn = "ou=people," + partitionSuffix; - rootDSE.createSubcontext( entryDn, attrs ); + rootDse.createSubcontext( entryDn, attrs ); LOG.debug( "added entry {} to partition {}", entryDn, partitionSuffix ); - Attributes reloaded = rootDSE.getAttributes( entryDn ); + Attributes reloaded = rootDse.getAttributes( entryDn ); assertNotNull( reloaded ); assertTrue( reloaded.get( "ou" ).contains( "people" ) ); LOG.debug( "looked up entry {} from partition {}", entryDn, partitionSuffix ); - rootDSE.destroySubcontext( entryDn ); + rootDse.destroySubcontext( entryDn ); try { - rootDSE.getAttributes( entryDn ); + rootDse.getAttributes( entryDn ); fail( "should never get here" ); } catch ( Exception e ) Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Sat Nov 12 05:51:26 2011 @@ -144,7 +144,7 @@ public class SubschemaSubentryIT extends * @throws NamingException on error */ @Test - public void testRootDSEsSubschemaSubentry() throws Exception + public void testRootDseSubschemaSubentry() throws Exception { assertEquals( GLOBAL_SUBSCHEMA_DN, getSubschemaSubentryDN() ); Attributes subschemaSubentryAttrs = getSubschemaSubentryAttributes(); Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original) +++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sat Nov 12 05:51:26 2011 @@ -60,7 +60,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; @@ -600,16 +600,16 @@ public abstract class ServerContext impl } - protected Entry doGetRootDSEOperation( Dn target ) throws Exception + protected Entry doGetRootDseOperation( Dn target ) throws Exception { - GetRootDSEOperationContext getRootDseContext = new GetRootDSEOperationContext( session, target ); + GetRootDseOperationContext getRootDseContext = new GetRootDseOperationContext( session, target ); getRootDseContext.addRequestControls( convertControls( true, requestControls ) ); // do not reset request controls since this is not an external // operation and not do bother setting the response controls either OperationManager operationManager = service.getOperationManager(); - return operationManager.getRootDSE( getRootDseContext ); + return operationManager.getRootDse( getRootDseContext ); } @@ -1385,7 +1385,7 @@ public abstract class ServerContext impl { if ( name.size() == 0 ) { - serverEntry = doGetRootDSEOperation( target ); + serverEntry = doGetRootDseOperation( target ); } else { Modified: directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java (original) +++ directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java Sat Nov 12 05:51:26 2011 @@ -47,7 +47,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; @@ -115,7 +115,7 @@ public class DefaultPartitionNexus exten private static final String ASF = "Apache Software Foundation"; /** the read only rootDSE attributes */ - private final Entry rootDSE; + private final Entry rootDse; /** The DirectoryService instance */ private DirectoryService directoryService; @@ -151,28 +151,28 @@ public class DefaultPartitionNexus exten * attributes are added to the rootDSE. * * @see Vendor Information - * @param rootDSE the root entry for the DSA + * @param rootDse the root entry for the DSA * @throws javax.naming.Exception on failure to initialize */ - public DefaultPartitionNexus( Entry rootDSE ) throws Exception + public DefaultPartitionNexus( Entry rootDse ) throws Exception { id = ID; suffixDn = null; // setup that root DSE - this.rootDSE = rootDSE; + this.rootDse = rootDse; // Add the basic informations - rootDSE.put( SchemaConstants.SUBSCHEMA_SUBENTRY_AT, ServerDNConstants.CN_SCHEMA_DN ); - rootDSE.put( SchemaConstants.SUPPORTED_LDAP_VERSION_AT, "3" ); - rootDSE.put( SchemaConstants.SUPPORTED_FEATURES_AT, SchemaConstants.FEATURE_ALL_OPERATIONAL_ATTRIBUTES ); - rootDSE.put( SchemaConstants.SUPPORTED_EXTENSION_AT, NoticeOfDisconnect.EXTENSION_OID ); + rootDse.put( SchemaConstants.SUBSCHEMA_SUBENTRY_AT, ServerDNConstants.CN_SCHEMA_DN ); + rootDse.put( SchemaConstants.SUPPORTED_LDAP_VERSION_AT, "3" ); + rootDse.put( SchemaConstants.SUPPORTED_FEATURES_AT, SchemaConstants.FEATURE_ALL_OPERATIONAL_ATTRIBUTES ); + rootDse.put( SchemaConstants.SUPPORTED_EXTENSION_AT, NoticeOfDisconnect.EXTENSION_OID ); // Add the objectClasses - rootDSE.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.EXTENSIBLE_OBJECT_OC ); + rootDse.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.EXTENSIBLE_OBJECT_OC ); // Add the 'vendor' name and version infos - rootDSE.put( SchemaConstants.VENDOR_NAME_AT, ASF ); + rootDse.put( SchemaConstants.VENDOR_NAME_AT, ASF ); Properties props = new Properties(); @@ -185,10 +185,10 @@ public class DefaultPartitionNexus exten LOG.error( I18n.err( I18n.ERR_33 ) ); } - rootDSE.put( SchemaConstants.VENDOR_VERSION_AT, props.getProperty( "apacheds.version", "UNKNOWN" ) ); + rootDse.put( SchemaConstants.VENDOR_VERSION_AT, props.getProperty( "apacheds.version", "UNKNOWN" ) ); // The rootDSE uuid has been randomly created - rootDSE.put( SchemaConstants.ENTRY_UUID_AT, "f290425c-8272-4e62-8a67-92b06f38dbf5" ); + rootDse.put( SchemaConstants.ENTRY_UUID_AT, "f290425c-8272-4e62-8a67-92b06f38dbf5" ); } @@ -205,7 +205,7 @@ public class DefaultPartitionNexus exten while ( ctrlOidItr.hasNext() ) { - rootDSE.add( SchemaConstants.SUPPORTED_CONTROL_AT, ctrlOidItr.next() ); + rootDse.add( SchemaConstants.SUPPORTED_CONTROL_AT, ctrlOidItr.next() ); } schemaManager = directoryService.getSchemaManager(); @@ -216,7 +216,7 @@ public class DefaultPartitionNexus exten Dn adminDn = directoryService.getDnFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN ); adminDn.apply( schemaManager ); - Value attr = rootDSE.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); + Value attr = rootDse.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); subschemSubentryDn = directoryService.getDnFactory().create( attr.getString() ); //initializeSystemPartition( directoryService ); @@ -308,13 +308,13 @@ public class DefaultPartitionNexus exten { partitions.put( key, system ); partitionLookupTree.add( system.getSuffixDn(), system ); - Attribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT ); + Attribute namingContexts = rootDse.get( SchemaConstants.NAMING_CONTEXTS_AT ); if ( namingContexts == null ) { namingContexts = new DefaultAttribute( schemaManager .getAttributeType( SchemaConstants.NAMING_CONTEXTS_AT ), system.getSuffixDn().getName() ); - rootDSE.put( namingContexts ); + rootDse.put( namingContexts ); } else { @@ -443,8 +443,8 @@ public class DefaultPartitionNexus exten // ------------------------------------------------------------------------ // DirectoryPartition Interface Method Implementations // ------------------------------------------------------------------------ - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#add(org.apache.directory.server.core.interceptor.context.AddOperationContext) + /** + * {@inheritDoc} */ public void add( AddOperationContext addContext ) throws LdapException { @@ -456,8 +456,8 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#bind(org.apache.directory.server.core.interceptor.context.BindOperationContext) + /** + * {@inheritDoc} */ public void bind( BindOperationContext bindContext ) throws LdapException { @@ -466,8 +466,8 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#compare(org.apache.directory.server.core.interceptor.context.CompareOperationContext) + /** + * {@inheritDoc} */ public boolean compare( CompareOperationContext compareContext ) throws LdapException { @@ -509,8 +509,8 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#delete(org.apache.directory.server.core.interceptor.context.DeleteOperationContext) + /** + * {@inheritDoc} */ public void delete( DeleteOperationContext deleteContext ) throws LdapException { @@ -531,7 +531,7 @@ public class DefaultPartitionNexus exten LOG.debug( "Check if Dn '" + dn + "' exists." ); } - if ( dn.isRootDSE() ) + if ( dn.isRootDse() ) { return true; } @@ -562,17 +562,17 @@ public class DefaultPartitionNexus exten if ( dn.equals( subschemSubentryDn ) ) { - return new ClonedServerEntry( rootDSE.clone() ); + return new ClonedServerEntry( rootDse.clone() ); } // This is for the case we do a lookup on the rootDSE if ( dn.size() == 0 ) { - Entry retval = new ClonedServerEntry( rootDSE ); + Entry retval = new ClonedServerEntry( rootDse ); if ( ( lookupContext.getAttrsId() != null ) && !lookupContext.getAttrsId().isEmpty() ) { - for ( Attribute attribute : rootDSE.getAttributes() ) + for ( Attribute attribute : rootDse.getAttributes() ) { AttributeType attributeType = attribute.getAttributeType(); String oid = attributeType.getOid(); @@ -587,7 +587,7 @@ public class DefaultPartitionNexus exten } else { - return new ClonedServerEntry( rootDSE ); + return new ClonedServerEntry( rootDse ); } } @@ -665,7 +665,7 @@ public class DefaultPartitionNexus exten } - private EntryFilteringCursor searchRootDSE( SearchOperationContext searchContext ) throws LdapException + private EntryFilteringCursor searchRootDse( SearchOperationContext searchContext ) throws LdapException { SearchControls searchControls = searchContext.getSearchControls(); @@ -677,8 +677,8 @@ public class DefaultPartitionNexus exten // ----------------------------------------------------------- if ( ( ids == null ) || ( ids.length == 0 ) ) { - Entry rootDSE = getRootDSE( null ); - return new BaseEntryFilteringCursor( new SingletonCursor( rootDSE ), searchContext ); + Entry rootDse = getRootDse( null ); + return new BaseEntryFilteringCursor( new SingletonCursor( rootDse ), searchContext ); } // ----------------------------------------------------------- @@ -715,15 +715,15 @@ public class DefaultPartitionNexus exten // return everything if ( allUserAttributes && allOperationalAttributes ) { - Entry rootDSE = getRootDSE( null ); - return new BaseEntryFilteringCursor( new SingletonCursor( rootDSE ), searchContext ); + Entry rootDse = getRootDse( null ); + return new BaseEntryFilteringCursor( new SingletonCursor( rootDse ), searchContext ); } Entry serverEntry = new DefaultEntry( schemaManager, Dn.ROOT_DSE ); - Entry rootDSE = getRootDSE( new GetRootDSEOperationContext( searchContext.getSession() ) ); + Entry rootDse = getRootDse( new GetRootDseOperationContext( searchContext.getSession() ) ); - for ( Attribute attribute : rootDSE ) + for ( Attribute attribute : rootDse ) { AttributeType type = schemaManager.lookupAttributeTypeRegistry( attribute.getUpId() ); @@ -745,8 +745,8 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#search(org.apache.directory.server.core.interceptor.context.SearchOperationContext) + /** + * {@inheritDoc} */ public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException { @@ -783,7 +783,7 @@ public class DefaultPartitionNexus exten */ if ( ( filter instanceof PresenceNode ) && isObjectScope && isSearchAll ) { - return searchRootDSE( searchContext ); + return searchRootDse( searchContext ); } else if ( isObjectScope && ( !isSearchAll ) ) { @@ -845,8 +845,8 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#unbind(org.apache.directory.server.core.interceptor.context.UnbindOperationContext) + /** + * {@inheritDoc} */ public void unbind( UnbindOperationContext unbindContext ) throws LdapException { @@ -855,17 +855,17 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#getRootDSE(org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext) + /** + * {@inheritDoc} */ - public Entry getRootDSE( GetRootDSEOperationContext getRootDSEContext ) + public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) { - return rootDSE.clone(); + return rootDse.clone(); } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#addContextPartition(org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext) + /** + * {@inheritDoc} */ public synchronized void addContextPartition( Partition partition ) throws LdapException { @@ -894,13 +894,13 @@ public class DefaultPartitionNexus exten partitions.put( partitionSuffix.getNormName(), partition ); partitionLookupTree.add( partition.getSuffixDn(), partition ); - Attribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT ); + Attribute namingContexts = rootDse.get( SchemaConstants.NAMING_CONTEXTS_AT ); if ( namingContexts == null ) { namingContexts = new DefaultAttribute( schemaManager .lookupAttributeTypeRegistry( SchemaConstants.NAMING_CONTEXTS_AT ), partitionSuffix.getName() ); - rootDSE.put( namingContexts ); + rootDse.put( namingContexts ); } else { @@ -910,8 +910,8 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#removeContextPartition(Dn partitionDN) + /** + * {@inheritDoc} */ public synchronized void removeContextPartition( Dn partitionDn ) throws LdapException @@ -933,7 +933,7 @@ public class DefaultPartitionNexus exten // Retrieve the namingContexts from the RootDSE : the partition // suffix must be present in those namingContexts - Attribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT ); + Attribute namingContexts = rootDse.get( SchemaConstants.NAMING_CONTEXTS_AT ); if ( namingContexts != null ) { @@ -968,8 +968,8 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#getPartition(org.apache.directory.shared.ldap.model.name.Dn) + /** + * {@inheritDoc} */ public Partition getPartition( Dn dn ) throws LdapException { @@ -1010,17 +1010,17 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#registerSupportedExtensions(java.util.Set) + /** + * {@inheritDoc} */ public void registerSupportedExtensions( Set extensionOids ) throws LdapException { - Attribute supportedExtension = rootDSE.get( SchemaConstants.SUPPORTED_EXTENSION_AT ); + Attribute supportedExtension = rootDse.get( SchemaConstants.SUPPORTED_EXTENSION_AT ); if ( supportedExtension == null ) { - rootDSE.put( SchemaConstants.SUPPORTED_EXTENSION_AT, (String)null ); - supportedExtension = rootDSE.get( SchemaConstants.SUPPORTED_EXTENSION_AT ); + rootDse.put( SchemaConstants.SUPPORTED_EXTENSION_AT, (String)null ); + supportedExtension = rootDse.get( SchemaConstants.SUPPORTED_EXTENSION_AT ); } for ( String extensionOid : extensionOids ) @@ -1030,8 +1030,8 @@ public class DefaultPartitionNexus exten } - /* (non-Javadoc) - * @see org.apache.directory.server.core.partition.PartitionNexus#registerSupportedSaslMechanisms(java.util.Set) + /** + * {@inheritDoc} */ public void registerSupportedSaslMechanisms( Set supportedSaslMechanisms ) throws LdapException { @@ -1044,7 +1044,7 @@ public class DefaultPartitionNexus exten supportedSaslMechanismsAt.add( saslMechanism ); } - rootDSE.add( supportedSaslMechanismsAt ); + rootDse.add( supportedSaslMechanismsAt ); } @@ -1063,7 +1063,7 @@ public class DefaultPartitionNexus exten */ private void unregister( Partition partition ) throws Exception { - Attribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT ); + Attribute namingContexts = rootDse.get( SchemaConstants.NAMING_CONTEXTS_AT ); if ( namingContexts != null ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sat Nov 12 05:51:26 2011 @@ -1836,7 +1836,7 @@ public class DefaultDirectoryService imp if( changeLog.isExposed() && changeLog.isTagSearchSupported() ) { String clSuffix = ( ( TaggableSearchableChangeLogStore ) changeLog.getChangeLogStore() ).getPartition().getSuffixDn().getName(); - partitionNexus.getRootDSE( null ).add( SchemaConstants.CHANGELOG_CONTEXT_AT, clSuffix ); + partitionNexus.getRootDse( null ).add( SchemaConstants.CHANGELOG_CONTEXT_AT, clSuffix ); } } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Sat Nov 12 05:51:26 2011 @@ -33,7 +33,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; @@ -501,17 +501,17 @@ public class DefaultOperationManager imp /** * {@inheritDoc} */ - public Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException + public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException { - LOG.debug( ">> GetRootDSEOperation : {}", getRootDseContext ); + LOG.debug( ">> GetRootDseOperation : {}", getRootDseContext ); ensureStarted(); Interceptor head = directoryService.getInterceptor( getRootDseContext.getNextInterceptor() ); - Entry root = head.getRootDSE( getRootDseContext ); + Entry root = head.getRootDse( getRootDseContext ); - LOG.debug( "<< getRootDSEOperation successful" ); + LOG.debug( "<< getRootDseOperation successful" ); return root; } Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original) +++ directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Sat Nov 12 05:51:26 2011 @@ -56,7 +56,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext; @@ -713,7 +713,7 @@ public class AuthenticationInterceptor e /** * {@inheritDoc} */ - public Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException + public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException { if ( IS_DEBUG ) { Modified: directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original) +++ directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Sat Nov 12 05:51:26 2011 @@ -287,7 +287,7 @@ public class AciAuthorizationInterceptor engine = new ACDFEngine( schemaManager ); // stuff for dealing with subentries (garbage for now) - Value subschemaSubentry = directoryService.getPartitionNexus().getRootDSE( null ).get( + Value subschemaSubentry = directoryService.getPartitionNexus().getRootDse( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); Dn subschemaSubentryDnName = directoryService.getDnFactory().create( subschemaSubentry.getString() ); subschemaSubentryDn = subschemaSubentryDnName.getNormName(); @@ -711,13 +711,13 @@ public class AciAuthorizationInterceptor if ( !directoryService.isAccessControlEnabled() ) { - return ( dn.isRootDSE() || next( hasEntryContext ) ); + return ( dn.isRootDse() || next( hasEntryContext ) ); } boolean answer = next( hasEntryContext ); // no checks on the RootDSE - if ( dn.isRootDSE() ) + if ( dn.isRootDse() ) { // No need to go down to the stack, if the dn is empty // It's the rootDSE, and it exists ! @@ -1235,11 +1235,11 @@ public class AciAuthorizationInterceptor boolean isSubschemaSubentryLookup = subschemaSubentryDn.equals( searchContext.getDn().getNormName() ); SearchControls searchCtls = searchContext.getSearchControls(); - boolean isRootDSELookup = searchContext.getDn().size() == 0 + boolean isRootDseLookup = searchContext.getDn().size() == 0 && searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE; if ( isPrincipalAnAdministrator( principalDn ) - || !directoryService.isAccessControlEnabled() || isRootDSELookup + || !directoryService.isAccessControlEnabled() || isRootDseLookup || isSubschemaSubentryLookup ) { return cursor; @@ -1270,7 +1270,7 @@ public class AciAuthorizationInterceptor Dn dn = lookupContext.getDn(); // no permissions checks on the RootDSE - if ( dn.isRootDSE() ) + if ( dn.isRootDse() ) { return; } Modified: directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original) +++ directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Sat Nov 12 05:51:26 2011 @@ -83,7 +83,7 @@ public class MaxImmSubFilter implements { ACI_LOG.debug( "Filtering MaxImmSub..." ); - if ( aciContext.getEntryDn().isRootDSE() ) + if ( aciContext.getEntryDn().isRootDse() ) { return aciContext.getAciTuples(); } Modified: directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original) +++ directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Sat Nov 12 05:51:26 2011 @@ -103,7 +103,7 @@ public class ExceptionInterceptor extend { super.init( directoryService ); nexus = directoryService.getPartitionNexus(); - Value attr = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); + Value attr = nexus.getRootDse( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); subschemSubentryDn = directoryService.getDnFactory().create( attr.getString() ); } Modified: directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java (original) +++ directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java Sat Nov 12 05:51:26 2011 @@ -29,7 +29,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.api.interceptor.context.BindOperationContext; import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext; import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext; -import org.apache.directory.server.core.api.interceptor.context.GetRootDSEOperationContext; +import org.apache.directory.server.core.api.interceptor.context.GetRootDseOperationContext; import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext; import org.apache.directory.server.core.api.interceptor.context.ListOperationContext; import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext; @@ -87,9 +87,9 @@ public class TimerInterceptor extends Ba private static AtomicLong totalDelete = new AtomicLong( 0 ); private static AtomicInteger nbDeleteCalls = new AtomicInteger( 0 ); - /** Stats for the GetRootDSE operation */ - private static AtomicLong totalGetRootDSE = new AtomicLong( 0 ); - private static AtomicInteger nbGetRootDSECalls = new AtomicInteger( 0 ); + /** Stats for the GetRootDse operation */ + private static AtomicLong totalGetRootDse = new AtomicLong( 0 ); + private static AtomicInteger nbGetRootDseCalls = new AtomicInteger( 0 ); /** Stats for the HasEntry operation */ private static AtomicLong totalHasEntry = new AtomicLong( 0 ); @@ -281,21 +281,21 @@ public class TimerInterceptor extends Ba /** * {@inheritDoc} */ - public Entry getRootDSE( GetRootDSEOperationContext getRootDseContext ) throws LdapException + public Entry getRootDse( GetRootDseOperationContext getRootDseContext ) throws LdapException { long t0 = System.nanoTime(); - Entry rootDSE = next( getRootDseContext ); + Entry rootDse = next( getRootDseContext ); long delta = System.nanoTime() - t0; if ( IS_DEBUG_STATS ) { - nbGetRootDSECalls.incrementAndGet(); - totalGetRootDSE.getAndAdd( delta ); + nbGetRootDseCalls.incrementAndGet(); + totalGetRootDse.getAndAdd( delta ); - if ( nbGetRootDSECalls.get() % 1000 == 0 ) + if ( nbGetRootDseCalls.get() % 1000 == 0 ) { - long average = totalGetRootDSE.get()/(nbGetRootDSECalls.get() * 1000); - OPERATION_STATS.debug( name + " : Average getRootDSE = {} microseconds, nb getRootDSEs = {}", average, nbGetRootDSECalls.get() ); + long average = totalGetRootDse.get()/(nbGetRootDseCalls.get() * 1000); + OPERATION_STATS.debug( name + " : Average getRootDSE = {} microseconds, nb getRootDSEs = {}", average, nbGetRootDseCalls.get() ); } } @@ -304,7 +304,7 @@ public class TimerInterceptor extends Ba OPERATION_TIME.debug( "{} : Delta getRootDSE = {}", name, delta ); } - return rootDSE; + return rootDse; } Modified: directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original) +++ directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Sat Nov 12 05:51:26 2011 @@ -132,7 +132,7 @@ public class OperationalAttributeInterce super.init( directoryService ); // stuff for dealing with subentries (garbage for now) - Value subschemaSubentry = directoryService.getPartitionNexus().getRootDSE( null ).get( + Value subschemaSubentry = directoryService.getPartitionNexus().getRootDse( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); subschemaSubentryDn = directoryService.getDnFactory().create( subschemaSubentry.getString() ); Modified: directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original) +++ directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Sat Nov 12 05:51:26 2011 @@ -202,7 +202,7 @@ public class ReferralInterceptor extends referralManager = new ReferralManagerImpl( directoryService ); directoryService.setReferralManager( referralManager ); - Value subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); + Value subschemaSubentry = nexus.getRootDse( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); subschemaSubentryDn = directoryService.getDnFactory().create( subschemaSubentry.getString() ); } Modified: directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original) +++ directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Sat Nov 12 05:51:26 2011 @@ -182,7 +182,7 @@ public class SchemaInterceptor extends B schemaBaseDn = directoryService.getDnFactory().create( SchemaConstants.OU_SCHEMA ); // stuff for dealing with subentries (garbage for now) - Value subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); + Value subschemaSubentry = nexus.getRootDse( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); subschemaSubentryDn = directoryService.getDnFactory().create( subschemaSubentry.getString() ); subschemaSubentryDn.apply( schemaManager ); subschemaSubentryDnNorm = subschemaSubentryDn.getNormName(); Modified: directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original) +++ directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sat Nov 12 05:51:26 2011 @@ -859,7 +859,7 @@ public class SubentryInterceptor extends // get the name of the administrative point and its administrativeRole attributes // The AP must be the parent Dn, but we also have to check that the given Dn // is not the rootDSE or a NamingContext - if ( dn.isRootDSE() || isNamingContext( dn ) ) + if ( dn.isRootDse() || isNamingContext( dn ) ) { // Not allowed : we can't get a parent in those cases throw new LdapOtherException( "Cannot find an AdministrativePoint for " + dn ); Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java (original) +++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java Sat Nov 12 05:51:26 2011 @@ -145,7 +145,7 @@ public class SaslGssapiBindITest extends protected LdapContext sysRoot; /** the context root for the rootDSE */ - protected CoreSession rootDSE; + protected CoreSession rootDse; /** * Creates a new instance of SaslGssapiBindTest and sets JAAS system properties. @@ -406,7 +406,7 @@ public class SaslGssapiBindITest extends sysRoot = new InitialLdapContext( envFinal, null ); envFinal.put( Context.PROVIDER_URL, "" ); - rootDSE = getService().getAdminSession(); + rootDse = getService().getAdminSession(); envFinal.put( Context.PROVIDER_URL, SchemaConstants.OU_SCHEMA ); schemaRoot = new InitialLdapContext( envFinal, null ); Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Sat Nov 12 05:51:26 2011 @@ -245,18 +245,18 @@ public class SearchHandler extends LdapR // Position the cursor at the beginning cursor.beforeFirst(); - boolean hasRootDSE = false; + boolean hasRootDse = false; while ( cursor.next() ) { - if ( hasRootDSE ) + if ( hasRootDse ) { // This is an error ! We should never find more than one rootDSE ! LOG.error( I18n.err( I18n.ERR_167 ) ); } else { - hasRootDSE = true; + hasRootDse = true; Entry entry = cursor.get(); session.getIoSession().write( generateResponse( session, req, entry ) ); } @@ -1019,7 +1019,7 @@ public class SearchHandler extends LdapR // =============================================================== // Handle search in rootDSE differently. // =============================================================== - if ( isRootDSESearch( req ) ) + if ( isRootDseSearch( req ) ) { handleRootDseSearch( session, req ); @@ -1297,11 +1297,11 @@ public class SearchHandler extends LdapR * @param req the request issued * @return true if the search is on the RootDSE false otherwise */ - private boolean isRootDSESearch( SearchRequest req ) + private boolean isRootDseSearch( SearchRequest req ) { boolean isBaseIsRoot = req.getBase().isEmpty(); boolean isBaseScope = req.getScope() == SearchScope.OBJECT; - boolean isRootDSEFilter = false; + boolean isRootDseFilter = false; if ( req.getFilter() instanceof PresenceNode ) { @@ -1310,17 +1310,17 @@ public class SearchHandler extends LdapR if ( filter.isSchemaAware() ) { AttributeType attributeType = ( (PresenceNode) req.getFilter() ).getAttributeType(); - isRootDSEFilter = attributeType.equals( OBJECT_CLASS_AT ); + isRootDseFilter = attributeType.equals( OBJECT_CLASS_AT ); } else { String attribute = ( ( PresenceNode ) req.getFilter() ).getAttribute(); - isRootDSEFilter = attribute.equalsIgnoreCase( SchemaConstants.OBJECT_CLASS_AT ) + isRootDseFilter = attribute.equalsIgnoreCase( SchemaConstants.OBJECT_CLASS_AT ) || attribute.equals( SchemaConstants.OBJECT_CLASS_AT_OID ); } } - return isBaseIsRoot && isBaseScope && isRootDSEFilter; + return isBaseIsRoot && isBaseScope && isRootDseFilter; } @@ -1354,7 +1354,7 @@ public class SearchHandler extends LdapR DirectoryService ds = session.getCoreSession().getDirectoryService(); PartitionNexus nexus = ds.getPartitionNexus(); - Value subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); + Value subschemaSubentry = nexus.getRootDse( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get(); Dn subschemaSubentryDn = new Dn( ds.getSchemaManager(), subschemaSubentry.getString() ); String subschemaSubentryDnNorm = subschemaSubentryDn.getNormName(); Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Sat Nov 12 05:51:26 2011 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.server.operations.bind; @@ -81,28 +81,28 @@ import org.junit.runner.RunWith; * * @author Apache Directory Project */ -@RunWith ( FrameworkRunner.class ) +@RunWith ( FrameworkRunner.class ) @CreateDS( allowAnonAccess=true, name="MiscBindIT-class", partitions = { @CreatePartition( name = "example", suffix = "dc=aPache,dc=org", - contextEntry = @ContextEntry( + contextEntry = @ContextEntry( entryLdif = "dn: dc=aPache,dc=org\n" + "dc: aPache\n" + "objectClass: top\n" + "objectClass: domain\n\n" ), - indexes = + indexes = { @CreateIndex( attribute = "objectClass" ), @CreateIndex( attribute = "dc" ), @CreateIndex( attribute = "ou" ) } ) }) -@CreateLdapServer ( - transports = +@CreateLdapServer ( + transports = { @CreateTransport( protocol = "LDAP" ) }) @@ -199,7 +199,7 @@ public class MiscBindIT extends Abstract * @throws Exception if anything goes wrong */ @Test - public void testEnableAnonymousBindsOnRootDSE() throws Exception + public void testEnableAnonymousBindsOnRootDse() throws Exception { getLdapServer().getDirectoryService().setAllowAnonymousAccess( true ); Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java?rev=1201197&r1=1201196&r2=1201197&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java Sat Nov 12 05:51:26 2011 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.server.operations.bind; @@ -68,12 +68,12 @@ import org.junit.runner.RunWith; @ApplyLdifs( { // Entry # 1 - "dn: uid=hnelson,ou=users,ou=system", - "objectClass: inetOrgPerson", + "dn: uid=hnelson,ou=users,ou=system", + "objectClass: inetOrgPerson", "objectClass: organizationalPerson", - "objectClass: person", - "objectClass: top", - "userPassword: secret", + "objectClass: person", + "objectClass: top", + "userPassword: secret", "uid: hnelson", "cn: Horatio Nelson", "sn: Nelson" }) @@ -398,7 +398,7 @@ public class SimpleBindIT extends Abstra * The configuration for this test case MUST disable anonymous access. */ @Test - public void testAnonymousRootDSESearch() + public void testAnonymousRootDseSearch() { boolean oldValue = getLdapServer().getDirectoryService().isAllowAnonymousAccess();