jdillon 2003/08/26 01:00:56
Modified: modules/core/src/java/org/apache/geronimo/command
StartCommand.java
Log:
o Use Twiddle.getHomeDir() instead of system property
Revision Changes Path
1.4 +8 -5
incubator-geronimo/modules/core/src/java/org/apache/geronimo/command/StartCommand.java
Index: StartCommand.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/command/StartCommand.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StartCommand.java 24 Aug 2003 22:40:24 -0000 1.3
+++ StartCommand.java 26 Aug 2003 08:00:56 -0000 1.4
@@ -71,6 +71,7 @@
import org.apache.geronimo.common.NullArgumentException;
import org.apache.geronimo.common.Strings;
+import org.apache.geronimo.twiddle.Twiddle;
import org.apache.geronimo.twiddle.command.Command;
import org.apache.geronimo.twiddle.command.CommandInfo;
import org.apache.geronimo.twiddle.command.CommandContext;
@@ -131,13 +132,16 @@
return Command.SUCCESS;
}
- URL mletURL = Strings.toURL(System.getProperty("twiddle.home") +
"/etc/boot.mlet");
+ String homeDir = Twiddle.getHomeDir().toString();
+ System.setProperty("geronimo.home", homeDir);
+
+ URL mletURL = Strings.toURL(homeDir + "/etc/boot.mlet");
if (line.hasOption('m')) {
String value = line.getOptionValue('m');
mletURL = Strings.toURL(value);
}
- URL deployURL = Strings.toURL(System.getProperty("twiddle.home") +
"/etc/boot-service.xml");
+ URL deployURL = Strings.toURL(homeDir + "/etc/boot-service.xml");
if (line.hasOption('d')) {
String value = line.getOptionValue('d');
deployURL = Strings.toURL(value);
@@ -148,13 +152,12 @@
log.debug("Deploy URL: " + deployURL);
}
- System.setProperty("geronimo.home",
System.getProperty("twiddle.home"));
Main main = new Main("geronimo", mletURL, deployURL);
ThreadGroup group = new ThreadGroup("Geronimo");
Thread mainThread = new Thread(group, main, "Main-Thread");
mainThread.start();
-
+
//
// TODO: Check if we are in interactive mode...
//
