directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1332268 [1/5] - in /directory/apacheds/trunk: ./ all/ core-annotations/ core-annotations/src/main/java/org/apache/directory/server/core/factory/ core-api/ core-api/src/main/java/org/apache/directory/server/core/api/changelog/ core-api/src/...
Date Mon, 30 Apr 2012 15:59:27 GMT
Author: elecharny
Date: Mon Apr 30 15:59:22 2012
New Revision: 1332268

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

Added:
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchWithIndexTest.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DescendantCursor.java
      - copied unchanged from r1332211, directory/apacheds/branches/index-work/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DescendantCursor.java
Removed:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/changelog/Scope.java
Modified:
    directory/apacheds/trunk/   (props changed)
    directory/apacheds/trunk/all/   (props changed)
    directory/apacheds/trunk/core/   (props changed)
    directory/apacheds/trunk/core-annotations/   (props changed)
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
    directory/apacheds/trunk/core-api/   (props changed)
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogSearchEngine.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/AbstractPartition.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareEntryTest.java
    directory/apacheds/trunk/core-avl/   (props changed)
    directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
    directory/apacheds/trunk/core-constants/   (props changed)
    directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
    directory/apacheds/trunk/core-integ/   (props changed)
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java   (props changed)
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/trunk/core-jndi/   (props changed)
    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/http-integration/   (props changed)
    directory/apacheds/trunk/i18n/   (props changed)
    directory/apacheds/trunk/installers/   (props changed)
    directory/apacheds/trunk/installers-maven-plugin/   (props changed)
    directory/apacheds/trunk/interceptor-kerberos/   (props changed)
    directory/apacheds/trunk/interceptors/authn/   (props changed)
    directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/interceptors/authz/   (props changed)
    directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/interceptors/changelog/   (props changed)
    directory/apacheds/trunk/interceptors/collective/   (props changed)
    directory/apacheds/trunk/interceptors/event/   (props changed)
    directory/apacheds/trunk/interceptors/exception/   (props changed)
    directory/apacheds/trunk/interceptors/journal/   (props changed)
    directory/apacheds/trunk/interceptors/operational/   (props changed)
    directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/interceptors/subtree/   (props changed)
    directory/apacheds/trunk/interceptors/trigger/   (props changed)
    directory/apacheds/trunk/jdbm-partition/   (props changed)
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/   (props changed)
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java   (props changed)
    directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/   (props changed)
    directory/apacheds/trunk/kerberos-test/   (props changed)
    directory/apacheds/trunk/ldap-client-test/   (props changed)
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
    directory/apacheds/trunk/ldif-partition/   (props changed)
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
    directory/apacheds/trunk/protocol-changepw/   (props changed)
    directory/apacheds/trunk/protocol-dhcp/   (props changed)
    directory/apacheds/trunk/protocol-dns/   (props changed)
    directory/apacheds/trunk/protocol-kerberos/   (props changed)
    directory/apacheds/trunk/protocol-ldap/   (props changed)
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java   (props changed)
    directory/apacheds/trunk/protocol-ntp/   (props changed)
    directory/apacheds/trunk/protocol-shared/   (props changed)
    directory/apacheds/trunk/server-annotations/   (props changed)
    directory/apacheds/trunk/server-config/   (props changed)
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (contents, props changed)
    directory/apacheds/trunk/server-config/src/main/resources/   (props changed)
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (props changed)
    directory/apacheds/trunk/server-integ/   (props changed)
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java
    directory/apacheds/trunk/server-jndi/   (props changed)
    directory/apacheds/trunk/server-replication/   (props changed)
    directory/apacheds/trunk/server-tools/   (props changed)
    directory/apacheds/trunk/service/   (props changed)
    directory/apacheds/trunk/service-builder/   (props changed)
    directory/apacheds/trunk/test-framework/   (props changed)
    directory/apacheds/trunk/xdbm-partition/   (props changed)
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ChildrenCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ForwardIndexEntryTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/SingletonIndexCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
    directory/apacheds/trunk/xdbm-tools/   (props changed)
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java

Propchange: directory/apacheds/trunk/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work:r1324715-1332211

Propchange: directory/apacheds/trunk/all/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/all:r1324715-1332211

Propchange: directory/apacheds/trunk/core/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/core:r1324715-1332211

Propchange: directory/apacheds/trunk/core-annotations/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/core-annotations:r1324715-1332211

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Mon Apr 30 15:59:22 2012
@@ -156,6 +156,8 @@ public class DSAnnotationProcessor
                     partitionFactory.addIndex( partition,
                         createIndex.attribute(), createIndex.cacheSize() );
                 }
+
+                partition.initialize();
             }
             else
             {

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java (original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java Mon Apr 30 15:59:22 2012
@@ -51,7 +51,6 @@ public class JdbmPartitionFactory implem
         partition.setSuffixDn( new Dn( suffix ) );
         partition.setCacheSize( 500 );
         partition.setPartitionPath( workingDirectory.toURI() );
-        partition.initialize();
 
         return partition;
     }

Propchange: directory/apacheds/trunk/core-api/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/core-api:r1324715-1332211

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogSearchEngine.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogSearchEngine.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/changelog/ChangeLogSearchEngine.java Mon Apr 30 15:59:22 2012
@@ -24,6 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.ldif.ChangeType;
+import org.apache.directory.shared.ldap.model.message.SearchScope;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -158,7 +159,7 @@ public interface ChangeLogSearchEngine
      * @return the set of changes that occurred on an entry and/or it's descendants depending on the scope
      * @throws Exception if there are failures accessing the store
      */
-    Cursor<ChangeLogEvent> find( Dn base, Scope scope, RevisionOrder order ) throws Exception;
+    Cursor<ChangeLogEvent> find( Dn base, SearchScope scope, RevisionOrder order ) throws Exception;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java Mon Apr 30 15:59:22 2012
@@ -235,9 +235,9 @@ public class ClonedServerEntry implement
     }
 
 
