svn commit: r384541 - /geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java

[jl...@apache.org]

Author: jlaskowski
Date: Thu Mar  9 08:18:55 2006
New Revision: 384541

URL: http://svn.apache.org/viewcvs?rev=384541&view=rev
Log:
GERONIMO-1717 directory module migration to Maven2

Submitted by: Prasad Kashyap

Modified:
    geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java

Modified: geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java?rev=384541&r1=384540&r2=384541&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java (original)
+++ geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java Thu Mar  9 08:18:55 2006
@@ -19,6 +19,7 @@
 
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.Properties;
 
 import javax.management.ObjectName;
 import javax.naming.Context;
@@ -94,6 +95,13 @@
     protected void setUp() throws Exception {
         super.setUp();
 
+        Properties props = System.getProperties();
+        props.remove("org.apache.geronimo.home.dir");
+        props.remove("org.apache.geronimo.server.dir");
+        System.setProperties(props);
+
+        String basedir = System.getProperty("basedir");
+
         kernel = KernelFactory.newInstance().createKernel("test.kernel");
         kernel.boot();
 
@@ -101,7 +109,7 @@
         serverInfoName = new ObjectName("geronimo.system:role=ServerInfo");
         serverInfoGBean = new GBeanData(serverInfoName,
                 BasicServerInfo.GBEAN_INFO);
-        serverInfoGBean.setAttribute("baseDirectory", "./target");
+        serverInfoGBean.setAttribute("baseDirectory", basedir + "/target");
         start(serverInfoGBean);
 
         // DirectoryGBean
@@ -116,7 +124,7 @@
         directoryGBean.setAttribute("anonymousAccess", new Boolean(true));
         directoryGBean.setAttribute("enableNetworking", new Boolean(true));
         directoryGBean.setAttribute("port", new Integer(9389));
-        directoryGBean.setAttribute("configFile", "var/directory.xml");
+        directoryGBean.setAttribute("configFile", basedir + "/src/var/directory.xml");
 
         start(directoryGBean);