directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1201364 [1/3] - in /directory/apacheds/branches/apacheds-osgi: all/ apache-felix/ core-annotations/ core-avl/ core-constants/ core-integ/ core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/ core-integ/src/test/java/org...
Date Sun, 13 Nov 2011 00:01:55 GMT
Author: elecharny
Date: Sun Nov 13 00:01:54 2011
New Revision: 1201364

URL: http://svn.apache.org/viewvc?rev=1201364&view=rev
Log:
Merged trunk into the osgi branch

Removed:
    directory/apacheds/branches/apacheds-osgi/core/src/test/java/org/apache/directory/server/core/interceptor/
Modified:
    directory/apacheds/branches/apacheds-osgi/all/   (props changed)
    directory/apacheds/branches/apacheds-osgi/apache-felix/   (props changed)
    directory/apacheds/branches/apacheds-osgi/core/   (props changed)
    directory/apacheds/branches/apacheds-osgi/core-annotations/   (props changed)
    directory/apacheds/branches/apacheds-osgi/core-avl/   (props changed)
    directory/apacheds/branches/apacheds-osgi/core-constants/   (props changed)
    directory/apacheds/branches/apacheds-osgi/core-integ/   (props changed)
    directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
    directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
    directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java   (props changed)
    directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java
    directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java
    directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
    directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/branches/apacheds-osgi/core-jndi/   (props changed)
    directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
    directory/apacheds/branches/apacheds-osgi/core-shared/   (props changed)
    directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
    directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
    directory/apacheds/branches/apacheds-osgi/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/branches/apacheds-osgi/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/branches/apacheds-osgi/dependencies/   (props changed)
    directory/apacheds/branches/apacheds-osgi/http-directory-bridge/   (props changed)
    directory/apacheds/branches/apacheds-osgi/http-integration/   (props changed)
    directory/apacheds/branches/apacheds-osgi/i18n/   (props changed)
    directory/apacheds/branches/apacheds-osgi/installers/   (props changed)
    directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/   (props changed)

Propchange: directory/apacheds/branches/apacheds-osgi/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
 /directory/apacheds/branches/milestones/all:1072812-1075328
-/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201342
 /directory/studio/trunk/all:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/apache-felix/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -0,0 +1,10 @@
+/directory/apacheds/branches/apacheds-codec-merge/apache-felix:982369-987590
+/directory/apacheds/branches/apacheds-config/apache-felix:1023442-1029077
+/directory/apacheds/branches/apacheds-kerberos-codec-2.0/apache-felix:1040956-1043765
+/directory/apacheds/branches/apacheds-replication/apache-felix:749790-764110
+/directory/apacheds/branches/apacheds-schema/apache-felix:806623-896441
+/directory/apacheds/branches/apacheds-subtree/apache-felix:965203-965686
+/directory/apacheds/branches/milestones/apache-felix:1072812-1075328
+/directory/apacheds/branches/xdbm-refactoring/apache-felix:945827-946347
+/directory/apacheds/trunk/apache-felix:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201342
+/directory/studio/trunk/apache-felix:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-jdbm/core:1160768-1164072
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
 /directory/apacheds/branches/milestones/core:1072812-1075328
-/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201342
 /directory/studio/trunk/core:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-jdbm/core-annotations:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
 /directory/apacheds/branches/milestones/core-annotations:1072812-1075328
-/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201343
 /directory/studio/trunk/core-annotations:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/core-avl:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
 /directory/apacheds/branches/milestones/core-avl:1072812-1075328
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345
 /directory/studio/trunk/core-avl:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/core-constants:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
 /directory/apacheds/branches/milestones/core-constants:1072812-1075328
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345
 /directory/studio/trunk/core-constants:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/core-integ:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
 /directory/apacheds/branches/milestones/core-integ:1072812-1075328
-/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345
 /directory/studio/trunk/core-integ:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Sun Nov 13 00:01:54 2011