-    public List<Attribute> removeAttributes( AttributeType... attributes )
+    public void removeAttributes( AttributeType... attributes )
     {
-        return clonedEntry.removeAttributes( attributes );
+        clonedEntry.removeAttributes( attributes );
     }
 
 
@@ -376,9 +376,9 @@ public class ClonedServerEntry implement
     }
 
 
-    public List<Attribute> removeAttributes( String... attributes )
+    public void removeAttributes( String... attributes )
     {
-        return clonedEntry.removeAttributes( attributes );
+        clonedEntry.removeAttributes( attributes );
     }
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java Mon Apr 30 15:59:22 2012
@@ -40,6 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions;
 import org.apache.directory.shared.ldap.model.schema.SchemaUtils;
 import org.apache.directory.shared.util.StringConstants;
+import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/AbstractPartition.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/AbstractPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/AbstractPartition.java Mon Apr 30 15:59:22 2012
@@ -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.partition;
 
@@ -101,7 +101,7 @@ public abstract class AbstractPartition 
 
     /**
      * Override this method to put your initialization code.
-     * @throws Exception 
+     * @throws Exception
      */
     protected abstract void doInit() throws InvalidNameException, Exception;
 

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareEntryTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareEntryTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/entry/SchemaAwareEntryTest.java Mon Apr 30 15:59:22 2012
@@ -3351,12 +3351,6 @@ public class SchemaAwareEntryTest
 
         assertFalse( entry.containsAttribute( "cn", "sn" ) );
         assertTrue( entry.containsAttribute( "objectclass", "userpassword" ) );
-
-        List<Attribute> removed = entry.removeAttributes( ( AttributeType ) null );
-        assertNull( removed );
-
-        removed = entry.removeAttributes( atC );
-        assertNull( removed );
     }
 
 
@@ -3380,14 +3374,9 @@ public class SchemaAwareEntryTest
         assertFalse( entry.containsAttribute( "cn", "sn" ) );
         assertTrue( entry.containsAttribute( "objectclass", "userpassword" ) );
 
-        List<Attribute> removed = entry.removeAttributes( "badId" );
-        assertNull( removed );
-
-        removed = entry.removeAttributes( "l" );
-        assertNull( removed );
-
-        removed = entry.removeAttributes( ( String ) null );
-        assertNull( removed );
+        entry.removeAttributes( "badId" );
+        entry.removeAttributes( "l" );
+        entry.removeAttributes( ( String ) null );
     }
 
 
@@ -3515,8 +3504,7 @@ public class SchemaAwareEntryTest
         Value<byte[]> testB2 = new BinaryValue( atPassword, b2 );
 
         // test a removal of an non existing attribute
-        List<Attribute> removed = entry.removeAttributes( atCN );
-        assertNull( removed );
+        entry.removeAttributes( atCN );
 
         // Test a simple removal
         entry.add( "cN", atCN, test1 );
@@ -3548,9 +3536,7 @@ public class SchemaAwareEntryTest
         assertNotNull( entry.get( atCN ) );
         assertNotNull( entry.get( atPassword ) );
 
-        removed = entry.removeAttributes( "badAttribute" );
-
-        assertNull( removed );
+        entry.removeAttributes( "badAttribute" );
     }
 
 

Propchange: directory/apacheds/trunk/core-avl/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/core-avl:r1324715-1332211

Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java Mon Apr 30 15:59:22 2012
@@ -173,9 +173,11 @@ public class AvlSingletonOrOrderedSetCur
             case ON_NODE:
             case AFTER_NODE:
                 node = node.next;
+                
                 if ( node == null )
                 {
                     afterLast();
+                    
                     return false;
                 }
                 else

Propchange: directory/apacheds/trunk/core-constants/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/core-constants:r1324715-1332211

Modified: directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java (original)
+++ directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java Mon Apr 30 15:59:22 2012
@@ -145,10 +145,6 @@ public final class ApacheSchemaConstants
     public final static String SUBSCHEMA_SUBENTRY_NAME_AT = "subschemaSubentryName";
     public final static String SUBSCHEMA_SUBENTRY_NAME_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.37";
 
-    // apacheSubLevel
-    public final static String APACHE_SUB_LEVEL_AT = "apacheSubLevel";
-    public final static String APACHE_SUB_LEVEL_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.43";
-
     // apacheRdn
     public final static String APACHE_RDN_AT = "apacheRdn";
     public final static String APACHE_RDN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.50";

