Author: manugeorge
Date: Fri Aug 24 12:58:18 2007
New Revision: 569496
URL: http://svn.apache.org/viewvc?rev=569496&view=rev
Log:
Fixed variable {0} replacement in option help
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
openejb/trunk/openejb3/server/openejb-server/src/main/resources/org/apache/openejb/server/Messages.properties
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java?rev=569496&r1=569495&r2=569496&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
(original)
+++
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
Fri Aug 24 12:58:18 2007
@@ -64,8 +64,8 @@
Map<String, Properties> serviceEntries =
finder.mapAvailableProperties(ServerService.class.getName());
services = serviceEntries.keySet();
for (String service : services) {
- options.addOption(option(null, service+"-port", "int",
"cmd.start.opt."+service+".port", service));
- options.addOption(option(null, service+"-bind", "host",
"cmd.start.opt."+service+".bind", service));
+ options.addOption(option(null, service+"-port", "int",
"cmd.start.opt.port", service));
+ options.addOption(option(null, service+"-bind", "host",
"cmd.start.opt.bind", service));
}
} catch (IOException e) {
services = Collections.EMPTY_SET;
@@ -142,7 +142,7 @@
}
private static Option option(String shortOpt, String longOpt, String
argName, String description, Object... details) {
- return
OptionBuilder.withLongOpt(longOpt).withArgName(argName).hasArg().withDescription(i18n(description)).create(shortOpt);
+ return
OptionBuilder.withLongOpt(longOpt).withArgName(argName).hasArg().withDescription(i18n(description,details)).create(shortOpt);
}
private static String i18n(String key, Object... details) {
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/resources/org/apache/openejb/server/Messages.properties
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/resources/org/apache/openejb/server/Messages.properties?rev=569496&r1=569495&r2=569496&view=diff
==============================================================================
---
openejb/trunk/openejb3/server/openejb-server/src/main/resources/org/apache/openejb/server/Messages.properties
(original)
+++
openejb/trunk/openejb3/server/openejb-server/src/main/resources/org/apache/openejb/server/Messages.properties
Fri Aug 24 12:58:18 2007
@@ -20,26 +20,11 @@
cmd.start.description = The start command is used to start the OpenEJB server.
It has a number of options. These options are described below.
cmd.start.opt.conf = Sets the OpenEJB configuration to the specified file.
cmd.start.opt.version = Prints the Version Information of the OpenEJB Runtime.
-cmd.start.opt.activemq.bind = Binds the Embedded AMQ service to the specified
host address.
-cmd.start.opt.activemq.port = Binds the Embedded AMQ service to the specified
port.
-cmd.start.opt.admin.bind = Binds the OpenEJB admin service to the specified
host address. Default host address is 0.0.0.0.
-cmd.start.opt.admin.port = Binds the OpenEJB admin service to the specified
port. Default port is 4200.
-cmd.start.opt.derbynet.bind = Binds the Embedded Derby service to the
specified host address. Default host address is 0.0.0.0.
-cmd.start.opt.derbynet.port = Binds the Embedded Derby service to the
specified port.
-cmd.start.opt.ejbd.bind = Binds the Remote Server to the specified host
address. Default host address is 0.0.0.0.
-cmd.start.opt.ejbd.port = Binds the Remote Server to the specified port.
Default port is 4201.
+cmd.start.opt.bind = Sets the host to which the {0} service should be bound.
+cmd.start.opt.port = Sets the port to which the {0} service should be bound.
cmd.start.opt.examples = Show examples of how to use the options.
cmd.start.opt.help = Print this help message.
-cmd.start.opt.hsql.bind = Binds the embedded HSQL DB service to the specified
host address. Default host address is 0.0.0.0.
-cmd.start.opt.hsql.port = Binds the embedded HSQL DB service to the specified
port. Default port is 9001.
-cmd.start.opt.httpejbd.bind = Binds the EJB over HTTP service to the specified
host address. Default host address is 0.0.0.0.
-cmd.start.opt.httpejbd.port = Binds the EJB over HTTP service to the specified
port. Default port is 4204.
cmd.start.opt.localCopy = Instructs the container system to marshal (ie, copy)
all calls between beans.
-cmd.start.opt.telnet.bind = Binds the telnet administration service to the
specified host address. Default host address is 0.0.0.0.
-cmd.start.opt.telnet.port = Binds the telnet administration service to the
specified Port. Default port is 4202.
-cmd.start.opt.webadmin.bind = Binds the Web based administration service to
the specified host address. Default host address is 0.0.0.0.
-cmd.start.opt.webadmin.port = Binds the Web based administration service to
the specified Port.
-
The class specified, {2}, does not implement the {3} interface. Please check
the configuration of {1}.