@@ -43,11 +43,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
+import org.apache.directory.server.core.api.InterceptorEnum;
 import org.apache.directory.server.core.api.authn.ppolicy.PasswordPolicyConfiguration;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyErrorEnum;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyImpl;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
@@ -92,7 +92,7 @@ public class PasswordPolicyTest extends 
 
     private static final LdapApiService codec = LdapApiServiceFactory.getSingleton();
     
-    private static final PasswordPolicyDecorator PP_REQ_CTRL = 
+    private static final PasswordPolicyDecorator PP_REQ_CTRL =
         new PasswordPolicyDecorator( codec, new PasswordPolicyImpl() );
 
 
@@ -114,11 +114,11 @@ public class PasswordPolicyTest extends 
 
         PpolicyConfigContainer policyContainer = new PpolicyConfigContainer();
         policyContainer.setDefaultPolicy( policyConfig );
-        AuthenticationInterceptor authenticationInterceptor = (AuthenticationInterceptor)getService().getInterceptor( AuthenticationInterceptor.class.getSimpleName() );
+        AuthenticationInterceptor authenticationInterceptor = (AuthenticationInterceptor)getService().getInterceptor( InterceptorEnum.AUTHENTICATION_INTERCEPTOR.getName() );
         authenticationInterceptor.setPwdPolicies( policyContainer );
         
         AuthenticationInterceptor authInterceptor = ( AuthenticationInterceptor ) getService()
-        .getInterceptor( AuthenticationInterceptor.class.getSimpleName() );
+            .getInterceptor( InterceptorEnum.AUTHENTICATION_INTERCEPTOR.getName() );
         
         authInterceptor.loadPwdPolicyStateAtributeTypes();
     }
@@ -137,12 +137,12 @@ public class PasswordPolicyTest extends 
         LdapConnection connection = getAdminNetworkConnection( getLdapServer() );
         
         Dn userDn = new Dn( "cn=user,ou=system" );