Propchange: directory/apacheds/trunk/core-integ/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/core-integ:r1324715-1332211

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Mon Apr 30 15:59:22 2012
@@ -67,7 +67,6 @@ import org.junit.runner.RunWith;
 @CreateDS(enableAccessControl = true, name = "SearchAuthorizationIT")
 public class SearchAuthorizationIT extends AbstractLdapTestUnit
 {
-
     // to avoid creating too many connections during recursive operations
     private LdapConnection reusableAdminCon;
 
@@ -184,17 +183,17 @@ public class SearchAuthorizationIT exten
      */
     private void recursivelyDelete( Dn rdn ) throws Exception
     {
-        EntryCursor results = reusableAdminCon.search( rdn.getName(), "(objectClass=*)",
+        EntryCursor entries = reusableAdminCon.search( rdn.getName(), "(objectClass=*)",
             SearchScope.ONELEVEL, "*" );
 
-        while ( results.next() )
+        while ( entries.next() )
         {
-            Entry result = results.get();
-            Dn childRdn = result.getDn();
+            Entry entry = entries.get();
+            Dn childRdn = entry.getDn();
             recursivelyDelete( childRdn );
         }
 
-        results.close();
+        entries.close();
         
         reusableAdminCon.delete( rdn );
     }
@@ -341,18 +340,18 @@ public class SearchAuthorizationIT exten
     {
         LdapConnection connection = getAdminConnection();
         Dn base = addSearchData( new Dn( "ou=system" ), 3, 10 );
-
-        EntryCursor results = connection.search( base.getName(), "(objectClass=*)", SearchScope.SUBTREE,
+        
+        EntryCursor entries = connection.search( base.getName(), "(objectClass=*)", SearchScope.SUBTREE,
             "+" );
         int counter = 0;
 
-        while ( results.next() )
+        while ( entries.next() )
         {
-            results.get();
+            entries.get();
             counter++;
         }
         
-        results.close();
+        entries.close();
 
         assertEquals( 10, counter );
         recursivelyDelete( base );

Propchange: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:r1324715-1332211

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java Mon Apr 30 15:59:22 2012
@@ -48,13 +48,13 @@ import org.junit.runner.RunWith;
             @CreatePartition(
                 name = "example",
                 suffix = "dc=example,dc=com",
-                contextEntry = @ContextEntry( 
+                contextEntry = @ContextEntry(
                     entryLdif =
                         "dn: dc=example,dc=com\n" +
                         "dc: example\n" +
                         "objectClass: top\n" +
                         "objectClass: domain\n\n" ),
-                indexes = 
+                indexes =
                 {
                     @CreateIndex( attribute = "objectClass" ),
                     @CreateIndex( attribute = "sn" ),
@@ -88,7 +88,7 @@ public class AddPerfIT extends AbstractL
 
         for ( int i = 0; i < nbIterations; i++ )
         {
-            if ( i % 100 == 0 )
+            if ( i % 1000 == 0 )
             {
                 long tt1 = System.currentTimeMillis();
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Mon Apr 30 15:59:22 2012
@@ -1879,6 +1879,43 @@ public class SearchIT extends AbstractLd
 
 
     @Test
+    public void testSearchRootDSE() throws Exception
+    {
+        SearchControls controls = new SearchControls();
+        controls.setSearchScope( SearchControls.OBJECT_SCOPE );
+        controls.setDerefLinkFlag( false );
+        controls.setReturningAttributes( new String[]{ "*", "+" } );
+
+        LdapContext nullRootCtx = getRootContext( getService() );
+
+        NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(objectClass=*)", controls );
+        Attributes rootDse = null;
+
+        while ( list.hasMore() )
+        {
+            SearchResult result = list.next();
+            rootDse = result.getAttributes();
+        }
+
+        list.close();
+
+        assertNotNull( rootDse );
+        
+        assertEquals( 10, rootDse.size() );
+        assertNotNull( rootDse.get( "objectClass" ) );
+        assertNotNull( rootDse.get( "entryUUID" ) );
+        assertNotNull( rootDse.get( "namingContexts" ) );
+        assertNotNull( rootDse.get( "subschemaSubentry" ) );
+        assertNotNull( rootDse.get( "supportedControl" ) );
+        assertNotNull( rootDse.get( "supportedExtension" ) );
+        assertNotNull( rootDse.get( "supportedFeatures" ) );
+        assertNotNull( rootDse.get( "supportedLDAPVersion" ) );
+        assertNotNull( rootDse.get( "vendorName" ) );
+        assertNotNull( rootDse.get( "vendorVersion" ) );
+    }
+
+
+    @Test
     public void testSearchEmptyDNWithOneLevelScopeAndNoObjectClassPresenceFilter() throws Exception
     {
         SearchControls controls = new SearchControls();

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java Mon Apr 30 15:59:22 2012
@@ -22,14 +22,18 @@ package org.apache.directory.server.core
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.directory.ldap.client.api.EntryCursorImpl;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.server.core.annotations.CreateDS;
 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.shared.ldap.model.cursor.EntryCursor;
-import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
+import org.apache.directory.shared.ldap.model.message.SearchRequest;
+import org.apache.directory.shared.ldap.model.message.SearchRequestImpl;
 import org.apache.directory.shared.ldap.model.message.SearchScope;
+import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -47,7 +51,7 @@ public class SearchPerfIT extends Abstra
     * A basic search for one single entry
     */
     @Test
-    public void testSearchPerf() throws Exception
+    public void testSearchPerfObjectScope() throws Exception
     {
         LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
@@ -58,7 +62,7 @@ public class SearchPerfIT extends Abstra
 
         while ( cursor.next() )
         {
-            Entry entry = cursor.get();
+            cursor.get();
             ++i;
         }
 
@@ -67,11 +71,21 @@ public class SearchPerfIT extends Abstra
         assertEquals( 1, i );
 
         int nbIterations = 1500000;
+        
+        Dn dn = new Dn( getService().getSchemaManager(), "uid=admin,ou=system" );
+
+        SearchRequest searchRequest = new SearchRequestImpl();
+
+        searchRequest.setBase( dn );
+        searchRequest.setFilter( "(ObjectClass=*)" );
+        searchRequest.setScope( SearchScope.OBJECT );
+        searchRequest.addAttributes( "*" );
+        searchRequest.setDerefAliases( AliasDerefMode.DEREF_ALWAYS );
 
         long t0 = System.currentTimeMillis();
         long t00 = 0L;
         long tt0 = System.currentTimeMillis();
-
+        
         for ( i = 0; i < nbIterations; i++ )
         {
             if ( i % 100000 == 0 )
@@ -82,19 +96,167 @@ public class SearchPerfIT extends Abstra
                 tt0 = tt1;
             }
 
+            if ( i == 500000 )
+            {
+                t00 = System.currentTimeMillis();
+            }
+
+            cursor = new EntryCursorImpl( connection.search( searchRequest ) );
+
+            while ( cursor.next() )
+            {
+                cursor.get();
+            }
+            
+            cursor.close();
+        }
+
+        long t1 = System.currentTimeMillis();
+
+        Long deltaWarmed = ( t1 - t00 );
+        System.out.println( "Delta : " + deltaWarmed + "( " + ( ( ( nbIterations - 500000 ) * 1000 ) / deltaWarmed )
+            + " per s ) /" + ( t1 - t0 ) );
+        connection.close();
+    }
+
+
+    /**
+    * A basic search for one single entry
+    */
+    @Test
+    public void testSearchPerfOneLevelScope() throws Exception
+    {
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
+
+        EntryCursor cursor = connection.search( "ou=system", "(ObjectClass=*)",
+            SearchScope.ONELEVEL, "*" );
+
+        int i = 0;
+
+        while ( cursor.next() )
+        {
+            cursor.get();
+            ++i;
+        }
+
+        cursor.close();
+
+        assertEquals( 5, i );
+
+        int nbIterations = 150000;
+        Dn dn = new Dn( getService().getSchemaManager(), "ou=system" );
+        SearchRequest searchRequest = new SearchRequestImpl();
+
+        searchRequest.setBase( dn );
+        searchRequest.setFilter( "(ObjectClass=*)" );
+        searchRequest.setScope( SearchScope.ONELEVEL );
+        searchRequest.addAttributes( "*" );
+        searchRequest.setDerefAliases( AliasDerefMode.DEREF_ALWAYS );
+
+        long t0 = System.currentTimeMillis();
+        long t00 = 0L;
+        long tt0 = System.currentTimeMillis();
+
+        for ( i = 0; i < nbIterations; i++ )
+        {
+            if ( i % 10000 == 0 )
+            {
+                long tt1 = System.currentTimeMillis();
+
+                System.out.println( i + ", " + ( tt1 - tt0 ) );
+                tt0 = tt1;
+            }
+
             if ( i == 50000 )
             {
                 t00 = System.currentTimeMillis();
             }
 
-            cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)", SearchScope.OBJECT, "*" );
+            cursor = new EntryCursorImpl( connection.search( searchRequest ) );
+
+            while ( cursor.next() )
+            {
+                cursor.get();
+            }
+            
+            cursor.close();
+        }
+
+        long t1 = System.currentTimeMillis();
+
+        Long deltaWarmed = ( t1 - t00 );
+        System.out.println( "Delta : " + deltaWarmed + "( " + ( ( ( nbIterations - 50000 ) * 1000 ) / deltaWarmed ) * 5
+            + " per s ) /" + ( t1 - t0 ) );
+        connection.close();
+    }
+
+
+    /**
+    * A basic search for one single entry
+    */
+    @Test
+    public void testSearchPerfSublevelScope() throws Exception
+    {
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
+
+        EntryCursor cursor = connection.search( "ou=system", "(ObjectClass=*)",
+            SearchScope.SUBTREE, "*" );
+
+        int i = 0;
+
+        while ( cursor.next() )
+        {
+            cursor.get();
+            ++i;
+        }
+
+        cursor.close();
+
+        assertEquals( 10, i );
+
+        int nbIterations = 150000;
+        Dn dn = new Dn( getService().getSchemaManager(), "ou=system" );
+        SearchRequest searchRequest = new SearchRequestImpl();
+
+        searchRequest.setBase( dn );
+        searchRequest.setFilter( "(ObjectClass=*)" );
+        searchRequest.setScope( SearchScope.SUBTREE );
+        searchRequest.addAttributes( "*" );
+        searchRequest.setDerefAliases( AliasDerefMode.DEREF_ALWAYS );
+
+        long t0 = System.currentTimeMillis();
+        long t00 = 0L;
+        long tt0 = System.currentTimeMillis();
+
+        for ( i = 0; i < nbIterations; i++ )
+        {
+            if ( i % 10000 == 0 )
+            {
+                long tt1 = System.currentTimeMillis();
+
+                System.out.println( i + ", " + ( tt1 - tt0 ) );
+                tt0 = tt1;
+            }
+
+            if ( i == 50000 )
+            {
+                t00 = System.currentTimeMillis();
+            }
+
+            cursor = new EntryCursorImpl( connection.search( searchRequest ) );
+
+            while ( cursor.next() )
+            {
+                cursor.get();
+            }
+            
             cursor.close();
         }
 
         long t1 = System.currentTimeMillis();
 
         Long deltaWarmed = ( t1 - t00 );
-        System.out.println( "Delta : " + deltaWarmed + "( " + ( ( ( nbIterations - 50000 ) * 1000 ) / deltaWarmed )
+        System.out.println( "Delta : " + deltaWarmed + "( " + ( ( ( nbIterations - 50000 ) * 1000 ) / deltaWarmed ) * 10
             + " per s ) /" + ( t1 - t0 ) );
         connection.close();
     }

Propchange: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:r1324715-1332211

Propchange: directory/apacheds/trunk/core-jndi/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/core-jndi:r1324715-1332211

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=1332268&r1=1332267&r2=1332268&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 Mon Apr 30 15:59:22 2012
@@ -83,6 +83,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.DnUtils;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
 import org.apache.directory.shared.ldap.util.tree.DnNode;
@@ -660,15 +661,13 @@ public class DefaultPartitionNexus exten
 
     private EntryFilteringCursor searchRootDse( SearchOperationContext searchContext ) throws LdapException
     {
-        SearchControls searchControls = searchContext.getSearchControls();
-
-        String[] ids = searchControls.getReturningAttributes();
+        Set<AttributeTypeOptions> ids = searchContext.getReturningAttributes();
 
         // -----------------------------------------------------------
         // If nothing is asked for then we just return the entry asis.
         // We let other mechanisms filter out operational attributes.
         // -----------------------------------------------------------
-        if ( ( ids == null ) || ( ids.length == 0 ) )
+        if ( ( ids == null ) || ( ids.size() == 0 ) )
         {
             Entry rootDse = getRootDse( null );
             return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDse ), searchContext );
@@ -684,17 +683,15 @@ public class DefaultPartitionNexus exten
         boolean allOperationalAttributes = searchContext.isAllOperationalAttributes();
         boolean noAttribute = searchContext.isNoAttributes();
 
-        for ( String id : ids )
+        for ( AttributeTypeOptions id : ids )
         {
-            String idTrimmed = id.trim();
-
             try
             {
-                realIds.add( schemaManager.getAttributeTypeRegistry().getOidByName( idTrimmed ) );
+                realIds.add( id.getAttributeType().getOid() );
             }
             catch ( Exception e )
             {
-                realIds.add( idTrimmed );
+                realIds.add( id.getAttributeType().getName() );
             }
         }
 
@@ -744,7 +741,6 @@ public class DefaultPartitionNexus exten
     public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException
     {
         Dn base = searchContext.getDn();
-        SearchControls searchCtls = searchContext.getSearchControls();
         ExprNode filter = searchContext.getFilter();
 
         // TODO since we're handling the *, and + in the EntryFilteringCursor
@@ -754,12 +750,12 @@ public class DefaultPartitionNexus exten
         {
             // We are searching from the rootDSE. We have to distinguish three cases :
             // 1) The scope is OBJECT : we have to return the rootDSE entry, filtered
-            // 2) The scope is ONELEVEL : we have to return all the Namin
-            boolean isObjectScope = searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE;
+            // 2) The scope is ONELEVEL : we have to return all the Naming Contexts
+            boolean isObjectScope = searchContext.getScope() == SearchScope.OBJECT;
 
-            boolean isOnelevelScope = searchCtls.getSearchScope() == SearchControls.ONELEVEL_SCOPE;
+            boolean isOnelevelScope = searchContext.getScope() == SearchScope.ONELEVEL;
 
-            boolean isSublevelScope = searchCtls.getSearchScope() == SearchControls.SUBTREE_SCOPE;
+            boolean isSublevelScope = searchContext.getScope() == SearchScope.SUBTREE;
 
             // test for (objectClass=*)
             boolean isSearchAll = false;

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=1332268&r1=1332267&r2=1332268&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 Mon Apr 30 15:59:22 2012
@@ -2044,16 +2044,7 @@ public class DefaultDirectoryService imp
         try
         {
             readLock.lock();
-
-            for ( Interceptor interceptor : interceptors )
-            {
-                if ( interceptor.getName().equalsIgnoreCase( interceptorName ) )
-                {
-                    return interceptor;
-                }
-            }
-
-            return null;
+            return interceptorNames.get( interceptorName );
         }
         finally
         {

Propchange: directory/apacheds/trunk/http-integration/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/http-integration:r1324715-1332211

Propchange: directory/apacheds/trunk/i18n/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/i18n:r1324715-1332211

Propchange: directory/apacheds/trunk/installers/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/installers:r1324715-1332211

Propchange: directory/apacheds/trunk/installers-maven-plugin/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/installers-maven-plugin:r1324715-1332211

Propchange: directory/apacheds/trunk/interceptor-kerberos/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptor-kerberos:r1324715-1332211

Propchange: directory/apacheds/trunk/interceptors/authn/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/authn:r1324715-1332211

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=1332268&r1=1332267&r2=1332268&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 Mon Apr 30 15:59:22 2012
@@ -122,7 +122,7 @@ public class AuthenticationInterceptor e
 
     private CoreSession adminSession;
 
-    private Set<Dn> pwdResetSet = new HashSet<Dn>();
+    private Set<String> pwdResetSet = new HashSet<String>();
 
     // pwdpolicy state attribute types
     private AttributeType AT_PWD_RESET;
@@ -668,7 +668,7 @@ public class AuthenticationInterceptor e
                 if ( isPwdMustReset( userEntry ) )
                 {
                     pwdRespCtrl.getResponse().setPasswordPolicyError( PasswordPolicyErrorEnum.CHANGE_AFTER_RESET );
-                    pwdResetSet.add( dn );
+                    pwdResetSet.add( dn.getNormName() );
                 }
 
                 bindContext.addResponseControl( pwdRespCtrl );
@@ -827,7 +827,7 @@ public class AuthenticationInterceptor e
 
         if ( pwdModDetails.isPwdModPresent() )
         {
-            if ( pwdResetSet.contains( userDn ) )
+            if ( pwdResetSet.contains( userDn.getNormName() ) )
             {
                 if ( pwdModDetails.isOtherModExists() )
                 {
@@ -1042,7 +1042,7 @@ public class AuthenticationInterceptor e
 
             if ( removeFromPwdResetSet )
             {
-                pwdResetSet.remove( userDn );
+                pwdResetSet.remove( userDn.getNormName() );
             }
         }
         else
@@ -1133,7 +1133,7 @@ public class AuthenticationInterceptor e
         // cause that requires fetching the ppolicy first, which requires a lookup for user entry
         if ( !directoryService.isPwdPolicyEnabled() )
         {
-            pwdResetSet.remove( unbindContext.getDn() );
+            pwdResetSet.remove( unbindContext.getDn().getNormName() );
         }
     }
 
@@ -1402,7 +1402,7 @@ public class AuthenticationInterceptor e
 
             Dn userDn = session.getAuthenticatedPrincipal().getDn();
 
-            if ( pwdResetSet.contains( userDn ) )
+            if ( pwdResetSet.contains( userDn.getNormName() ) )
             {
                 boolean isPPolicyReqCtrlPresent = opContext
                     .hasRequestControl( PasswordPolicy.OID );

Propchange: directory/apacheds/trunk/interceptors/authz/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/authz:r1324715-1332211

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=1332268&r1=1332267&r2=1332268&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 Mon Apr 30 15:59:22 2012
@@ -79,6 +79,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.OrNode;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
+import org.apache.directory.shared.ldap.model.message.SearchScope;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.normalizers.ConcreteNameComponentNormalizer;
@@ -1255,9 +1256,9 @@ public class AciAuthorizationInterceptor
         EntryFilteringCursor cursor = next( searchContext );
 
         boolean isSubschemaSubentryLookup = subschemaSubentryDn.equals( searchContext.getDn().getNormName() );
-        SearchControls searchCtls = searchContext.getSearchControls();
-        boolean isRootDseLookup = searchContext.getDn().size() == 0
-            && searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE;
+
+        boolean isRootDseLookup = ( searchContext.getDn().size() == 0 )
+            && ( searchContext.getScope() == SearchScope.OBJECT );
 
         if ( isPrincipalAnAdministrator( principalDn )
             || !directoryService.isAccessControlEnabled() || isRootDseLookup

Propchange: directory/apacheds/trunk/interceptors/changelog/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/changelog:r1324715-1332211

Propchange: directory/apacheds/trunk/interceptors/collective/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/collective:r1324715-1332211

Propchange: directory/apacheds/trunk/interceptors/event/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/event:r1324715-1332211

Propchange: directory/apacheds/trunk/interceptors/exception/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/exception:r1324715-1332211

Propchange: directory/apacheds/trunk/interceptors/journal/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/journal:r1324715-1332211

Propchange: directory/apacheds/trunk/interceptors/operational/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/operational:r1324715-1332211

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=1332268&r1=1332267&r2=1332268&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 Mon Apr 30 15:59:22 2012
@@ -82,6 +82,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.SimpleNode;
 import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.message.SearchScope;
 import org.apache.directory.shared.ldap.model.message.controls.Cascade;
 import org.apache.directory.shared.ldap.model.name.Ava;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -1494,7 +1495,7 @@ public class SchemaInterceptor extends B
         // The user was searching into the subSchemaSubEntry
         // This kind of search _must_ be limited to OBJECT scope (the subSchemaSubEntry
         // does not have any sub level)
-        if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE )
+        if ( searchContext.getScope() == SearchScope.OBJECT )
         {
             // The filter can be an equality or a presence, but nothing else
             if ( filter instanceof SimpleNode )

Propchange: directory/apacheds/trunk/interceptors/subtree/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/subtree:r1324715-1332211

Propchange: directory/apacheds/trunk/interceptors/trigger/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/interceptors/trigger:r1324715-1332211

Propchange: directory/apacheds/trunk/jdbm-partition/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/jdbm-partition:r1324715-1332211

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Mon Apr 30 15:59:22 2012
@@ -164,7 +164,7 @@ public class JdbmPartition extends Abstr
             {
                 allIndices.add( index.getAttribute().getOid() );
             }
-
+            
             List<Index<?, Entry, Long>> indexToBuild = new ArrayList<Index<?, Entry, Long>>();
 
             // this loop is used for two purposes
@@ -175,7 +175,7 @@ public class JdbmPartition extends Abstr
             {
                 String indexOid = index.getAttribute().getOid();
                 allIndices.add( indexOid );
-
+                
                 // take the part after removing .db from the
                 String name = indexOid + JDBM_DB_FILE_EXTN;
 
@@ -186,6 +186,11 @@ public class JdbmPartition extends Abstr
                     indexToBuild.add( index );
                 }
             }
+            
+            if ( indexToBuild.size() > 0 )
+            {
+                buildUserIndex( indexToBuild );
+            }
 
             if ( indexToBuild.size() > 0 )
             {
@@ -249,7 +254,7 @@ public class JdbmPartition extends Abstr
 
 
     /**
-     * builds user defined indexes on a attributes by browsing all the entries present in master db
+     * Builds user defined indexes on a attributes by browsing all the entries present in master db
      * 
      * @param userIndexes then user defined indexes to create
      * @throws Exception in case of any problems while building the index
@@ -264,13 +269,13 @@ public class JdbmPartition extends Abstr
             for ( Index index : userIndexes )
             {
                 AttributeType atType = index.getAttribute();
-    
+  
                 String attributeOid = index.getAttribute().getOid();
-
+  
                 LOG.info( "building the index for attribute type {}", atType );
-
+          
                 Tuple<Long, Entry> tuple = cursor.get();
-    
+
                 Long id = tuple.getKey();
                 Entry entry = tuple.getValue();
     

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Mon Apr 30 15:59:22 2012
@@ -532,17 +532,17 @@ public class JdbmIndexTest
         cursor.next();
         IndexEntry<String, Long> e1 = cursor.get();
         assertEquals( 555L, ( long ) e1.getId() );
-        assertEquals( "bar", e1.getValue() );
+        assertEquals( "bar", e1.getKey() );
 
         cursor.next();
         IndexEntry<String, Long> e2 = cursor.get();
         assertEquals( 333L, ( long ) e2.getId() );
-        assertEquals( "foo", e2.getValue() );
+        assertEquals( "foo", e2.getKey() );
 
         cursor.next();
         IndexEntry<String, Long> e3 = cursor.get();
         assertEquals( 1234L, ( long ) e3.getId() );
-        assertEquals( "foo", e3.getValue() );
+        assertEquals( "foo", e3.getKey() );
         
         cursor.close();
 
@@ -553,17 +553,17 @@ public class JdbmIndexTest
         cursor.next();
         e1 = cursor.get();
         assertEquals( 333L, ( long ) e1.getId() );
-        assertEquals( "foo", e1.getValue() );
+        assertEquals( "foo", e1.getKey() );
 
         cursor.next();
         e2 = cursor.get();
         assertEquals( 555L, ( long ) e2.getId() );
-        assertEquals( "bar", e2.getValue() );
+        assertEquals( "bar", e2.getKey() );
 
         cursor.next();
         e3 = cursor.get();
         assertEquals( 1234L, ( long ) e3.getId() );
-        assertEquals( "foo", e3.getValue() );
+        assertEquals( "foo", e3.getKey() );
         
         cursor.close();
     }

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java Mon Apr 30 15:59:22 2012
@@ -353,20 +353,20 @@ public class JdbmRdnIndexTest
         cursor.next();
         IndexEntry<ParentIdAndRdn<Long>, Long> e1 = cursor.get();
         assertEquals( 0, ( long ) e1.getId() );
-        assertEquals( "cn=key", e1.getValue().getRdns()[0].getName() );
-        assertEquals( 0, e1.getValue().getParentId().longValue() );
+        assertEquals( "cn=key", e1.getKey().getRdns()[0].getName() );
+        assertEquals( 0, e1.getKey().getParentId().longValue() );
 
         cursor.next();
         IndexEntry<ParentIdAndRdn<Long>, Long> e2 = cursor.get();
         assertEquals( 1, ( long ) e2.getId() );
-        assertEquals( "cn=key1", e2.getValue().getRdns()[0].getName() );
-        assertEquals( 1, e2.getValue().getParentId().longValue() );
+        assertEquals( "cn=key1", e2.getKey().getRdns()[0].getName() );
+        assertEquals( 1, e2.getKey().getParentId().longValue() );
 
         cursor.next();
         IndexEntry<ParentIdAndRdn<Long>, Long> e3 = cursor.get();
         assertEquals( 2, ( long ) e3.getId() );
-        assertEquals( "cn=key2", e3.getValue().getRdns()[0].getName() );
-        assertEquals( 2, e3.getValue().getParentId().longValue() );
+        assertEquals( "cn=key2", e3.getKey().getRdns()[0].getName() );
+        assertEquals( 2, e3.getKey().getParentId().longValue() );
         
         cursor.close();
     }

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Mon Apr 30 15:59:22 2012
@@ -222,7 +222,7 @@ public class JdbmStoreTest
 
         // lookup the context entry
         Long id = store2.getEntryId( suffixDn );
-        Entry lookup = store2.lookup( id );
+        Entry lookup = store2.lookup( id, suffixDn );
         assertEquals( 2, lookup.getDn().size() );
 
         // make sure all files are closed so that they can be deleted on Windows.
@@ -249,11 +249,6 @@ public class JdbmStoreTest
         jdbmPartition.addIndex( new JdbmIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ) );
         assertNotNull( jdbmPartition.getPresenceIndex() );
 
-        assertNull( jdbmPartition.getSubLevelIndex() );
-        ( ( Store<Entry, Long> ) jdbmPartition ).addIndex( new JdbmIndex<Long, Entry>(
-            ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) );
-        assertNotNull( jdbmPartition.getSubLevelIndex() );
-
         assertNull( jdbmPartition.getId() );
         jdbmPartition.setId( "foo" );
         assertEquals( "foo", jdbmPartition.getId() );
@@ -328,16 +323,6 @@ public class JdbmStoreTest
         {
         }
 
-        assertNotNull( store.getSubLevelIndex() );
-        try
-        {
-            store.addIndex( new JdbmIndex<Long, Entry>( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ) );
-            fail();
-        }
-        catch ( IllegalStateException e )
-        {
-        }
-
         assertNotNull( store.getId() );
         try
         {
@@ -392,7 +377,7 @@ public class JdbmStoreTest
 
         Iterator<String> systemIndices = store.getSystemIndices();
 
-        for ( int ii = 0; ii < 9; ii++ )
+        for ( int ii = 0; ii < 8; ii++ )
         {
             assertTrue( systemIndices.hasNext() );
             assertNotNull( systemIndices.next() );
@@ -537,132 +522,6 @@ public class JdbmStoreTest
     }
 
 
-    @Test
-    public void testSubLevelIndex() throws Exception
-    {
-        Index idx = store.getSubLevelIndex();
-
-        assertEquals( 19, idx.count() );
-
-        Cursor<IndexEntry<Long, Long>> cursor = idx.forwardCursor( 2L );
-
-        assertTrue( cursor.next() );
-        assertEquals( 2, ( long ) cursor.get().getId() );
-
-        assertTrue( cursor.next() );
-        assertEquals( 5, ( long ) cursor.get().getId() );
-
-        assertTrue( cursor.next() );
-        assertEquals( 6, ( long ) cursor.get().getId() );
-
-        assertFalse( cursor.next() );
-
-        idx.drop( 5L );
-
-        cursor.close();
-        
-        cursor = idx.forwardCursor( 2L );
-
-        assertTrue( cursor.next() );
-        assertEquals( 2, ( long ) cursor.get().getId() );
-
-        assertTrue( cursor.next() );
-        assertEquals( 6, ( long ) cursor.get().getId() );
-
-        assertFalse( cursor.next() );
-
-        cursor.close();
-
-        // dn id 12
-        Dn martinDn = new Dn( schemaManager, "cn=Marting King,ou=Sales,o=Good Times Co." );
-        Entry entry = new DefaultEntry( schemaManager, martinDn,
-            "objectClass: top", 
-            "objectClass: person", 
-            "objectClass: organizationalPerson",
-            "ou: Sales",
-            "cn: Martin King",
-            "entryCSN", new CsnFactory( 1 ).newInstance().toString(),
-            "entryUUID", UUID.randomUUID().toString() );
-        AddOperationContext addContext = new AddOperationContext( null, entry );
-        store.add( addContext );
-
-        cursor = idx.forwardCursor( 2L );
-        cursor.afterLast();
-        assertTrue( cursor.previous() );
-        assertEquals( 12, ( long ) cursor.get().getId() );
-        
-        cursor.close();
-
-        Dn newParentDn = new Dn( schemaManager, "ou=Board of Directors,o=Good Times Co." );
-
-        Dn newDn = newParentDn.add( martinDn.getRdn() );
-
-        store.move( martinDn, newParentDn, newDn, entry );
-        cursor = idx.forwardCursor( 3L );
-        cursor.afterLast();
-        assertTrue( cursor.previous() );
-        assertEquals( 12, ( long ) cursor.get().getId() );
-
-        cursor.close();
-
-        // dn id 13
-        Dn marketingDn = new Dn( schemaManager, "ou=Marketing,ou=Sales,o=Good Times Co." );
-        entry = new DefaultEntry( schemaManager, marketingDn,
-            "objectClass: top", 
-            "objectClass: organizationalUnit",
-            "ou: Marketing",
-            "entryCSN", new CsnFactory( 1 ).newInstance().toString(),
-            "entryUUID", UUID.randomUUID().toString() );
-        addContext = new AddOperationContext( null, entry );
-        store.add( addContext );
-
-        // dn id 14
-        Dn jimmyDn = new Dn( schemaManager, "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
-        entry = new DefaultEntry( schemaManager, jimmyDn,
-            "objectClass: top", 
-            "objectClass: person", 
-            "objectClass: organizationalPerson",
-            "ou", "Marketing",
-            "cn", "Jimmy Wales",
-            "entryCSN", new CsnFactory( 1 ).newInstance().toString(),
-            "entryUUID", UUID.randomUUID().toString() );
-        addContext = new AddOperationContext( null, entry );
-        store.add( addContext );
-
-        newDn = newParentDn.add( marketingDn.getRdn() );
-
-        store.move( marketingDn, newParentDn, newDn, entry );
-
-        cursor = idx.forwardCursor( 3L );
-        cursor.afterLast();
-
-        assertTrue( cursor.previous() );
-        assertEquals( 14, ( long ) cursor.get().getId() );
-
-        assertTrue( cursor.previous() );
-        assertEquals( 13, ( long ) cursor.get().getId() );
-
-        assertTrue( cursor.previous() );
-        assertEquals( 12, ( long ) cursor.get().getId() );
-
-        assertTrue( cursor.previous() );
-        assertEquals( 10, ( long ) cursor.get().getId() );
-
-        assertTrue( cursor.previous() );
-        assertEquals( 9, ( long ) cursor.get().getId() );
-
-        assertTrue( cursor.previous() );
-        assertEquals( 7, ( long ) cursor.get().getId() );
-
-        assertTrue( cursor.previous() );
-        assertEquals( 3, ( long ) cursor.get().getId() );
-
-        assertFalse( cursor.previous() );
-
-        cursor.close();
-    }
-
-
     @Test(expected = LdapNoSuchObjectException.class)
     public void testAddWithoutParentId() throws Exception
     {
@@ -754,7 +613,7 @@ public class JdbmStoreTest
         Dn dn2 = new Dn( schemaManager, "sn=Ja\\+es,ou=Engineering,o=Good Times Co." );
         Long id = store.getEntryId( dn2 );
         assertNotNull( id );
-        Entry entry2 = store.lookup( id );
+        Entry entry2 = store.lookup( id, dn2 );
         assertEquals( "Ja+es", entry2.get( "sn" ).getString() );
     }
 
@@ -808,7 +667,7 @@ public class JdbmStoreTest
 
         Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
 
-        Entry lookedup = store.lookup( store.getEntryId( dn ) );
+        Entry lookedup = store.lookup( store.getEntryId( dn ), dn );
 
         store.modify( dn, add );
         assertTrue( lookedup.get( "sn" ).contains( attribVal ) );
@@ -827,7 +686,7 @@ public class JdbmStoreTest
 
         Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
 
-        Entry lookedup = store.lookup( store.getEntryId( dn ) );
+        Entry lookedup = store.lookup( store.getEntryId( dn ), dn );
 
         assertEquals( "WAlkeR", lookedup.get( "sn" ).get().getString() ); // before replacing
 
@@ -852,7 +711,7 @@ public class JdbmStoreTest
 
         Modification add = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attrib );
 
-        Entry lookedup = store.lookup( store.getEntryId( dn ) );
+        Entry lookedup = store.lookup( store.getEntryId( dn ), dn );
 
         assertNotNull( lookedup.get( "sn" ).get() );
 
@@ -892,7 +751,7 @@ public class JdbmStoreTest
 
         Modification add = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attrib );
 
-        Entry lookedup = store.lookup( store.getEntryId( dn ) );
+        Entry lookedup = store.lookup( store.getEntryId( dn ), dn );
 
         assertNull( lookedup.get( "ou" ) ); // before replacing
 

Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:r1324715-1332211

Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/server:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-codec/src/test/java/org/apache/directory/server:r1324715-1332211

Propchange: directory/apacheds/trunk/kerberos-test/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/kerberos-test:r1324715-1332211

Propchange: directory/apacheds/trunk/ldap-client-test/
------------------------------------------------------------------------------
  Merged /directory/apacheds/branches/index-work/ldap-client-test:r1324715-1332211

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=1332268&r1=1332267&r2=1332268&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Mon Apr 30 15:59:22 2012
@@ -48,6 +48,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -208,6 +209,7 @@ public class LdapSSLConnectionTest exten
 
 
     @Test(expected = InvalidConnectionException.class)
+    @Ignore( "This test is failing from time to time when runnig integ tests... To be investgated")
     public void testStallingSsl() throws Exception
     {
         LdapConnectionConfig sslConfig = new LdapConnectionConfig();



Mime
View raw message