Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B7344183 for ; Mon, 11 Jul 2011 15:36:59 +0000 (UTC) Received: (qmail 49912 invoked by uid 500); 11 Jul 2011 15:36:58 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 49852 invoked by uid 500); 11 Jul 2011 15:36:58 -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 49845 invoked by uid 99); 11 Jul 2011 15:36:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jul 2011 15:36:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jul 2011 15:36:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 23A2723889EA for ; Mon, 11 Jul 2011 15:36:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1145206 - in /directory/apacheds/trunk: server-jndi/src/main/java/org/apache/directory/server/configuration/ xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ xdbm... Date: Mon, 11 Jul 2011 15:36:31 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110711153632.23A2723889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Jul 11 15:36:31 2011 New Revision: 1145206 URL: http://svn.apache.org/viewvc?rev=1145206&view=rev Log: o Added a toString() method to the AbstractStore class o Fixed the destroy method in Store tests Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.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 Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original) +++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Mon Jul 11 15:36:31 2011 @@ -514,5 +514,4 @@ public class ApacheDS throw new Exception( I18n.err( I18n.ERR_317, Exceptions.printErrors(errors) ) ); } } - } Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Mon Jul 11 15:36:31 2011 @@ -2123,4 +2123,18 @@ public abstract class AbstractStore(); store.setSchemaManager( schemaManager ); @@ -135,6 +134,7 @@ public class AbstractStoreTest @After public void destroyStore() throws Exception { + store.destroy(); } Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java Mon Jul 11 15:36:31 2011 @@ -134,8 +134,6 @@ public class AvlStoreTest @Before public void createStore() throws Exception { - destroyStore(); - // initialize the store store = new AvlStore(); store.setSchemaManager( schemaManager ); @@ -153,6 +151,7 @@ public class AvlStoreTest @After public void destroyStore() throws Exception { + store.destroy(); } @@ -316,15 +315,6 @@ public class AvlStoreTest assertNotNull( store.getSuffixDn() ); - try - { - store.setSuffixDn( EXAMPLE_COM ); - fail(); - } - catch ( IllegalStateException e ) - { - } - Iterator systemIndices = store.getSystemIndices(); for ( int i = 0; i < 10; i++ ) Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Mon Jul 11 15:36:31 2011 @@ -45,6 +45,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.apache.directory.shared.ldap.model.filter.PresenceNode; import org.apache.directory.shared.ldap.model.filter.SubstringNode; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; @@ -119,8 +120,6 @@ public class AndCursorTest @Before public void createStore() throws Exception { - destroyStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete(); Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Mon Jul 11 15:36:31 2011 @@ -119,8 +119,6 @@ public class GreaterEqTest @Before public void createStore() throws Exception { - destryStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete(); @@ -145,7 +143,7 @@ public class GreaterEqTest @After - public void destryStore() throws Exception + public void destroyStore() throws Exception { if ( store != null ) { Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Mon Jul 11 15:36:31 2011 @@ -119,8 +119,6 @@ public class LessEqTest @Before public void createStore() throws Exception { - destryStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete(); @@ -145,7 +143,7 @@ public class LessEqTest @After - public void destryStore() throws Exception + public void destroyStore() throws Exception { if ( store != null ) { Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Mon Jul 11 15:36:31 2011 @@ -40,6 +40,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.filter.ExprNode; import org.apache.directory.shared.ldap.model.filter.FilterParser; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.model.schema.normalizers.ConcreteNameComponentNormalizer; import org.apache.directory.shared.ldap.model.schema.normalizers.NameComponentNormalizer; @@ -117,8 +118,6 @@ public class NestedFilterTest @Before public void createStore() throws Exception { - destryStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete(); Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Mon Jul 11 15:36:31 2011 @@ -44,6 +44,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.apache.directory.shared.ldap.model.filter.NotNode; import org.apache.directory.shared.ldap.model.filter.SubstringNode; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.UuidSyntaxChecker; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; @@ -116,8 +117,6 @@ public class NotCursorTest @Before public void createStore() throws Exception { - destryStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete(); @@ -144,7 +143,7 @@ public class NotCursorTest @After - public void destryStore() throws Exception + public void destroyStore() throws Exception { if ( store != null ) { @@ -152,6 +151,7 @@ public class NotCursorTest } store = null; + if ( wkdir != null ) { FileUtils.deleteDirectory( wkdir ); Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Mon Jul 11 15:36:31 2011 @@ -111,8 +111,6 @@ public class OneLevelScopeTest @Before public void createStore() throws Exception { - destryStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete(); @@ -135,7 +133,7 @@ public class OneLevelScopeTest @After - public void destryStore() throws Exception + public void destroyStore() throws Exception { if ( store != null ) { Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Mon Jul 11 15:36:31 2011 @@ -46,6 +46,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.filter.FilterParser; import org.apache.directory.shared.ldap.model.filter.OrNode; import org.apache.directory.shared.ldap.model.filter.SubstringNode; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; @@ -118,8 +119,6 @@ public class OrCursorTest @Before public void createStore() throws Exception { - destryStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete(); @@ -146,7 +145,7 @@ public class OrCursorTest @After - public void destryStore() throws Exception + public void destroyStore() throws Exception { if ( store != null ) { Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Mon Jul 11 15:36:31 2011 @@ -41,6 +41,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.filter.PresenceNode; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; @@ -106,8 +107,6 @@ public class PresenceTest @Before public void createStore() throws Exception { - destryStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete(); @@ -130,7 +129,7 @@ public class PresenceTest @After - public void destryStore() throws Exception + public void destroyStore() throws Exception { if ( store != null ) { Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Mon Jul 11 15:36:31 2011 @@ -37,6 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.filter.SubstringNode; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; @@ -102,8 +103,6 @@ public class SubstringTest @Before public void createStore() throws Exception { - destryStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete(); @@ -126,7 +125,7 @@ public class SubstringTest @After - public void destryStore() throws Exception + public void destroyStore() throws Exception { if ( store != null ) { Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1145206&r1=1145205&r2=1145206&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Mon Jul 11 15:36:31 2011 @@ -111,8 +111,6 @@ public class SubtreeScopeTest @Before public void createStore() throws Exception { - destryStore(); - // setup the working directory for the store wkdir = File.createTempFile( getClass().getSimpleName(), "db" ); wkdir.delete();