-        Entry userEntry = new DefaultEntry( 
-            userDn.toString(), 
-            "ObjectClass: top", 
-            "ObjectClass: person", 
+        Entry userEntry = new DefaultEntry(
+            userDn.toString(),
+            "ObjectClass: top",
+            "ObjectClass: person",
             "cn: user",
-            "sn: user_sn", 
+            "sn: user_sn",
             "userPassword: 1234" );
 
         AddRequest addRequest = new AddRequestImpl();
@@ -224,12 +224,12 @@ public class PasswordPolicyTest extends 
         LdapConnection adminConnection = getAdminNetworkConnection( getLdapServer() );
         
         Dn userDn = new Dn( "cn=user2,ou=system" );
-        Entry userEntry = new DefaultEntry( 
-            userDn.toString(), 
-            "ObjectClass: top", 
-            "ObjectClass: person", 
+        Entry userEntry = new DefaultEntry(
+            userDn.toString(),
+            "ObjectClass: top",
+            "ObjectClass: person",
             "cn: user2",
-            "sn: user_sn", 
+            "sn: user_sn",
             "userPassword: 12345" );
 
         AddRequest addRequest = new AddRequestImpl();
@@ -280,11 +280,11 @@ public class PasswordPolicyTest extends 
 
         Dn userDn = new Dn( "cn=userMinAge,ou=system" );
         Entry userEntry = new DefaultEntry(
-            userDn.toString(), 
-            "ObjectClass: top", 
-            "ObjectClass: person", 
+            userDn.toString(),
+            "ObjectClass: top",
+            "ObjectClass: person",
             "cn: userMinAge",
-            "sn: userMinAge_sn", 
+            "sn: userMinAge_sn",
             "userPassword: 12345");
 
         AddRequest addRequest = new AddRequestImpl();
@@ -328,11 +328,11 @@ public class PasswordPolicyTest extends 
 
         Dn userDn = new Dn( "cn=userPwdHist,ou=system" );
         Entry userEntry = new DefaultEntry(
-            userDn.toString(), 
-            "ObjectClass: top", 
-            "ObjectClass: person", 
+            userDn.toString(),
+            "ObjectClass: top",
+            "ObjectClass: person",
             "cn: userPwdHist",
-            "sn: userPwdHist_sn", 
+            "sn: userPwdHist_sn",
             "userPassword: 12345" );
 
         AddRequest addRequest = new AddRequestImpl();
@@ -397,11 +397,11 @@ public class PasswordPolicyTest extends 
 
         Dn userDn = new Dn( "cn=userLen,ou=system" );
         Entry userEntry = new DefaultEntry(
-            userDn.toString(), 
-            "ObjectClass: top", 
-            "ObjectClass: person", 
+            userDn.toString(),
+            "ObjectClass: top",
+            "ObjectClass: person",
             "cn: userLen",
-            "sn: userLen_sn", 
+            "sn: userLen_sn",
             "userPassword: 1234");
 
         AddRequest addRequest = new AddRequestImpl();
@@ -447,11 +447,11 @@ public class PasswordPolicyTest extends 
         Dn userDn = new Dn( "cn=userMaxAge,ou=system" );
         String password = "12345";
         Entry userEntry = new DefaultEntry(
-            userDn.toString(), 
-            "ObjectClass: top", 
-            "ObjectClass: person", 
+            userDn.toString(),
+            "ObjectClass: top",
+            "ObjectClass: person",
             "cn: userMaxAge",
-            "sn: userMaxAge_sn", 
+            "sn: userMaxAge_sn",
             "userPassword: " + password );
 
         AddRequest addRequest = new AddRequestImpl();

Modified: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java Sun Nov 13 00:01:54 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" );

Propchange: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -9,5 +9,5 @@
 /directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
 /directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345
 /directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java Sun Nov 13 00:01:54 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/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java Sun Nov 13 00:01:54 2011
@@ -21,7 +21,8 @@ package org.apache.directory.server.core
 
 import static org.junit.Assert.assertTrue;
 
-import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.api.OperationEnum;
+import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -44,7 +45,8 @@ public class hasEntryPerfIT extends Abst
     public void testPerfHasEntry() throws Exception
     {
         Dn adminDn = new Dn( "uid=admin, ou=system" );
-        EntryOperationContext hasEntryContext = new EntryOperationContext( getService().getAdminSession(), adminDn );
+        HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( getService().getAdminSession(), adminDn );
+        hasEntryContext.setInterceptors( getService().getInterceptors( OperationEnum.HAS_ENTRY ) );
         boolean hasEntry = getService().getOperationManager().hasEntry( hasEntryContext );
 
         assertTrue( hasEntry );

Modified: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java Sun Nov 13 00:01:54 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 )

Propchange: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -8,6 +8,6 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1185681-1201345
 /directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Sun Nov 13 00:01:54 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();

Propchange: directory/apacheds/branches/apacheds-osgi/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/core-jndi:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
 /directory/apacheds/branches/milestones/core-jndi:1072812-1075328
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346
 /directory/studio/trunk/core-jndi:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sun Nov 13 00:01:54 2011
@@ -49,6 +49,7 @@ import javax.naming.spi.DirectoryManager
 import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.LdapPrincipal;
+import org.apache.directory.server.core.api.OperationEnum;
 import org.apache.directory.server.core.api.OperationManager;
 import org.apache.directory.server.core.api.entry.ServerEntryUtils;
 import org.apache.directory.server.core.api.event.DirectoryListener;
@@ -59,8 +60,8 @@ 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.EntryOperationContext;
-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;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
@@ -222,7 +223,9 @@ public abstract class ServerContext impl
         session = bindContext.getSession();
         OperationManager operationManager = service.getOperationManager();
 
-        if ( ! operationManager.hasEntry( new EntryOperationContext( session, dn ) ) )
+        HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, dn );
+        
+        if ( ! operationManager.hasEntry( hasEntryContext ) )
         {
             throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
         }
@@ -255,7 +258,9 @@ public abstract class ServerContext impl
         session = new DefaultCoreSession( principal, service );
         OperationManager operationManager = service.getOperationManager();
 
-        if ( ! operationManager.hasEntry( new EntryOperationContext( session, dn ) ) )
+        HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, dn );
+        
+        if ( ! operationManager.hasEntry( hasEntryContext ) )
         {
             throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
         }
