geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r420038 - in /geronimo/sandbox/svkmerge/m2migration/modules: jetty/src/test/org/apache/geronimo/jetty/ kernel/src/test/org/apache/geronimo/kernel/basic/ security/src/test/org/apache/geronimo/security/jaas/ security/src/test/org/apache/geron...
Date Sat, 08 Jul 2006 02:38:55 GMT
Author: jdillon
Date: Fri Jul  7 19:38:54 2006
New Revision: 420038

URL: http://svn.apache.org/viewvc?rev=420038&view=rev
Log:
Root file access with ${basedir}


Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java
    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/LoginPropertiesFileTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java
    geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
Fri Jul  7 19:38:54 2006
@@ -17,6 +17,7 @@
 package org.apache.geronimo.jetty;
 
 import junit.framework.TestCase;
+
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
 import org.apache.geronimo.jetty.connector.HTTPConnector;
 import org.apache.geronimo.security.SecurityServiceImpl;
@@ -40,6 +41,7 @@
 import org.mortbay.http.Authenticator;
 import org.mortbay.jetty.servlet.FormAuthenticator;
 
+import java.io.File;
 import java.net.URL;
 import java.security.PermissionCollection;
 import java.util.Collections;
@@ -53,6 +55,8 @@
  * @version $Rev$ $Date$
  */
 public class AbstractWebModuleTest extends TestCase {
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected ClassLoader cl;
     protected final static String securityRealmName = "demo-properties-realm";
     private HTTPConnector connector;
@@ -156,8 +160,8 @@
         new SecurityServiceImpl(cl, serverInfo, "org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory",
"org.apache.geronimo.security.jacc.GeronimoPolicy", null, null, null, null);
 
         Properties options = new Properties();
-        options.setProperty("usersURI", "src/test-resources/data/users.properties");
-        options.setProperty("groupsURI", "src/test-resources/data/groups.properties");
+        options.setProperty("usersURI", new File(basedir, "src/test-resources/data/users.properties").toString());
+        options.setProperty("groupsURI", new File(basedir, "src/test-resources/data/groups.properties").toString());
 
         LoginModuleGBean loginModule = new LoginModuleGBean("org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule",
null, true, true, cl);
         loginModule.setLoginDomainName(domainName);

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
Fri Jul  7 19:38:54 2006
@@ -33,6 +33,8 @@
  * @version $Rev$ $Date$
  */
 public class ClassLoaderTest extends TestCase {
+    private File basedir = new File(System.getProperty("basedir"));
+    
     Artifact configId = new Artifact("foo", "bar", "1", "car");
     ClassLoader cl;
     URL[] urls;
@@ -41,7 +43,7 @@
 
     public void setUp() throws Exception {
         super.setUp();
-        URL url = new File("src/test-resources/deployables/cltest/").toURL();
+        URL url = new File(basedir, "src/test-resources/deployables/cltest/").toURL();
 //        URL url = getClass().getClassLoader().getResource("deployables/cltest/");
         System.err.println("URL: " + url);
         urls = new URL[]{url};

Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty/src/test/org/apache/geronimo/jetty/SecurityTest.java
Fri Jul  7 19:38:54 2006
@@ -46,7 +46,6 @@
  * @version $Rev$ $Date$
  */
 public class SecurityTest extends AbstractWebModuleTest {
-
     /**
      * Test the explicit map feature.  Only Alan should be able to log in.
      *

Modified: geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/test/org/apache/geronimo/kernel/basic/BasicProxyMapTest.java
Fri Jul  7 19:38:54 2006
@@ -98,7 +98,7 @@
         Object value1 = new Object();
         Object value2 = new Object();
 
-        class IdentityTest {
+        class IdentityTest1 {
             public int hashCode() { return 1; }
             public boolean equals(Object o) { return true; }
         }
@@ -107,8 +107,8 @@
             public boolean equals(Object o) { return false; }
         }
         
-        Object key1 = new IdentityTest();
-        Object key2 = new IdentityTest();
+        Object key1 = new IdentityTest1();
+        Object key2 = new IdentityTest1();
         
         assertNull(map.put(key1, value1));
         assertNull(map.get(key2));

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=420038&r1=420037&r2=420038&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
Fri Jul  7 19:38:54 2006
@@ -56,7 +56,8 @@
  * @version $Rev$ $Date$
  */
 public class ConfigurationEntryTest extends TestCase {
-
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected Kernel kernel;
     protected AbstractName serverInfo;
     protected AbstractName loginConfiguration;
@@ -172,8 +173,8 @@
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
         gbean.setAttribute("serverSide", new Boolean(true));
         Properties props = new Properties();
-        props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "TestProperties");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);

Modified: geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
Fri Jul  7 19:38:54 2006
@@ -37,7 +37,8 @@
  * @version $Rev$ $Date$
  */
 public class LoginPropertiesFileTest extends AbstractTest {
-
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected AbstractName clientLM;
     protected AbstractName clientCE;
     protected AbstractName testCE;
@@ -74,8 +75,8 @@
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
         gbean.setAttribute("serverSide", Boolean.TRUE);
         props = new Properties();
-        props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "TestProperties");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);

Modified: geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
Fri Jul  7 19:38:54 2006
@@ -37,7 +37,8 @@
  * @version $Rev$ $Date$
  */
 public class TimeoutTest extends AbstractTest {
-
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected AbstractName testCE;
     protected AbstractName testRealm;
     protected AbstractName clientLM;
@@ -58,8 +59,8 @@
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
         gbean.setAttribute("serverSide", Boolean.TRUE);
         Properties props = new Properties();
-        props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "PropertiesDomain");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);

Modified: geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
Fri Jul  7 19:38:54 2006
@@ -58,9 +58,11 @@
  * @version $Rev$ $Date$
  */
 public class SubjectCarryingProtocolTest extends AbstractTest implements RequestListener
{
-
+    
     final static private Log log = LogFactory.getLog(SubjectCarryingProtocolTest.class);
-
+    
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected AbstractName testCE;
     protected AbstractName testRealm;
 
@@ -119,8 +121,8 @@
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
         gbean.setAttribute("serverSide", new Boolean(true));
         Properties props = new Properties();
-        props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "PropertiesDomain");
         kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());

