From: Scott M S. <st...@us...> - 2003-04-01 06:42:33
|
User: starksm Date: 03/03/31 22:42:32 Modified: src/main/org/jboss Tag: Branch_3_2 Main.java Log: Process the command line before doing anything else in boot(String[]) to pickup custom props/settings. Revision Changes Path No revision No revision 1.17.2.3 +4 -4 jboss-system/src/main/org/jboss/Main.java Index: Main.java =================================================================== RCS file: /cvsroot/jboss/jboss-system/src/main/org/jboss/Main.java,v retrieving revision 1.17.2.2 retrieving revision 1.17.2.3 diff -u -r1.17.2.2 -r1.17.2.3 --- Main.java 22 Mar 2003 20:58:25 -0000 1.17.2.2 +++ Main.java 1 Apr 2003 06:42:32 -0000 1.17.2.3 @@ -42,7 +42,7 @@ * @author <a href="mailto:mar...@jb...">Marc Fleury</a> * @author <a href="mailto:ja...@pl...">Jason Dillon</a> * @author <a href="mailto:adr...@ha...">Adrian Brock</a> - * @version $Revision: 1.17.2.2 $ + * @version $Revision: 1.17.2.3 $ */ public class Main { @@ -90,6 +90,9 @@ */ public void boot(final String[] args) throws Exception { + // First process the command line to pickup custom props/settings + processCommandLine(args); + // Auto set HOME_DIR to ../bin/run.jar if not set String homeDir = System.getProperty(ServerConfig.HOME_DIR); if (homeDir == null) @@ -117,9 +120,6 @@ homeURL = file.toURL().toString(); } props.setProperty(ServerConfig.HOME_URL, homeURL); - - // process the command line - processCommandLine(args); // Load the server instance ServerLoader loader = new ServerLoader(props); |