@@ -277,7 +282,9 @@ public abstract class ServerContext impl
         this.session = session;
         OperationManager operationManager = service.getOperationManager();
 
-        if ( ! operationManager.hasEntry( new EntryOperationContext( session, dn ) ) )
+        HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, dn );
+        
+        if ( ! operationManager.hasEntry( hasEntryContext ) )
         {
             throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
         }
@@ -352,21 +359,21 @@ public abstract class ServerContext impl
     protected void doDeleteOperation( Dn target ) throws Exception
     {
         // setup the op context and populate with request controls
-        DeleteOperationContext opCtx = new DeleteOperationContext( session, target );
+        DeleteOperationContext deleteContext = new DeleteOperationContext( session, target );
 
-        opCtx.addRequestControls( convertControls( true, requestControls ) );
+        deleteContext.addRequestControls( convertControls( true, requestControls ) );
 
         // Inject the referral handling into the operation context
-        injectReferralControl( opCtx );
+        injectReferralControl( deleteContext );
 
         // execute delete operation
         OperationManager operationManager = service.getOperationManager();
-        operationManager.delete( opCtx );
+        operationManager.delete( deleteContext );
 
         // clear the request controls and set the response controls
         requestControls = EMPTY_CONTROLS;
         responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(),
-            opCtx.getResponseControls() );
+            deleteContext.getResponseControls() );
     }
 
 
@@ -403,7 +410,7 @@ public abstract class ServerContext impl
             case PASSWORD_POLICY_REQUEST_CONTROL:
                 if ( isRequest )
                 {
-                    control = new PasswordPolicyDecorator( getDirectoryService().getLdapCodecService(), 
+                    control = new PasswordPolicyDecorator( getDirectoryService().getLdapCodecService(),
                         new PasswordPolicyImpl() );
                 }
                 else
@@ -593,15 +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 );
     }
 
 
@@ -639,7 +647,7 @@ public abstract class ServerContext impl
 
         // clear the request controls and set the response controls
         requestControls = EMPTY_CONTROLS;
-        responseControls = JndiUtils.toJndiControls( 
+        responseControls = JndiUtils.toJndiControls(
             getDirectoryService().getLdapCodecService(),
             lookupContext.getResponseControls() );
 
@@ -668,6 +676,7 @@ public abstract class ServerContext impl
         bindContext.setSaslMechanism( saslMechanism );
         bindContext.setSaslAuthId( saslAuthId );
         bindContext.addRequestControls( convertControls( true, requestControls ) );
+        bindContext.setInterceptors( getDirectoryService().getInterceptors( OperationEnum.BIND ) );
 
         // execute bind operation
         OperationManager operationManager = service.getOperationManager();
@@ -701,7 +710,7 @@ public abstract class ServerContext impl
 
         // clear the request controls and set the response controls
         requestControls = EMPTY_CONTROLS;
-        responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(), 
+        responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(),
             moveAndRenameContext.getResponseControls() );
     }
 
@@ -724,7 +733,7 @@ public abstract class ServerContext impl
 
         // clear the request controls and set the response controls
         requestControls = EMPTY_CONTROLS;
-        responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(), 
+        responseControls = JndiUtils.toJndiControls( getDirectoryService().getLdapCodecService(),
             modifyContext.getResponseControls() );
     }
 
