Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 78904 invoked from network); 9 Jul 2006 03:40:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Jul 2006 03:39:56 -0000 Received: (qmail 42203 invoked by uid 500); 9 Jul 2006 03:38:12 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 41227 invoked by uid 500); 9 Jul 2006 03:38:08 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 39885 invoked by uid 99); 9 Jul 2006 03:38:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Jul 2006 20:38:02 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Jul 2006 16:07:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1D9FE1A981A; Sat, 8 Jul 2006 16:06:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420215 - in /geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas: ConfigurationEntryTest.java LoginSQLTest.java Date: Sat, 08 Jul 2006 23:06:54 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060708230655.1D9FE1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jdillon Date: Sat Jul 8 16:06:53 2006 New Revision: 420215 URL: http://svn.apache.org/viewvc?rev=420215&view=rev Log: Root files with ${basedir} Modified: geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java Modified: geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?rev=420215&r1=420214&r2=420215&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java (original) +++ geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java Sat Jul 8 16:06:53 2006 @@ -70,10 +70,11 @@ protected AbstractName serverStub; public void test() throws Exception { - File log = new File("target/login-audit.log"); + File log = new File(basedir, "target/login-audit.log"); if (log.exists()) { log.delete(); } + assertEquals("Audit file wasn't cleared", 0, log.length()); // First try with explicit configuration entry Modified: geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java?rev=420215&r1=420214&r2=420215&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java (original) +++ geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java Sat Jul 8 16:06:53 2006 @@ -33,14 +33,16 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.Properties; +import java.io.File; /** * @version $Rev$ $Date$ */ public class LoginSQLTest extends AbstractTest { - - private static final String hsqldbURL = "jdbc:hsqldb:target/database/LoginSQLTest"; + private File basedir = new File(System.getProperty("basedir")); + private String hsqldbURL = "jdbc:hsqldb:" + new File(basedir, "target/database/LoginSQLTest"); + protected AbstractName sqlRealm; protected AbstractName sqlModule;