djencks 2004/01/01 10:32:13
Modified: . maven.xml
modules/kernel/src/java/org/apache/geronimo/kernel Main.java
Log:
Geronimo-134, geronimo.home handling
Revision Changes Path
1.48 +4 -7 incubator-geronimo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/maven.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- maven.xml 10 Dec 2003 12:53:41 -0000 1.47
+++ maven.xml 1 Jan 2004 18:32:13 -0000 1.48
@@ -174,7 +174,7 @@
<goal name="modules:javadoc">
<modules:reactor goals="javadoc" aggregate="false"/>
</goal>
-
+
<goal name="modules:clover">
<modules:reactor goals="clover" aggregate="false"/>
</goal>
@@ -551,13 +551,12 @@
<fileset dir="${run.dir}/bootlib">
<include name="*.jar"/>
</fileset>
-
+
<!-- temporary addition allows RMI to be used, such as
with the JMX RMI connector -->
<pathelement
location="${run.dir}/lib/geronimo-core-rmiclassloaderspi.jar"/>
</classpath>
<sysproperty key="program.name" value="maven:run"/>
- <sysproperty key="geronimo.home" value="file:${run.dir}/"/>
<sysproperty key="java.rmi.server.RMIClassLoaderSpi"
value="org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"/>
</java>
</j:jelly>
@@ -581,7 +580,7 @@
<fileset dir="${run.dir}/bootlib">
<include name="*.jar"/>
</fileset>
-
+
<!-- temporary addition allows RMI to be used, such as
with the JMX RMI connector -->
<pathelement
location="${run.dir}/lib/geronimo-core-rmiclassloaderspi.jar"/>
</classpath>
@@ -592,9 +591,7 @@
<sysproperty key="java.compiler" value="NONE"/>
<sysproperty key="program.name" value="maven:run"/>
- <sysproperty key="geronimo.home" value="file:${run.dir}/"/>
<sysproperty key="java.rmi.server.RMIClassLoaderSpi"
value="org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"/>
-
</java>
</j:jelly>
</goal>
1.4 +7 -5
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Main.java 17 Nov 2003 15:26:46 -0000 1.3
+++ Main.java 1 Jan 2004 18:32:13 -0000 1.4
@@ -87,6 +87,9 @@
* @version $Revision$ $Date$
*/
public class Main implements Runnable {
+
+ static String GERONIMO_HOME;
+
static {
// Add our default Commons Logger that support the trace level
// This MUST be done before the first log is acquired
@@ -97,12 +100,13 @@
// Set the home directory based on the start location of the Java
process
if (System.getProperty("geronimo.home") == null) {
try {
- System.setProperty("geronimo.home", (new
File(".")).getAbsoluteFile().toURL().toString());
+ System.setProperty("geronimo.home", (new
File("")).getAbsoluteFile().toURL().toString());
} catch (MalformedURLException e) {
throw new AssertionError(e);
}
}
-
+ GERONIMO_HOME = System.getProperty("geronimo.home");
+
// add our commons property editors incase the commons module is
added latter
List paths = new
LinkedList(Arrays.asList(PropertyEditorManager.getEditorSearchPath()));
paths.add("org.apache.geronimo.common.propertyeditor");
@@ -259,8 +263,6 @@
log.info("Shutdown complete");
}
}
-
- static String GERONIMO_HOME = System.getProperty("geronimo.home",
"file:.");
/**
* Command line entry point.
