jlaskowski 2005/06/24 08:04:40
Modified: modules/core/src/java/org/openejb/server Main.java
Log:
Fixes for:
o #OPENEJB-32: (Slightly) better command line options handling
o #OPENEJB-31:log4j:WARN No appenders could be found for logger (OpenEJB)
Revision Changes Path
1.3 +59 -70
openejb1/modules/core/src/java/org/openejb/server/Main.java
Index: Main.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/server/Main.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Main.java 16 Jun 2005 22:29:52 -0000 1.2
+++ Main.java 24 Jun 2005 12:04:40 -0000 1.3
@@ -77,78 +77,67 @@
private static Properties parseArguments(String args[]) throws
DontStartServerException {
Properties props = new Properties(System.getProperties());
- try {
-
- // -- Set Defaults -- //
- props.put("openejb.server.ip", "127.0.0.1");
- props.put("openejb.server.port", "4201");
- props.put("openejb.server.threads", "20");
-
- // Setting the handler system property should be the first thing
- // OpenEJB does.
- JarUtils.setHandlerSystemProperty();
-
- for (int i=0; i < args.length; i++) {
- if (args[i].equals("-h")) {
- if (args.length > i+1 ) {
- System.setProperty("openejb.server.ip", args[++i]);
- }
- } else if (args[i].equals("-p")) {
- if (args.length > i+1 ) {
- System.setProperty("openejb.server.port", args[++i]);
- }
- } else if (args[i].equals("-t")) {
- if (args.length > i+1 ) {
- System.setProperty("openejb.server.threads",
args[++i]);
- }
- } else if (args[i].equals("-conf")) {
- if (args.length > i+1 ) {
- System.setProperty("openejb.configuration",
args[++i]);
- }
- } else if (args[i].equals("-l")) {
- if (args.length > i+1 ) {
- System.setProperty("log4j.configuration", args[++i]);
- }
- } else if (args[i].equals("-d")) {
- if (args.length > i+1 ) {
- System.setProperty("openejb.home", args[++i]);
- }
- } else if (args[i].equals("--admin-ip")) {
- if (args.length > i+1 ) {
- System.setProperty("openejb.server.admin-ip",
args[++i]);
- }
- } else if (args[i].startsWith("--local-copy")) {
- if (args[i].endsWith("false") ||
- args[i].endsWith("FALSE") ||
- args[i].endsWith("no") ||
- args[i].endsWith("NO") ) {
- System.setProperty("openejb.localcopy", "false");
- } else {
- System.setProperty("openejb.localcopy", "true");
- }
- } else if (args[i].equals("-help")) {
- printHelp();
- throw new DontStartServerException();
- } else if (args[i].equals("-version")) {
- printVersion();
- throw new DontStartServerException();
- } else if (args[i].equals("-examples")) {
- printExamples();
- throw new DontStartServerException();
+ // -- Set Defaults -- //
+ props.put("openejb.server.ip", "127.0.0.1");
+ props.put("openejb.server.port", "4201");
+ props.put("openejb.server.threads", "20");
+
+ // Setting the handler system property should be the first thing
+ // OpenEJB does.
+ JarUtils.setHandlerSystemProperty();
+
+ for (int i=0; i < args.length; i++) {
+ if (args[i].equals("-h")) {
+ if (args.length > i+1 ) {
+ System.setProperty("openejb.server.ip", args[++i]);
+ }
+ } else if (args[i].equals("-p")) {
+ if (args.length > i+1 ) {
+ System.setProperty("openejb.server.port", args[++i]);
+ }
+ } else if (args[i].equals("-t")) {
+ if (args.length > i+1 ) {
+ System.setProperty("openejb.server.threads", args[++i]);
}
+ } else if (args[i].equals("-conf")) {
+ if (args.length > i+1 ) {
+ System.setProperty("openejb.configuration", args[++i]);
+ }
+ } else if (args[i].equals("-l")) {
+ if (args.length > i+1 ) {
+ System.setProperty("log4j.configuration", args[++i]);
+ }
+ } else if (args[i].equals("-d")) {
+ if (args.length > i+1 ) {
+ System.setProperty("openejb.home", args[++i]);
+ }
+ } else if (args[i].equals("--admin-ip")) {
+ if (args.length > i+1 ) {
+ System.setProperty("openejb.server.admin-ip", args[++i]);
+ }
+ } else if (args[i].startsWith("--local-copy")) {
+ if (args[i].endsWith("false") ||
+ args[i].endsWith("FALSE") ||
+ args[i].endsWith("no") ||
+ args[i].endsWith("NO") ) {
+ System.setProperty("openejb.localcopy", "false");
+ } else {
+ System.setProperty("openejb.localcopy", "true");
+ }
+ } else if (args[i].equals("-help")) {
+ printHelp();
+ throw new DontStartServerException();
+ } else if (args[i].equals("-version")) {
+ printVersion();
+ throw new DontStartServerException();
+ } else if (args[i].equals("-examples")) {
+ printExamples();
+ throw new DontStartServerException();
}
+ }
- props.setProperty("org/openejb/configuration_factory",
"org.openejb.alt.config.ConfigurationFactory");
+ props.setProperty("org/openejb/configuration_factory",
"org.openejb.alt.config.ConfigurationFactory");
- } catch ( Exception re ) {
- System.err.println("FATAL ERROR: "+ re.getMessage());
- System.err.println("");
- System.err.println("Check logs for more details.");
- System.err.println("");
- //re.printStackTrace();
- throw new DontStartServerException();
- }
-
return props;
}
@@ -181,7 +170,7 @@
// Internationalize this
try {
- InputStream in = new URL( "resource:/openejb/ejbserver.txt"
).openConnection().getInputStream();
+ InputStream in = new URL( "resource:/openejb/start.txt"
).openConnection().getInputStream();
int b = in.read();
while (b != -1) {