@@ -1305,7 +1314,9 @@ public abstract class ServerContext impl
 
         try
         {
-            if ( operationManager.hasEntry( new EntryOperationContext( session, target ) ) )
+            HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( session, target );
+            
+            if ( operationManager.hasEntry( hasEntryContext ) )
             {
                 doDeleteOperation( target );
             }
@@ -1374,7 +1385,7 @@ public abstract class ServerContext impl
         {
             if ( name.size() == 0 )
             {
-                serverEntry = doGetRootDSEOperation( target );
+                serverEntry = doGetRootDseOperation( target );
             }
             else
             {

Modified: directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sun Nov 13 00:01:54 2011
@@ -49,11 +49,12 @@ import javax.naming.spi.DirectoryManager
 import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.LdapPrincipal;
+import org.apache.directory.server.core.api.OperationEnum;
 import org.apache.directory.server.core.api.entry.ServerEntryUtils;
 import org.apache.directory.server.core.api.event.DirectoryListener;
 import org.apache.directory.server.core.api.event.NotificationCriteria;
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
-import org.apache.directory.server.core.api.interceptor.context.EntryOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
@@ -526,7 +527,9 @@ public abstract class ServerDirContext e
 
         try
         {
-            if ( getDirectoryService().getOperationManager().hasEntry( new EntryOperationContext( getSession(), target ) ) )
+            HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( getSession(), target );
+            
+            if ( getDirectoryService().getOperationManager().hasEntry( hasEntryContext ) )
             {
                 doDeleteOperation( target );
             }

Modified: directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Sun Nov 13 00:01:54 2011
@@ -285,6 +285,7 @@ public class ServerLdapContext extends S
     public void ldapUnbind() throws NamingException
     {
         UnbindOperationContext opCtx = new UnbindOperationContext( getSession() );
+        
         try
         {
             opCtx.addRequestControls( JndiUtils.fromJndiControls( getDirectoryService().getLdapCodecService(), 

Propchange: directory/apacheds/branches/apacheds-osgi/core-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 13 00:01:54 2011
@@ -0,0 +1,10 @@
+/directory/apacheds/branches/apacheds-codec-merge/core-shared:982369-987590
+/directory/apacheds/branches/apacheds-config/core-shared:1023442-1029077
+/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-shared:1040956-1043765
+/directory/apacheds/branches/apacheds-replication/core-shared:749790-764110
+/directory/apacheds/branches/apacheds-schema/core-shared:806623-896441
+/directory/apacheds/branches/apacheds-subtree/core-shared:965203-965686
+/directory/apacheds/branches/milestones/core-shared:1072812-1075328
+/directory/apacheds/branches/xdbm-refactoring/core-shared:945827-946347
+/directory/apacheds/trunk/core-shared:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345
+/directory/studio/trunk/core-shared:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultCoreSession.java Sun Nov 13 00:01:54 2011
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 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.EntryOperationContext;
+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;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
@@ -87,17 +87,29 @@ import org.apache.directory.shared.util.
  */
 public class DefaultCoreSession implements CoreSession
 {
+    /** The DirectoryService we are connected to */
     private final DirectoryService directoryService;
+    
+    /** The Principal used to process operations */
     private final LdapPrincipal authenticatedPrincipal;
+    
+    /** The anonymous principal, if we have to process operation as anonymous */
     private final LdapPrincipal anonymousPrincipal;
+    
+    /** The authorized principal, which will be used when a user has been authorized */
     private LdapPrincipal authorizedPrincipal;
 
 
+    /**
+     * Creates a new instance of a DefaultCoreSession
+     * @param principal The principal to use to process operation for this session
+     * @param directoryService The DirectoryService to which we will send requests
+     */
     public DefaultCoreSession( LdapPrincipal principal, DirectoryService directoryService )
     {
         this.directoryService = directoryService;
-        this.authenticatedPrincipal = principal;
-        this.anonymousPrincipal = new LdapPrincipal( directoryService.getSchemaManager() );
+        authenticatedPrincipal = principal;
+        anonymousPrincipal = new LdapPrincipal( directoryService.getSchemaManager() );
     }
 
 
@@ -105,7 +117,7 @@ public class DefaultCoreSession implemen
      * Set the ignoreRefferal flag for the current operationContext.
      *
      * @param opContext The current operationContext
-     * @param ignoreReferral The flag 
+     * @param ignoreReferral The flag
      */
     private void setReferralHandling( AbstractOperationContext opContext, boolean ignoreReferral )
     {
@@ -121,7 +133,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( Entry entry ) throws LdapException
     {
@@ -130,7 +142,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( Entry entry, boolean ignoreReferral ) throws LdapException
     {
@@ -139,7 +151,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( Entry entry, LogChange log ) throws LdapException
     {
@@ -153,7 +165,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( Entry entry, boolean ignoreReferral, LogChange log ) throws LdapException
     {
@@ -168,7 +180,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( AddRequest addRequest ) throws LdapException
     {
@@ -177,7 +189,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void add( AddRequest addRequest, LogChange log ) throws LdapException
     {
@@ -427,7 +439,7 @@ public class DefaultCoreSession implemen
     /**
      * TODO - perhaps we should just use a flag that is calculated on creation
      * of this session
-     *  
+     * 
      * @see org.apache.directory.server.core.api.CoreSession#isAdministrator()
      */
     public boolean isAdministrator()
@@ -439,13 +451,13 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * TODO - this method impl does not check to see if the principal is in 
+     * TODO - this method impl does not check to see if the principal is in
      * the administrators group - it only returns true of the principal is
      * the actual admin user.  need to make it check groups.
      * 
      * TODO - perhaps we should just use a flag that is calculated on creation
      * of this session
-     *  
+     * 
      * @see org.apache.directory.server.core.api.CoreSession#isAnAdministrator()
      */
     public boolean isAnAdministrator()
@@ -493,7 +505,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public Entry lookup( Dn dn ) throws LdapException
     {
@@ -616,7 +628,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( Dn dn, Dn newParent ) throws LdapException
     {
@@ -625,7 +637,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( Dn dn, Dn newParent, LogChange log ) throws LdapException
     {
@@ -638,7 +650,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( Dn dn, Dn newParent, boolean ignoreReferral ) throws Exception
     {
@@ -647,7 +659,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( Dn dn, Dn newParent, boolean ignoreReferral, LogChange log ) throws LdapException
     {
@@ -662,7 +674,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn ) throws LdapException
     {
@@ -671,7 +683,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( Dn dn, Dn newSuperiorDn, Rdn newRdn, boolean deleteOldRdn, LogChange log )
         throws LdapException
@@ -687,7 +699,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral )
         throws LdapException
@@ -697,7 +709,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral,
         LogChange log ) throws LdapException
@@ -781,7 +793,7 @@ public class DefaultCoreSession implemen
 
         try
         {
-            filterNode = ( ExprNode ) FilterParser.parse( directoryService.getSchemaManager(), filter );
+            filterNode = FilterParser.parse( directoryService.getSchemaManager(), filter );
         }
         catch ( ParseException pe )
         {
@@ -877,6 +889,7 @@ public class DefaultCoreSession implemen
         deleteContext.setLogChange( log );
 
         OperationManager operationManager = directoryService.getOperationManager();
+        
         try
         {
             operationManager.delete( deleteContext );
@@ -892,7 +905,7 @@ public class DefaultCoreSession implemen
     
     
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public boolean exists( String dn ) throws LdapException
     {
@@ -901,12 +914,13 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public boolean exists( Dn dn ) throws LdapException
     {
-        EntryOperationContext hasEntryContext = new EntryOperationContext( this, dn );
+        HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( this, dn );
         OperationManager operationManager = directoryService.getOperationManager();
+        
         return operationManager.hasEntry( hasEntryContext );
     }
 
@@ -946,7 +960,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( ModifyDnRequest modifyDnRequest ) throws LdapException
     {
@@ -955,7 +969,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void move( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
     {
@@ -980,7 +994,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( ModifyDnRequest modifyDnRequest ) throws LdapException
     {
@@ -989,7 +1003,7 @@ public class DefaultCoreSession implemen
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void moveAndRename( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
     {
@@ -1070,15 +1084,26 @@ public class DefaultCoreSession implemen
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public void unbind() throws LdapException
     {
+        UnbindOperationContext unbindContext = new UnbindOperationContext( this );
+        
         OperationManager operationManager = directoryService.getOperationManager();
-        operationManager.unbind( new UnbindOperationContext( this ) );
+        operationManager.unbind( unbindContext );
     }
 
 
-    public void unbind( UnbindRequest unbindRequest )
+    /**
+     * {@inheritDoc}
+     */
+    public void unbind( UnbindRequest unbindRequest ) throws LdapException
     {
-        // TODO Auto-generated method stub
+        UnbindOperationContext unbindContext = new UnbindOperationContext( this, unbindRequest );
+        
+        OperationManager operationManager = directoryService.getOperationManager();
+        operationManager.unbind( unbindContext );
     }
 }

Modified: directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java?rev=1201364&r1=1201363&r2=1201364&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java Sun Nov 13 00:01:54 2011
@@ -46,8 +46,8 @@ 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.EntryOperationContext;
-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.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 <a href="http://www.faqs.org/rfcs/rfc3045.html">Vendor Information</a>
-     * @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 );
@@ -277,7 +277,7 @@ public class DefaultPartitionNexus exten
         Dn systemSuffixDn = directoryService.getDnFactory().create( ServerDNConstants.SYSTEM_DN );
         CoreSession adminSession = directoryService.getAdminSession();
 
-        if ( !system.hasEntry( new EntryOperationContext( adminSession, systemSuffixDn ) ) )
+        if ( !system.hasEntry( new HasEntryOperationContext( adminSession, systemSuffixDn ) ) )
         {
             Entry systemEntry = new DefaultEntry( schemaManager, systemSuffixDn );
             
@@ -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
     {
@@ -522,7 +522,7 @@ public class DefaultPartitionNexus exten
     /**
      * {@inheritDoc}
      */
-    public boolean hasEntry( EntryOperationContext hasEntryContext ) throws LdapException
+    public boolean hasEntry( HasEntryOperationContext hasEntryContext ) throws LdapException
     {
         Dn dn = hasEntryContext.getDn();
 
@@ -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<Entry>( rootDSE ), searchContext );
+            Entry rootDse = getRootDse( null );
+            return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDse ), searchContext );
         }
 
         // -----------------------------------------------------------
@@ -715,15 +715,15 @@ public class DefaultPartitionNexus exten
         // return everything
         if ( allUserAttributes && allOperationalAttributes )
         {
-            Entry rootDSE = getRootDSE( null );
-            return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDSE ), searchContext );
+            Entry rootDse = getRootDse( null );
+            return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( 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 ) )
             {
@@ -796,7 +796,8 @@ public class DefaultPartitionNexus exten
                 for ( Partition partition : partitions.values() )
                 {
                     Dn contextDn = partition.getSuffixDn();
-                    EntryOperationContext hasEntryContext = new EntryOperationContext( null, contextDn );
+                    HasEntryOperationContext hasEntryContext = new HasEntryOperationContext( searchContext.getSession(), contextDn );
+                    
                     // search only if the context entry exists
                     if( partition.hasEntry( hasEntryContext ) )
                     {
@@ -844,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
     {
@@ -854,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
     {
@@ -893,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
             {
@@ -909,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
@@ -932,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 )
         {
@@ -967,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
     {
@@ -1009,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<String> 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 )
@@ -1029,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<String> supportedSaslMechanisms ) throws LdapException
     {
@@ -1043,7 +1044,7 @@ public class DefaultPartitionNexus exten
             supportedSaslMechanismsAt.add( saslMechanism );
         }
         
-        rootDSE.add( supportedSaslMechanismsAt );
+        rootDse.add( supportedSaslMechanismsAt );
     }
 
 
@@ -1062,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 )
         {



Mime
View raw message