Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 11628 invoked from network); 1 Sep 2009 20:34:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Sep 2009 20:34:43 -0000 Received: (qmail 35739 invoked by uid 500); 1 Sep 2009 20:34:43 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 35675 invoked by uid 500); 1 Sep 2009 20:34:43 -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 35666 invoked by uid 99); 1 Sep 2009 20:34:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2009 20:34:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 01 Sep 2009 20:34:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E57E823888E6; Tue, 1 Sep 2009 20:34:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r810221 - in /directory/apacheds/branches/apacheds-schema: core-entry/src/test/java/org/apache/directory/server/core/entry/ core/src/test/java/org/apache/directory/server/core/schema/ core/src/test/java/org/apache/directory/server/core/secu... Date: Tue, 01 Sep 2009 20:34:15 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090901203416.E57E823888E6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Sep 1 20:34:14 2009 New Revision: 810221 URL: http://svn.apache.org/viewvc?rev=810221&view=rev Log: Fixed some setup() methods which were referencing a test class by mistake Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java (original) +++ directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java Tue Sep 1 20:34:14 2009 @@ -100,7 +100,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = DefaultServerEntryTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java (original) +++ directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java Tue Sep 1 20:34:14 2009 @@ -62,7 +62,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = ServerEntrySerializerTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java (original) +++ directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java Tue Sep 1 20:34:14 2009 @@ -152,7 +152,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = ServerModificationTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original) +++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Tue Sep 1 20:34:14 2009 @@ -26,7 +26,6 @@ import javax.naming.NamingException; import org.apache.directory.server.core.entry.DefaultServerAttribute; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerAttribute; import org.apache.directory.server.core.entry.ServerEntry; @@ -72,7 +71,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = SchemaCheckerTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } @@ -616,12 +615,12 @@ return oid; } - public List getNameSet( String oid ) throws NamingException + public List getNameSet( String oid ) throws NamingException { return Collections.singletonList( oid ); } - public Iterator list() + public Iterator list() { return Collections.EMPTY_LIST.iterator(); } Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original) +++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Tue Sep 1 20:34:14 2009 @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.Set; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry; @@ -52,7 +51,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = SchemaServiceTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java (original) +++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java Tue Sep 1 20:34:14 2009 @@ -27,7 +27,6 @@ import java.security.KeyPair; import java.security.cert.X509Certificate; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.constants.SchemaConstants; @@ -63,7 +62,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = TlsKeyGeneratorTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original) +++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Tue Sep 1 20:34:14 2009 @@ -24,7 +24,6 @@ import java.util.HashSet; import java.util.Set; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.normalization.FilterNormalizingVisitor; @@ -67,7 +66,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = SubtreeEvaluatorTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/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/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java Tue Sep 1 20:34:14 2009 @@ -68,6 +68,7 @@ }; File tmpDir = null; + if ( System.getProperty( TEST_OUTPUT_PATH, null ) != null ) { tmpDir = new File( System.getProperty( TEST_OUTPUT_PATH ) ); Modified: directory/apacheds/branches/apacheds-schema/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/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java Tue Sep 1 20:34:14 2009 @@ -32,7 +32,6 @@ import org.apache.commons.io.FileUtils; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.cursor.Cursor; @@ -67,7 +66,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = JdbmIndexTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/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/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java Tue Sep 1 20:34:14 2009 @@ -28,7 +28,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry; import org.apache.directory.shared.ldap.schema.registries.Registries; @@ -64,7 +63,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = JdbmMasterTableTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/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/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Tue Sep 1 20:34:14 2009 @@ -38,7 +38,6 @@ import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexCursor; import org.apache.directory.server.xdbm.tools.StoreUtils; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerModification; import org.apache.directory.server.core.entry.DefaultServerAttribute; @@ -94,7 +93,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = JdbmStoreTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/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/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java Tue Sep 1 20:34:14 2009 @@ -62,6 +62,7 @@ { destryTable(); File tmpDir = null; + if ( System.getProperty( TEST_OUTPUT_PATH, null ) != null ) { tmpDir = new File( System.getProperty( TEST_OUTPUT_PATH ) ); Modified: directory/apacheds/branches/apacheds-schema/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/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Tue Sep 1 20:34:14 2009 @@ -66,6 +66,7 @@ { destryTable(); File tmpDir = null; + if ( System.getProperty( TEST_OUTPUT_PATH, null ) != null ) { tmpDir = new File( System.getProperty( TEST_OUTPUT_PATH ) ); Modified: directory/apacheds/branches/apacheds-schema/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/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java Tue Sep 1 20:34:14 2009 @@ -69,6 +69,7 @@ public void createCursor() throws Exception { File tmpDir = null; + if ( System.getProperty( TEST_OUTPUT_PATH, null ) != null ) { tmpDir = new File( System.getProperty( TEST_OUTPUT_PATH ) ); Modified: directory/apacheds/branches/apacheds-schema/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/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java Tue Sep 1 20:34:14 2009 @@ -69,6 +69,7 @@ public void createCursor() throws Exception { File tmpDir = null; + if ( System.getProperty( TEST_OUTPUT_PATH, null ) != null ) { tmpDir = new File( System.getProperty( TEST_OUTPUT_PATH ) ); Modified: directory/apacheds/branches/apacheds-schema/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/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original) +++ directory/apacheds/branches/apacheds-schema/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Tue Sep 1 20:34:14 2009 @@ -64,6 +64,7 @@ public void createTable() throws Exception { File tmpDir = null; + if ( System.getProperty( TEST_OUTPUT_PATH, null ) != null ) { tmpDir = new File( System.getProperty( TEST_OUTPUT_PATH ) ); Modified: directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java (original) +++ directory/apacheds/branches/apacheds-schema/server-tools/src/main/java/org/apache/directory/server/tools/DumpCommand.java Tue Sep 1 20:34:14 2009 @@ -86,6 +86,14 @@ // setup temporary loader and temp registry String workingDirectory = System.getProperty( "workingDirectory" ); + + if ( workingDirectory == null ) + { + String path = DumpCommand.class.getResource( "" ).getPath(); + int targetPos = path.indexOf( "target" ); + workingDirectory = path.substring( 0, targetPos + 6 ); + } + File schemaRepository = new File( workingDirectory, "schema" ); SchemaLdifExtractor extractor = new SchemaLdifExtractor( new File( workingDirectory ) ); extractor.extractOrCopy(); Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Tue Sep 1 20:34:14 2009 @@ -27,7 +27,6 @@ import org.apache.commons.io.FileUtils; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; @@ -83,7 +82,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = AndCursorTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Tue Sep 1 20:34:14 2009 @@ -27,7 +27,6 @@ import org.apache.directory.server.xdbm.tools.StoreUtils; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerStringValue; import org.apache.directory.server.core.entry.DefaultServerEntry; @@ -59,9 +58,7 @@ import java.io.File; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.UUID; @@ -89,7 +86,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = GreaterEqTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Tue Sep 1 20:34:14 2009 @@ -27,7 +27,6 @@ import org.apache.directory.server.xdbm.tools.StoreUtils; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerStringValue; @@ -85,7 +84,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = LessEqTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Tue Sep 1 20:34:14 2009 @@ -25,7 +25,6 @@ import org.apache.commons.io.FileUtils; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; @@ -79,7 +78,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = NestedFilterTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Tue Sep 1 20:34:14 2009 @@ -25,7 +25,6 @@ import org.apache.commons.io.FileUtils; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; @@ -80,7 +79,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = NotCursorTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Tue Sep 1 20:34:14 2009 @@ -30,7 +30,6 @@ import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; @@ -81,7 +80,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = OneLevelScopeTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Tue Sep 1 20:34:14 2009 @@ -26,7 +26,6 @@ import org.apache.commons.io.FileUtils; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; @@ -86,7 +85,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = OrCursorTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Tue Sep 1 20:34:14 2009 @@ -29,7 +29,6 @@ import org.apache.directory.server.xdbm.tools.StoreUtils; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; @@ -70,7 +69,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = PresenceTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Tue Sep 1 20:34:14 2009 @@ -29,7 +29,6 @@ import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException; @@ -70,7 +69,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = SubstringTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); } Modified: directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=810221&r1=810220&r2=810221&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original) +++ directory/apacheds/branches/apacheds-schema/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Tue Sep 1 20:34:14 2009 @@ -29,7 +29,6 @@ import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmStore; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; -import org.apache.directory.server.core.entry.DefaultServerAttributeTest; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.shared.ldap.constants.SchemaConstants; @@ -80,7 +79,7 @@ if ( workingDirectory == null ) { - String path = DefaultServerAttributeTest.class.getResource( "" ).getPath(); + String path = SubtreeScopeTest.class.getResource( "" ).getPath(); int targetPos = path.indexOf( "target" ); workingDirectory = path.substring( 0, targetPos + 6 ); }