Modified: geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
Fri Jul  7 19:38:54 2006
@@ -61,6 +61,8 @@
  * @version $Rev$ $Date$
  */
 public class RemoteLoginTest extends TestCase {
+    private File basedir = new File(System.getProperty("basedir"));
+    
     Kernel kernel;
     AbstractName serverInfo;
     AbstractName loginService;
@@ -119,8 +121,8 @@
         gbean.setAttribute("serverSide", Boolean.TRUE);
         gbean.setAttribute("loginDomainName", "secret");
         Properties props = new Properties();
-        props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java
Fri Jul  7 19:38:54 2006
@@ -22,8 +22,10 @@
  * @version $Rev$ $Date$
  */
 public class Maven1RepositoryTest extends AbstractRepositoryTest {
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected void setUp() throws Exception {
-        rootRepoDir = new File("target/m1");
+        rootRepoDir = new File(basedir, "target/m1");
         repository = new Maven1Repository(rootRepoDir);
         super.setUp();
     }

Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java
Fri Jul  7 19:38:54 2006
@@ -22,8 +22,10 @@
  * @version $Rev$ $Date$
  */
 public class Maven2RepositoryTest extends AbstractRepositoryTest {
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected void setUp() throws Exception {
-        rootRepoDir = new File("target/m2");
+        rootRepoDir = new File(basedir, "target/m2");
         repository = new Maven2Repository(rootRepoDir);
         super.setUp();
     }

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Fri Jul  7 19:38:54 2006
@@ -50,7 +50,8 @@
  * @version $Rev$ $Date$
  */
 public abstract class AbstractWebModuleTest extends TestCase {
-
+    private File basedir = new File(System.getProperty("basedir"));
+    
     protected ClassLoader cl;
     protected final static String securityRealmName = "demo-properties-realm";
     private ConnectorGBean connector;
@@ -99,8 +100,8 @@
         ApplicationPolicyConfigurationManager jacc = new ApplicationPolicyConfigurationManager(contextIDToPermissionsMap,
roleDesignates, cl, roleMapper);
         jacc.doStart();
 
-        URL configurationBaseURL = new File("target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL();
-        return setUpInsecureAppContext(new File("target/var/catalina/webapps/war3/").toURI(),
+        URL configurationBaseURL = new File(basedir, "target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL();
+        return setUpInsecureAppContext(new File(basedir, "target/var/catalina/webapps/war3/").toURI(),
                 configurationBaseURL,
                 securityHolder,
                 jacc,
@@ -116,8 +117,8 @@
         new SecurityServiceImpl(cl, serverInfo, "org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory",
"org.apache.geronimo.security.jacc.GeronimoPolicy", null, null, null, null);
 
         Properties options = new Properties();
-        options.setProperty("usersURI", "src/test-resources/data/users.properties");
-        options.setProperty("groupsURI", "src/test-resources/data/groups.properties");
+        options.setProperty("usersURI", new File(basedir, "src/test-resources/data/users.properties").toString());
+        options.setProperty("groupsURI", new File(basedir, "src/test-resources/data/groups.properties").toString());
 
         LoginModuleGBean loginModule = new LoginModuleGBean("org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule",
null, true, true, cl);
         loginModule.setLoginDomainName(domainName);
@@ -177,7 +178,7 @@
         engine.doStart();
 
         ServerInfo serverInfo = new BasicServerInfo(".");
-        container = new TomcatContainer(cl, "target/var/catalina", engine, serverInfo, null,
null);
+        container = new TomcatContainer(cl, new File(basedir, "target/var/catalina").toString(),
engine, serverInfo, null, null);
         container.doStart();
 
         connector = new ConnectorGBean("HTTP", null, "localhost", 8181, container);

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/ApplicationTest.java
Fri Jul  7 19:38:54 2006
@@ -24,20 +24,20 @@
 
 
 /**
- * @version $Rev: 387050 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class ApplicationTest extends AbstractWebModuleTest {
-
+    private File basedir = new File(System.getProperty("basedir"));
+    
     public void testApplication() throws Exception {
-        setUpInsecureAppContext(new File("target/var/catalina/webapps/war1/").toURI(),
-                new File("target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL(),
+        setUpInsecureAppContext(new File(basedir, "target/var/catalina/webapps/war1/").toURI(),
+                new File(basedir, "target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL(),
                 null,
                 null,
                 null,
                 null);
 
-        HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/hello.txt")
-                .openConnection();
+        HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:8181/test/hello.txt").openConnection();
         BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
         assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
         assertEquals("Hello World", reader.readLine());

Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java?rev=420038&r1=420037&r2=420038&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat/src/test/org/apache/geronimo/tomcat/JACCSecurityTest.java
Fri Jul  7 19:38:54 2006
@@ -45,7 +45,7 @@
 /**
  * Tests the JACC security for Tomcat
  *
- * @version $Revision: 387050 $ $Date$
+ * @version $Revision$ $Date$
  */
 public class JACCSecurityTest extends AbstractWebModuleTest {
 
@@ -183,8 +183,6 @@
                 componentPermissions,
                 null,
                 securityHolder);
-
-
     }
 
     protected void stopWebApp() throws Exception {



Mime
View raw message