Ok, we seem to have agreement.
Changing the code was easy. Changing the hardwired usage text was a pain. :-(
Can someone please help me review these changes (diffs attached)?
Pay particular attention to the deploy commands.
In addition to changing them to use syntax consistent with the new
automatically generated usage message, I inserted line breaks to keep
the lines down to 80 chars.
Thanks.
Index: connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/LocalStrings.properties
===================================================================
96c96
< create.connector.work.security.map.usagetext=create-connector-work-security-map --raname=raname --principalsmap (eisprincipal=mappedprincipal)[,eisprincipal=mappedprincipal]* | --groupsmap (eisgroup=mappedgroup)[,eisgroup=mappedgroup]* [--description=description] [-?|--help=false] mapname
---
> create.connector.work.security.map.usagetext=create-connector-work-security-map\n\t--raname=raname\n\t--principalsmap (eisprincipal=mappedprincipal)[,eisprincipal=mappedprincipal]* |\n\t--groupsmap (eisgroup=mappedgroup)[,eisgroup=mappedgroup]*\n\t[--description <description>] [-?|--help[=<help(default:false)>]]\n\tmapname
155c155
< create.connector.security.map.usagetext=create-connector-security-map --poolname connector_connection_pool_name --principals principal-name[,principal-name]* | --usergroups user-group[,user-group]* --mappedusername user-name [-?|--help=false] mapname
---
> create.connector.security.map.usagetext=create-connector-security-map\n\t--poolname connector_connection_pool_name\n\t--principals principal-name[,principal-name]* |\n\t--usergroups user-group[,user-group]* --mappedusername user-name\n\t[-?|--help[=<help(default:false)>]] mapname
170c170
< update.connector.security.map.usagetext=update-connector-security-map --poolname connector_connection_pool_name [--addprincipals principal-name[,principal-name]*] [--addusergroups user-group[,user-group]*] [--removeprincipals principal-name[,principal-name]*] [--removeusergroups user-group[,user-group]*] [--mappedusername user-name] [-?|--help=false] mapname
---
> update.connector.security.map.usagetext=update-connector-security-map\n\t--poolname connector_connection_pool_name\n\t[--addprincipals principal-name[,principal-name]*]\n\t[--addusergroups user-group[,user-group]*]\n\t[--removeprincipals principal-name[,principal-name]*]\n\t[--removeusergroups user-group[,user-group]*]\n\t[--mappedusername user-name] [-?|--help[=<help(default:false)>]] mapname
Index: core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalStrings.properties
===================================================================
139c139
< create.profiler.usagetext=create-profiler [--classpath <classpath>] [--enabled=true] [--nativelibrarypath <nativelibrarypath>] [--property (name=value)[:name=value]*] [--target <target>] [-?|--help=false] profiler_name
---
> create.profiler.usagetext=create-profiler\n\t[--classpath <classpath>] [--enabled[=<enabled(default:true)>]]\n\t[--nativelibrarypath <nativelibrarypath>]\n\t[--property (name=value)[:name=value]*] [--target <target>]\n\t[-?|--help[=<help(default:false)>]] profiler_name
184c184
< create.system.properties.usagetext=create-system-properties [--target target(Default server)] [-?|--help=false] (name=value)[:name=value]*
---
> create.system.properties.usagetext=create-system-properties\n\t[--target <target(Default server)>] [-?|--help[=<help(default:false)>]]\n\t(name=value)[:name=value]*
224c224
< set.usagetext=set [-?|--help=false] (dotted-attribute-name=value)+
---
> set.usagetext=set [-?|--help[=<help(default:false)>]]\n\t(dotted-attribute-name=value)+
230c230
< delete.ssl.element.doesnotexistforiiop=Ssl element does not exist for IIOP service
\ No newline at end of file
---
> delete.ssl.element.doesnotexistforiiop=Ssl element does not exist for IIOP service
Index: core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/LocalStrings.properties
===================================================================
4c4
< create.jvm.options.usagetext=create-jvm-options [--target target(Default server)] [-?|--help=false] (jvm_option_name[=jvm_option_value])[:jvm_option_name=jvm_option_name*]
---
> create.jvm.options.usagetext=create-jvm-options\n\t[--target <target(Default server)>] [-?|--help[=<help(default:false)>]]\n\t(jvm_option_name[=jvm_option_value])[:jvm_option_name=jvm_option_name*]
7c7
< delete.jvm.options.usagetext=delete-jvm-options [--target target(Default server)][-?|--help=false] (jvm_option_name[=jvm_option_value])[:jvm_option_name[=jvm_option_name]]*
---
> delete.jvm.options.usagetext=delete-jvm-options\n\t[--target <target(Default server)>] [-?|--help[=<help(default:false)>]]\n\t(jvm_option_name[=jvm_option_value])[:jvm_option_name[=jvm_option_name]]*
104c104
< set.log.level.usagetext=set-log-level [-?|--help=false] (logger_name=logging_value)[:logger_name=logging_value]*
---
> set.log.level.usagetext=set-log-level\n\t[-?|--help[=<help(default:false)>]]\n\t(logger_name=logging_value)[:logger_name=logging_value]*
106c106
< set.log.level.failed=Could not set logger levels.
\ No newline at end of file
---
> set.log.level.failed=Could not set logger levels.
Index: deployment/admin/src/main/java/org/glassfish/deployment/admin/LocalStrings.properties
===================================================================
3c3
< deploy.command.usagetext=deploy [--virtualservers virtual_servers] [--contextroot context_root] [--force=false] [--precompilejsp=false] [--verify=false] [--name component_name] [--upload=false] [--retrieve local_dirpath] [--dbvendorname dbvendorname] [--createtables=true | --dropandcreatetables=true] [--uniquetablenames=true] [--deploymentplan deployment_plan] [--enabled=true] [--generatermistubs=false] [--libraries jar_file[,jar_file*]] [--type pkg-type] [--properties(name=value)[:name=value]*] [-?|--help=false] file_archive | filepath
---
> deploy.command.usagetext=deploy\n\t[--virtualservers <virtual_servers>] [--contextroot <context_root>]\n\t[--force[=<force(default:false)>]]\n\t[--precompilejsp[=<precompilejsp(default:false)>]]\n\t[--verify[=<verify(default:false)>]] [--name <component_name>]\n\t[--upload[=<upload(default:false)>]] [--retrieve <local_dirpath>]\n\t[--dbvendorname <dbvendorname>]\n\t[--createtables[=createtables(default:false)>] |\n\t--dropandcreatetables[=<dropandcreatetables(default:false)>]]\n\t[--uniquetablenames[=<uniquetablenames(default:false)>]]\n\t[--deploymentplan <deployment_plan>] [--enabled[=<enabled(default:true)>]]\n\t[--generatermistubs[=<generatermistubs(default:false)>]]\n\t[--libraries jar_file[,jar_file*]] [--type <pkg-type>]\n\t[--properties (name=value)[:name=value]*]\n\t[-?|--help[=<help(defalt:false)>]] file_archive | filepath
42c42
< undeploy.command.usagetext=undeploy [--target=target] [--keepreposdir=false] [--droptables=true] [--cascade=false] [--properties(name=value)[:name=value]*] [-?|--help=false] name
---
> undeploy.command.usagetext=undeploy\n\t[--target <target>] [--keepreposdir[=<keepreposdir(default:false)>]]\n\t[--droptables[=<droptables(default:false)>]]\n\t[--cascade[=<cascade(default:false)>]]\n\t[--properties (name=value)[:name=value]*]\n\t[-?|--help[=<help(default:false)>]] name
50c50
< deploydir.command.usagetext=deploydir [--virtualservers virtual_servers] [--contextroot context_root] [--force=false] [--precompilejsp=false] [--verify=false] [--name component_name] [--upload=false] [--retrieve local_dirpath] [--dbvendorname dbvendorname] [--createtables=true | --dropandcreatetables=true] [--uniquetablenames=true] [--deploymentplan deployment_plan] [--enabled=true] [--generatermistubs=false] [--libraries jar_file[,jar_file*]] [--type pkg-type] [--properties(name=value)[:name=value]*] [-?|--help=false] dirpath
---
> deploydir.command.usagetext=deploydir\n\t[--virtualservers <virtual_servers>] [--contextroot <context_root>]\n\t[--force[=<force(default:false)>]]\n\t[--precompilejsp[=<precompilejsp(default:false)>]]\n\t[--verify[=<verify(default:false)>]] [--name <component_name>]\n\t[--upload[=<upload(default:false)>]] [--retrieve <local_dirpath>]\n\t[--dbvendorname <dbvendorname>]\n\t[--createtables[=createtables(default:false)>] |\n\t--dropandcreatetables[=<dropandcreatetables(default:false)>]]\n\t[--uniquetablenames[=<uniquetablenames(default:false)>]]\n\t[--deploymentplan <deployment_plan>] [--enabled[=<enabled(default:true)>]]\n\t[--generatermistubs[=<generatermistubs(default:false)>]]\n\t[--libraries jar_file[,jar_file*]] [--type <pkg-type>]\n\t[--properties (name=value)[:name=value]*]\n\t[-?|--help[=<help(defalt:false)>]] dirpath
59c59
< redeploy.command.usagetext=redeploy [--virtualservers virtual_servers] [--contextroot context_root] [--precompilejsp=false] [--verify=false] [--name component_name] [--upload=false] [--retrieve local_dirpath] [--dbvendorname dbvendorname] [--createtables=true | --dropandcreatetables=true] [--uniquetablenames=true] [--deploymentplan deployment_plan] [--enabled=true] [--generatermistubs=false] [--libraries jar_file[,jar_file*]] [--type pkg-type] [--properties(name=value)[:name=value]*] [-?|--help=false] file_archive | filepath
---
> redeploy.command.usagetext=redeploy\n\t[--virtualservers <virtual_servers>] [--contextroot <context_root>]\n\t[--precompilejsp[=<precompilejsp(default:false)>]]\n\t[--verify[=<verify(default:false)>]] [--name <component_name>]\n\t[--upload[=<upload(default:false)>]] [--retrieve <local_dirpath>]\n\t[--dbvendorname <dbvendorname>]\n\t[--createtables[=createtables(default:false)>] |\n\t--dropandcreatetables[=<dropandcreatetables(default:false)>]]\n\t[--uniquetablenames[=<uniquetablenames(default:false)>]]\n\t[--deploymentplan <deployment_plan>] [--enabled[=<enabled(default:true)>]]\n\t[--generatermistubs[=<generatermistubs(default:false)>]]\n\t[--libraries jar_file[,jar_file*]] [--type <pkg-type>]\n\t[--properties (name=value)[:name=value]*]\n\t[-?|--help[=<help(defalt:false)>]] file_archive | filepath
80c80
< list.applications.usagetext=list-applications [--type=type] [-?|--help=false]
---
> list.applications.usagetext=list-applications\n\t[--type <type>] [-?|--help[=<help(default:false)>]]
Index: security/core/src/main/java/com/sun/enterprise/security/cli/LocalStrings.properties
===================================================================
1c1
< create.file.user.usagetext=create-file-user [--groups user_groups[:user_groups]*] [--authrealmname authrealm_name] [-?|--help=false] username
---
> create.file.user.usagetext=create-file-user\n\t[--groups user_groups[:user_groups]*] [--authrealmname <authrealm_name>]\n\t[-?|--help[=<help(default:false)>]] username
74c74
< create.password.alias.alreadyexists=Password alias with the specified name already exists. Please use the update-password-alias command to change it
\ No newline at end of file
---
> create.password.alias.alreadyexists=Password alias with the specified name already exists. Please use the update-password-alias command to change it
Index: web/admin/src/main/java/org/glassfish/web/admin/cli/LocalStrings.properties
===================================================================
32c32
< create.virtual.server.usagetext=create-virtual-server --hosts <hosts> [--httplisteners <httplisteners> | --networklisteners <networklisteners>] [--defaultwebmodule <defaultwebmodule>] [--state <state>] [--logfile <logfile>] [--property <property>] [-?|--help=false] virtual_server_id
---
> create.virtual.server.usagetext=create-virtual-server --hosts <hosts>\n\t[--httplisteners <httplisteners> |\n\t--networklisteners <networklisteners>]\n\t[--defaultwebmodule <defaultwebmodule>] [--state <state>]\n\t[--logfile <logfile>] [--property <property>]\n\t[-?|--help[=<help(default:false)>]] virtual_server_id
69c69
< create.http.fail.protocolnotfound=The specified protocol {0} is not yet configured
\ No newline at end of file
---
> create.http.fail.protocolnotfound=The specified protocol {0} is not yet configured