diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/PropertiesI.java | 14 | ||||
| -rw-r--r-- | java/src/IceBox/Admin.java | 5 | ||||
| -rw-r--r-- | java/src/IceBox/Server.java | 14 | ||||
| -rw-r--r-- | java/src/IceBox/ServiceManagerI.java | 4 | ||||
| -rw-r--r-- | java/src/IceInternal/Instance.java | 4 |
5 files changed, 24 insertions, 17 deletions
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java index 935e8bccbef..2c5800c1f34 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/PropertiesI.java @@ -196,6 +196,20 @@ final class PropertiesI extends LocalObjectImpl implements Properties return arr; } + public synchronized String[] + parseIceCommandLineOptions(String[] options) + { + String[] args = parseCommandLineOptions("Ice", options); + args = parseCommandLineOptions("Freeze", args); + args = parseCommandLineOptions("Glacier", args); + args = parseCommandLineOptions("IceBox", args); + args = parseCommandLineOptions("IcePack", args); + args = parseCommandLineOptions("IcePatch", args); + args = parseCommandLineOptions("IceSSL", args); + args = parseCommandLineOptions("IceStorm", args); + return args; + } + public synchronized void load(String file) { diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java index 99d47a486fa..c2960d32ece 100644 --- a/java/src/IceBox/Admin.java +++ b/java/src/IceBox/Admin.java @@ -33,10 +33,6 @@ public final class Admin public int run(String[] args) { - Ice.Properties properties = communicator().getProperties(); - - args = properties.parseCommandLineOptions("IceBox", args); - java.util.ArrayList commands = new java.util.ArrayList(); int idx = 0; @@ -66,6 +62,7 @@ public final class Admin return 0; } + Ice.Properties properties = communicator().getProperties(); String namePrefix = properties.getProperty("IceBox.Name"); if(namePrefix.length() > 0) { diff --git a/java/src/IceBox/Server.java b/java/src/IceBox/Server.java index df02d9111dc..6b2d223be31 100644 --- a/java/src/IceBox/Server.java +++ b/java/src/IceBox/Server.java @@ -36,26 +36,22 @@ public final class Server extends Ice.Application public int run(String[] args) { - Ice.Properties properties = communicator().getProperties(); - Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args); - argsH.value = properties.parseCommandLineOptions("IceBox", argsH.value); - - for(int i = 1; i < argsH.value.length; ++i) + for(int i = 1; i < args.length; ++i) { - if(argsH.value[i].equals("-h") || argsH.value[i].equals("--help")) + if(args[i].equals("-h") || args[i].equals("--help")) { usage(); return 0; } - else if(!argsH.value[i].startsWith("--")) + else if(!args[i].startsWith("--")) { - System.err.println("Server: unknown option `" + argsH.value[i] + "'"); + System.err.println("Server: unknown option `" + args[i] + "'"); usage(); return 1; } } - ServiceManagerI serviceManagerImpl = new ServiceManagerI(this, argsH.value); + ServiceManagerI serviceManagerImpl = new ServiceManagerI(this, args); return serviceManagerImpl.run(); } } diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 1a93a70df4b..0da230ea722 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -252,7 +252,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp Ice.Properties fileProperties = Ice.Util.createProperties(serviceArgs); properties.parseCommandLineOptions("", fileProperties.getCommandLineOptions()); - serviceArgs = properties.parseCommandLineOptions("Ice", serviceArgs); + serviceArgs = properties.parseIceCommandLineOptions(serviceArgs); serviceArgs = properties.parseCommandLineOptions(service, serviceArgs); } else @@ -272,7 +272,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp Ice.Properties fileProperties = Ice.Util.createProperties(serviceArgs); serviceProperties.parseCommandLineOptions("", fileProperties.getCommandLineOptions()); - serviceArgs = serviceProperties.parseCommandLineOptions("Ice", serviceArgs); + serviceArgs = serviceProperties.parseIceCommandLineOptions(serviceArgs); serviceArgs = serviceProperties.parseCommandLineOptions(service, serviceArgs); info.communicator = Ice.Util.initializeWithProperties(new String[0], serviceProperties); diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index 4fdc8fffe04..9d355ba130c 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -275,9 +275,9 @@ public class Instance _properties = properties; // - // Convert command-line options beginning with --Ice. to properties. + // Convert command-line options to properties. // - args.value = _properties.parseCommandLineOptions("Ice", args.value); + args.value = _properties.parseIceCommandLineOptions(args.value); try { |