Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 99055 invoked from network); 19 May 2010 19:10:00 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 May 2010 19:10:00 -0000 Received: (qmail 78113 invoked by uid 500); 19 May 2010 19:10:00 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 78064 invoked by uid 500); 19 May 2010 19:10:00 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 78057 invoked by uid 99); 19 May 2010 19:10:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 May 2010 19:10:00 +0000 X-ASF-Spam-Status: No, hits=-1419.1 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 May 2010 19:09:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 87DE02388A60; Wed, 19 May 2010 19:09:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r946344 [1/2] - in /directory/apacheds/branches/xdbm-refactoring: ./ avl-partition/ core-annotations/src/main/java/org/apache/directory/server/core/factory/ core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ core-a... Date: Wed, 19 May 2010 19:09:33 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100519190934.87DE02388A60@eris.apache.org> Author: seelmann Date: Wed May 19 19:09:31 2010 New Revision: 946344 URL: http://svn.apache.org/viewvc?rev=946344&view=rev Log: Merged trunk Modified: directory/apacheds/branches/xdbm-refactoring/ (props changed) directory/apacheds/branches/xdbm-refactoring/avl-partition/ (props changed) directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java directory/apacheds/branches/xdbm-refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java directory/apacheds/branches/xdbm-refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ (props changed) directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (props changed) directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/ (props changed) directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (contents, props changed) directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java directory/apacheds/branches/xdbm-refactoring/jdbm/src/main/java/jdbm/btree/BTree.java directory/apacheds/branches/xdbm-refactoring/ldap-client-test/pom.xml directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java directory/apacheds/branches/xdbm-refactoring/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java directory/apacheds/branches/xdbm-refactoring/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java directory/apacheds/branches/xdbm-refactoring/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java directory/apacheds/branches/xdbm-refactoring/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java directory/apacheds/branches/xdbm-refactoring/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java directory/apacheds/branches/xdbm-refactoring/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java Propchange: directory/apacheds/branches/xdbm-refactoring/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 19:09:31 2010 @@ -1,2 +1,3 @@ /directory/apacheds/branches/apacheds-replication:749790-764110 /directory/apacheds/branches/apacheds-schema:806623-896441 +/directory/apacheds/trunk:945827-946325 Propchange: directory/apacheds/branches/xdbm-refactoring/avl-partition/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 19:09:31 2010 @@ -1,3 +1,3 @@ /directory/apacheds/branches/apacheds-replication/avl-partition:749790-764110 /directory/apacheds/branches/apacheds-schema/avl-partition:806623-896441 -/directory/apacheds/trunk/avl-partition:806623-894866 +/directory/apacheds/trunk/avl-partition:498338-580500,806623-894866,945827-946325 Modified: directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java Wed May 19 19:09:31 2010 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.SchemaLoader; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -168,7 +168,7 @@ public class DefaultDirectoryServiceFact if ( errors.size() != 0 ) { - throw new Exception( I18n.err( I18n.ERR_317, ExceptionUtils.printErrors( errors ) ) ); + throw new Exception( I18n.err( I18n.ERR_317, LdapExceptionUtils.printErrors( errors ) ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java Wed May 19 19:09:31 2010 @@ -29,6 +29,7 @@ import java.util.Set; import javax.naming.NamingException; import javax.naming.directory.SearchControls; +import org.apache.commons.lang.ArrayUtils; import org.apache.directory.server.core.CoreSession; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException; @@ -38,7 +39,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; import org.apache.directory.shared.ldap.schema.SchemaUtils; -import org.apache.directory.shared.ldap.util.ArrayUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java Wed May 19 19:09:31 2010 @@ -56,7 +56,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.BeforeClass; import org.junit.Test; @@ -132,7 +132,7 @@ public class SchemaAwareEntryAttributeTe { // We have inconsistencies : log them and exit. throw new RuntimeException( "Inconsistent schemas : " + - ExceptionUtils.printErrors( errors ) ); + LdapExceptionUtils.printErrors( errors ) ); } atCN = schemaManager.lookupAttributeTypeRegistry( "cn" ); Modified: directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java Wed May 19 19:09:31 2010 @@ -58,7 +58,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.BeforeClass; import org.junit.Test; @@ -118,7 +118,7 @@ public class SchemaAwareEntryTest if ( errors.size() != 0 ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( errors ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( errors ) ); } atObjectClass = schemaManager.lookupAttributeTypeRegistry( "objectClass" ); Modified: directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java Wed May 19 19:09:31 2010 @@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; @@ -170,7 +170,7 @@ public class SchemaAwareModificationTest if ( errors.size() != 0 ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( errors ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( errors ) ); } atCN = schemaManager.lookupAttributeTypeRegistry( "cn" ); Modified: directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java Wed May 19 19:09:31 2010 @@ -20,8 +20,8 @@ package org.apache.directory.server.core.avltree; +import org.apache.commons.lang.ArrayUtils; import org.junit.Test; -import org.apache.directory.shared.ldap.util.ArrayUtils; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; Modified: directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Wed May 19 19:09:31 2010 @@ -27,6 +27,7 @@ import static org.junit.Assert.assertFal import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import org.apache.commons.lang.ArrayUtils; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.message.ModifyRequest; import org.apache.directory.ldap.client.api.message.SearchResultEntry; @@ -37,7 +38,6 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.util.ArrayUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.After; import org.junit.Test; Modified: directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Wed May 19 19:09:31 2010 @@ -27,6 +27,7 @@ import static org.junit.Assert.assertTru import java.util.HashSet; +import org.apache.commons.lang.ArrayUtils; import org.apache.directory.ldap.client.api.LdapConnection; import org.apache.directory.ldap.client.api.message.DeleteResponse; import org.apache.directory.ldap.client.api.message.ModifyDnResponse; @@ -43,7 +44,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.name.RDN; -import org.apache.directory.shared.ldap.util.ArrayUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.After; import org.junit.Before; Modified: directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java Wed May 19 19:09:31 2010 @@ -40,11 +40,11 @@ import javax.naming.ldap.LdapContext; import javax.naming.spi.DirObjectFactory; import javax.naming.spi.DirStateFactory; +import org.apache.commons.lang.ArrayUtils; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.ldif.LdifEntry; -import org.apache.directory.shared.ldap.util.ArrayUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Test; import org.junit.runner.RunWith; Modified: directory/apacheds/branches/xdbm-refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Wed May 19 19:09:31 2010 @@ -33,6 +33,7 @@ import java.util.Set; import javax.naming.Context; import org.apache.commons.collections.map.LRUMap; +import org.apache.commons.lang.ArrayUtils; import org.apache.directory.server.core.LdapPrincipal; import org.apache.directory.server.core.authz.AciAuthorizationInterceptor; import org.apache.directory.server.core.authz.DefaultAuthorizationInterceptor; @@ -55,7 +56,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapAuthenticationException; import org.apache.directory.shared.ldap.name.DN; -import org.apache.directory.shared.ldap.util.ArrayUtils; import org.apache.directory.shared.ldap.util.Base64; import org.apache.directory.shared.ldap.util.StringTools; import org.apache.directory.shared.ldap.util.UnixCrypt; Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Wed May 19 19:09:31 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -88,7 +88,7 @@ public class MaxValueCountFilterTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Wed May 19 19:09:31 2010 @@ -53,7 +53,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.OidRegistry; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; @@ -98,7 +98,7 @@ public class RelatedProtectedItemFilterT if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } OID_REGISTRY = schemaManager.getGlobalOidRegistry(); Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Wed May 19 19:09:31 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; @@ -86,7 +86,7 @@ public class RestrictedByFilterTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } DN entryName = new DN( "ou=test, ou=system" ); Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java Wed May 19 19:09:31 2010 @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; @@ -66,7 +66,7 @@ public class NormalizationVisitorTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( schemaManager ); Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Wed May 19 19:09:31 2010 @@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer; import org.apache.directory.shared.ldap.schema.registries.OidRegistry; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.BeforeClass; import org.junit.Test; @@ -85,7 +85,7 @@ public class SchemaCheckerTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Wed May 19 19:09:31 2010 @@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; @@ -69,14 +69,14 @@ public class SchemaServiceTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } loaded = schemaManager.loadWithDeps( "nis" ); if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java Wed May 19 19:09:31 2010 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; @@ -82,7 +82,7 @@ public class TlsKeyGeneratorTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Wed May 19 19:09:31 2010 @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.OidRegistry; import org.apache.directory.shared.ldap.schema.registries.Registries; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -79,7 +79,7 @@ public class RefinementEvaluatorTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( sm.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( sm.getErrors() ) ); } registries = sm.getRegistries(); Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Wed May 19 19:09:31 2010 @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.OidRegistry; import org.apache.directory.shared.ldap.schema.registries.Registries; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -76,7 +76,7 @@ public class RefinementLeafEvaluatorTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( sm.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( sm.getErrors() ) ); } registries = sm.getRegistries(); Modified: directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Wed May 19 19:09:31 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer; import org.apache.directory.shared.ldap.subtree.SubtreeSpecification; import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationModifier; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -86,7 +86,7 @@ public class SubtreeEvaluatorTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } ncn = new ConcreteNameComponentNormalizer( schemaManager ); Modified: directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java Wed May 19 19:09:31 2010 @@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.SchemaLoader; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.apache.mina.util.AvailablePortFinder; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -93,7 +93,7 @@ public class ConfigPartitionReaderTest if ( errors.size() != 0 ) { - throw new Exception( "Schema load failed : " + ExceptionUtils.printErrors( errors ) ); + throw new Exception( "Schema load failed : " + LdapExceptionUtils.printErrors( errors ) ); } LdifConfigExtractor.extract( workDir, true ); Propchange: directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 19:09:31 2010 @@ -1,3 +1,3 @@ /directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:749790-764110 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-896441 -/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-894866* +/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,945827-946325 Propchange: directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 19:09:31 2010 @@ -1,2 +1,2 @@ /directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:749790-764110 -/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:806623-894866 +/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,945827-946325 Propchange: directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 19:09:31 2010 @@ -1,3 +1,3 @@ /directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:749790-764110 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-896441 -/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-894866* +/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,945827-946325 Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java Wed May 19 19:09:31 2010 @@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.Schema; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -96,7 +96,7 @@ public class PartitionSchemaLoaderTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } // -------------------------------------------------------------------- Propchange: directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 19:09:31 2010 @@ -1,3 +1,3 @@ /directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:749790-764110 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-896441 -/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-894866 +/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,945827-946325 Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Wed May 19 19:09:31 2010 @@ -27,6 +27,7 @@ import java.util.Map; import jdbm.RecordManager; import jdbm.btree.BTree; import jdbm.helper.Serializer; +import jdbm.helper.Tuple; import jdbm.helper.TupleBrowser; import org.apache.directory.server.core.avltree.ArrayMarshaller; @@ -79,13 +80,13 @@ public class JdbmTable implements T private int count; /** the wrappedCursor JDBM btree used in this Table */ - private BTree bt; + private BTree bt; /** the limit at which we start using btree redirection for duplicates */ private int numDupLimit = JdbmIndex.DEFAULT_DUPLICATE_LIMIT; /** a cache of duplicate BTrees */ - private final Map duplicateBtrees; + private final Map> duplicateBtrees; private final Serializer keySerializer; @@ -174,7 +175,7 @@ public class JdbmTable implements T // explicitly managed by this code. Value serialization is delegated to these // marshallers. - bt = BTree.createInstance( recMan, keyComparator, keySerializer, null ); + bt = new BTree( recMan, keyComparator, keySerializer, null ); recId = bt.getRecid(); recMan.setNamedObject( name, recId ); recId = recMan.insert( 0 ); @@ -182,7 +183,7 @@ public class JdbmTable implements T } else // Load existing BTree { - bt = BTree.load( recMan, recId ); + bt= new BTree().load( recMan, recId ); ((SerializableComparator)bt.getComparator()).setSchemaManager( schemaManager ); recId = recMan.getNamedObject( name + SZSUFFIX ); count = ( Integer ) recMan.fetch( recId ); @@ -234,7 +235,7 @@ public class JdbmTable implements T if ( recId != 0 ) { - bt = BTree.load( recMan, recId ); + bt = new BTree().load( recMan, recId ); ((SerializableComparator)bt.getComparator()).setSchemaManager( schemaManager ); bt.setValueSerializer( valueSerializer ); recId = recMan.getNamedObject( name + SZSUFFIX ); @@ -242,7 +243,7 @@ public class JdbmTable implements T } else { - bt = BTree.createInstance( recMan, keyComparator, keySerializer, valueSerializer ); + bt = new BTree( recMan, keyComparator, keySerializer, valueSerializer ); recId = bt.getRecid(); recMan.setNamedObject( name, recId ); recId = recMan.insert( 0 ); @@ -445,7 +446,7 @@ public class JdbmTable implements T } // last option is to try a btree with BTreeRedirects - BTree tree = getBTree( values.getBTreeRedirect() ); + BTree tree = getBTree( values.getBTreeRedirect() ); return tree.size() != 0 && btreeHas( tree, val, true ); } @@ -476,7 +477,7 @@ public class JdbmTable implements T } // last option is to try a btree with BTreeRedirects - BTree tree = getBTree( values.getBTreeRedirect() ); + BTree tree = getBTree( values.getBTreeRedirect() ); return tree.size() != 0 && btreeHas( tree, val, false ); } @@ -518,7 +519,7 @@ public class JdbmTable implements T { // Can only find greater than or equal to with JDBM so we find that // and work backwards to see if we can find one less than the key - jdbm.helper.Tuple tuple = bt.findGreaterOrEqual( key ); + Tuple tuple = bt.findGreaterOrEqual( key ); // Test for equality first since it satisfies equal to condition if ( null != tuple && keyComparator.compare( ( K ) tuple.getKey(), key ) == 0 ) @@ -546,6 +547,7 @@ public class JdbmTable implements T * be the previous tuple if it exists. */ TupleBrowser browser = bt.browse( tuple.getKey() ); + if ( browser.getPrevious( tuple ) ) { return true; @@ -647,7 +649,7 @@ public class JdbmTable implements T { BTree tree = convertToBTree( set ); BTreeRedirect redirect = new BTreeRedirect( tree.getRecid() ); - bt.insert( key, BTreeRedirectMarshaller.INSTANCE.serialize( redirect ), true ); + bt.insert( key, (V)BTreeRedirectMarshaller.INSTANCE.serialize( redirect ), true ); if ( LOG.isDebugEnabled() ) { @@ -656,7 +658,7 @@ public class JdbmTable implements T } else { - bt.insert( key, marshaller.serialize( set ), true ); + bt.insert( key, (V)marshaller.serialize( set ), true ); if ( LOG.isDebugEnabled() ) { @@ -748,7 +750,7 @@ public class JdbmTable implements T } else { - bt.insert( key, marshaller.serialize( set ), true ); + bt.insert( key, (V)marshaller.serialize( set ), true ); } count--; @@ -777,7 +779,7 @@ public class JdbmTable implements T if ( tree.size() <= numDupLimit ) { ArrayTree avlTree = convertToArrayTree( tree ); - bt.insert( key, marshaller.serialize( avlTree ), true ); + bt.insert( key, (V)marshaller.serialize( avlTree ), true ); recMan.delete( tree.getRecid() ); } @@ -900,7 +902,7 @@ public class JdbmTable implements T return new EmptyCursor>(); } - Object raw = bt.find( key ); + V raw = bt.find( key ); if ( null == raw ) { @@ -933,7 +935,7 @@ public class JdbmTable implements T return new EmptyCursor(); } - Object raw = bt.find( key ); + V raw = bt.find( key ); if ( null == raw ) { @@ -1053,7 +1055,7 @@ public class JdbmTable implements T return duplicateBtrees.get( redirect.getRecId() ); } - BTree tree = BTree.load( recMan, redirect.getRecId() ); + BTree tree = new BTree().load( recMan, redirect.getRecId() ); ((SerializableComparator)tree.getComparator()).setSchemaManager( schemaManager ); duplicateBtrees.put( redirect.getRecId(), tree ); return tree; @@ -1119,11 +1121,11 @@ public class JdbmTable implements T if ( valueSerializer != null ) { - bTree = BTree.createInstance( recMan, valueComparator, valueSerializer, null ); + bTree = new BTree( recMan, valueComparator, valueSerializer, null ); } else { - bTree = BTree.createInstance( recMan, valueComparator ); + bTree = new BTree( recMan, valueComparator ); } Cursor keys = new ArrayTreeCursor( arrayTree ); Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java Wed May 19 19:09:31 2010 @@ -20,9 +20,9 @@ package org.apache.directory.server.core.partition.impl.btree.jdbm; +import org.apache.commons.lang.ArrayUtils; import org.junit.Test; import org.junit.Before; -import org.apache.directory.shared.ldap.util.ArrayUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Wed May 19 19:09:31 2010 @@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -90,7 +90,7 @@ public class DupsContainerCursorTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java Wed May 19 19:09:31 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -92,7 +92,7 @@ public class DupsCursorTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java Wed May 19 19:09:31 2010 @@ -76,7 +76,7 @@ public class JdbmBrowserBugTest dbFile = File.createTempFile( getClass().getSimpleName(), "db", tmpDir ); recman = new BaseRecordManager( dbFile.getAbsolutePath() ); - bt = BTree.createInstance( recman, new IntegerComparator(), new IntegerSerializer(), new IntegerSerializer() ); + bt = new BTree( recman, new IntegerComparator(), new IntegerSerializer(), new IntegerSerializer() ); LOG.debug( "created new BTree" ); } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Wed May 19 19:09:31 2010 @@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -83,7 +83,7 @@ public class JdbmIndexTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java Wed May 19 19:09:31 2010 @@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -81,7 +81,7 @@ public class JdbmMasterTableTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java Wed May 19 19:09:31 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -84,7 +84,7 @@ public class JdbmRdnIndexTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Wed May 19 19:09:31 2010 @@ -62,7 +62,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -111,7 +111,7 @@ public class JdbmStoreTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } EXAMPLE_COM = new DN( "dc=example,dc=com" ); Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java Wed May 19 19:09:31 2010 @@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -87,7 +87,7 @@ public class JdbmTableNoDuplicatesTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Wed May 19 19:09:31 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -100,7 +100,7 @@ public class JdbmTableWithDuplicatesTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java Wed May 19 19:09:31 2010 @@ -78,7 +78,7 @@ public class KeyBTreeCursorTest dbFile = File.createTempFile( KeyBTreeCursorTest.class.getName(), "db", tmpDir ); recman = new BaseRecordManager( dbFile.getAbsolutePath() ); comparator = new StringComparator(); - bt = BTree.createInstance( recman, comparator ); + bt = new BTree( recman, comparator ); // add some data to it bt.insert( "0", EMPTY_BYTES, true ); Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java Wed May 19 19:09:31 2010 @@ -78,7 +78,7 @@ public class KeyCursorTest dbFile = File.createTempFile( KeyCursorTest.class.getName(), "db", tmpDir ); recman = new BaseRecordManager( dbFile.getAbsolutePath() ); comparator = new StringComparator(); - bt = BTree.createInstance( recman, comparator ); + bt = new BTree( recman, comparator ); // add some data to it bt.insert( "0", EMPTY_BYTES, true ); Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Wed May 19 19:09:31 2010 @@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -89,7 +89,7 @@ public class KeyTupleBTreeCursorTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Wed May 19 19:09:31 2010 @@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -90,7 +90,7 @@ public class NoDupsCursorTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } } Modified: directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Wed May 19 19:09:31 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.BeforeClass; import org.junit.Test; @@ -88,7 +88,7 @@ public class ServerEntrySerializerTest if ( errors.size() != 0 ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( errors ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( errors ) ); } oids = new HashMap(); Modified: directory/apacheds/branches/xdbm-refactoring/jdbm/src/main/java/jdbm/btree/BTree.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/jdbm/src/main/java/jdbm/btree/BTree.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/jdbm/src/main/java/jdbm/btree/BTree.java (original) +++ directory/apacheds/branches/xdbm-refactoring/jdbm/src/main/java/jdbm/btree/BTree.java Wed May 19 19:09:31 2010 @@ -148,9 +148,9 @@ public class BTree implements Exte * @param recman Record manager used for persistence. * @param comparator Comparator used to order index entries */ - public static BTree createInstance( RecordManager recman, Comparator comparator ) throws IOException + public BTree( RecordManager recman, Comparator comparator ) throws IOException { - return createInstance( recman, comparator, null, null, DEFAULT_SIZE ); + createInstance( recman, comparator, null, null, DEFAULT_SIZE ); } @@ -162,10 +162,10 @@ public class BTree implements Exte * @param valueSerializer Serializer used to serialize index values (optional) * @param comparator Comparator used to order index entries */ - public static BTree createInstance( RecordManager recman, Comparator comparator, Serializer keySerializer, + public BTree( RecordManager recman, Comparator comparator, Serializer keySerializer, Serializer valueSerializer ) throws IOException { - return createInstance( recman, comparator, keySerializer, valueSerializer, DEFAULT_SIZE ); + createInstance( recman, comparator, keySerializer, valueSerializer, DEFAULT_SIZE ); } @@ -178,11 +178,16 @@ public class BTree implements Exte * @param valueSerializer Serializer used to serialize index values (optional) * @param pageSize Number of entries per page (must be even). */ - public static BTree createInstance( RecordManager recman, Comparator comparator, Serializer keySerializer, + public BTree( RecordManager recman, Comparator comparator, Serializer keySerializer, Serializer valueSerializer, int pageSize ) throws IOException { - BTree btree; - + createInstance( recman, comparator, keySerializer, valueSerializer, pageSize ); + } + + + private void createInstance(RecordManager recman, Comparator comparator, Serializer keySerializer, + Serializer valueSerializer, int pageSize) throws IOException + { if ( recman == null ) { throw new IllegalArgumentException( I18n.err( I18n.ERR_517 ) ); @@ -214,17 +219,14 @@ public class BTree implements Exte throw new IllegalArgumentException( I18n.err( I18n.ERR_522 ) ); } - btree = new BTree(); - btree.recordManager = recman; - btree.comparator = comparator; - btree.keySerializer = keySerializer; - btree.valueSerializer = valueSerializer; - btree.pageSize = pageSize; - btree.bpageSerializer = new BPage(); - btree.bpageSerializer.btree = btree; - btree.recordId = recman.insert( btree ); - - return btree; + this.recordManager = recman; + this.comparator = comparator; + this.keySerializer = keySerializer; + this.valueSerializer = valueSerializer; + this.pageSize = pageSize; + this.bpageSerializer = new BPage(); + this.bpageSerializer.btree = this; + this.recordId = recman.insert( this ); } @@ -234,12 +236,12 @@ public class BTree implements Exte * @param recman RecordManager used to store the persistent btree * @param recid Record id of the BTree */ - public static BTree load( RecordManager recman, long recid ) throws IOException + public BTree load( RecordManager recman, long recid ) throws IOException { - BTree btree = ( BTree ) recman.fetch( recid ); + BTree btree = (BTree) recman.fetch( recid ); btree.recordId = recid; btree.recordManager = recman; - btree.bpageSerializer = new BPage(); + btree.bpageSerializer = new BPage(); btree.bpageSerializer.btree = btree; return btree; Modified: directory/apacheds/branches/xdbm-refactoring/ldap-client-test/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/ldap-client-test/pom.xml?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/ldap-client-test/pom.xml (original) +++ directory/apacheds/branches/xdbm-refactoring/ldap-client-test/pom.xml Wed May 19 19:09:31 2010 @@ -37,9 +37,9 @@ - scm:svn:http://svn.apache.org/repos/asf/directory/clients/ldap/trunk/ldap-client-test - scm:svn:https://svn.apache.org/repos/asf/directory/clients/ldap/trunk/ldap-client-test - http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test + scm:svn:http://svn.apache.org/repos/asf/directory/apacheds/trunk/ldap-client-test + scm:svn:https://svn.apache.org/repos/asf/directory/apacheds/trunk/ldap-client-test + http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test Modified: directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original) +++ directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Wed May 19 19:09:31 2010 @@ -28,6 +28,7 @@ import java.util.Iterator; import java.util.List; import java.util.UUID; +import org.apache.commons.lang.SystemUtils; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.interceptor.context.AddOperationContext; import org.apache.directory.server.core.interceptor.context.BindOperationContext; @@ -59,7 +60,6 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.util.StringTools; -import org.apache.directory.shared.ldap.util.SystemUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java?rev=946344&r1=946343&r2=946344&view=diff ============================================================================== --- directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java (original) +++ directory/apacheds/branches/xdbm-refactoring/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java Wed May 19 19:09:31 2010 @@ -64,7 +64,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer; -import org.apache.directory.shared.ldap.util.ExceptionUtils; +import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -110,7 +110,7 @@ public class LdifPartitionTest if ( !loaded ) { - fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); } defaultCSNFactory = new CsnFactory( 0 );