dims 2003/01/07 17:15:11
Modified: java/src/org/apache/axis/client AdminClient.java
java/src/org/apache/axis/i18n resource.properties
Log:
Fix for Bug 15848 - AdminClient (and admin-client Ant-task) host setting broken
Notes:
- Moved the strings to resources.properties as well.
Revision Changes Path
1.74 +8 -27 xml-axis/java/src/org/apache/axis/client/AdminClient.java
Index: AdminClient.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/AdminClient.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- AdminClient.java 3 Jan 2003 14:23:09 -0000 1.73
+++ AdminClient.java 8 Jan 2003 01:15:11 -0000 1.74
@@ -103,32 +103,13 @@
private static String getUsageInfo()
{
- return "Processes a set of administration commands.\n"
- + "\n"
- + "The following Options are available:\n"
- + "\n"
- + "\t-l<url> sets the AxisServlet URL\n"
- + "\t-h<hostName sets the AxisServlet host\n"
- + "\t-p<portNumber> sets the AxisServlet port\n"
- + "\t-s<servletPath> sets the path to the AxisServlet\n"
- + "\t-f<fileName> specifies that a simple file protocol should be
used\n"
- + "\t-u<username> sets the username\n"
- + "\t-w<password> sets the password\n"
- + "\t-d sets the debug flag (for instance, -ddd would set it
to 3)\n"
- + "\t-t<name> sets the transport chain touse\n"
- + "\n"
- + "Commands:\n"
- + "\tlist will list the currently deployed services\n"
- + "\tquit will quit (???)\n"
- + "\tpasswd value changes the admin password\n"
- + "\n"
- + "Deployment Descriptor files:\n"
- + "\n"
- + "<deployment-descriptor-files> deploys or undeploys Axis components
and\n"
- + " web services described in these files\n"
- + "\n"
- + "If -l or -h -p -s are not set, the AdminClient will invoke\n"
- + "http://localhost:8080/axis/servlet/AxisServlet\n";;
+ String lSep = System.getProperty("line.separator");
+ StringBuffer msg = new StringBuffer();
+ // 26 is the # of lines in resources.properties
+ for(int i=0;i<=26;i++) {
+ msg.append(Messages.getMessage("acUsage" + i)).append(lSep);
+ }
+ return msg.toString();
}
@@ -254,7 +235,7 @@
args = opts.getRemainingArgs();
- if ( args == null || opts.isFlagSet('h') > 0) {
+ if ( args == null || opts.isFlagSet('?') > 0) {
log.info(Messages.getMessage("usage00","AdminClient [Options] [list |
<deployment-descriptor-files>]"));
log.info("");
log.info(getUsageInfo());
1.43 +29 -1 xml-axis/java/src/org/apache/axis/i18n/resource.properties
Index: resource.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/i18n/resource.properties,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- resource.properties 7 Jan 2003 19:41:58 -0000 1.42
+++ resource.properties 8 Jan 2003 01:15:11 -0000 1.43
@@ -1090,4 +1090,32 @@
nsToPkgDefaultFileLoaded00=INFO: Loaded default namespace-to-package mapping file
"{0}" as java resource.
missingPortNameException=No name defined for <port> element. Hint: add an attribute
"name" to the port definition, i.e. <port name="...">
missingBindingException=No binding defined for <port> element. Hint: add an
attribute "binding" to he port definition, i.e. <port binding="...">
-twoPortsWithSameName=Two <port> elements with the same name "{0}" found. Hint:
choose unique names among all port elements in a WSDL document.
\ No newline at end of file
+twoPortsWithSameName=Two <port> elements with the same name "{0}" found. Hint:
choose unique names among all port elements in a WSDL document.
+
+acUsage0=Processes a set of administration commands.
+acUsage1=
+acUsage2=The following Options are available:
+acUsage3=
+acUsage4=\t-l<url> sets the AxisServlet URL
+acUsage5=\t-h<hostName sets the AxisServlet host
+acUsage6=\t-p<portNumber> sets the AxisServlet port
+acUsage7=\t-s<servletPath> sets the path to the AxisServlet
+acUsage8=\t-f<fileName> specifies that a simple file protocol should be used
+acUsage9=\t-u<username> sets the username
+acUsage10=\t-w<password> sets the password
+acUsage11=\t-d sets the debug flag (for instance, -ddd would set it to
3)
+acUsage12=\t-t<name> sets the transport chain touse
+acUsage13=
+acUsage14=Commands:
+acUsage15=
+acUsage16=\tlist will list the currently deployed services
+acUsage17=\tquit will send a quit message to SimpleAxisServer
+acUsage18=\tpasswd value changes the admin password
+acUsage19=
+acUsage20=Deployment Descriptor files:
+acUsage21=
+acUsage22=<deployment-descriptor-files> deploys or undeploys Axis components and
+acUsage23=web services described in these files
+acUsage24=
+acUsage25=If -l or -h -p -s are not set, the AdminClient will invoke
+acUsage26=http://localhost:8080/axis/servlet/AxisServlet
\ No newline at end of file
