Author: ammulder Date: Mon Nov 8 21:54:44 2004 New Revision: 57004 Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java Log: Can't very well use commas to separate targets when the target names are ObjectNames containing... commas.
Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java ============================================================================== --- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java (original) +++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDeploy.java Mon Nov 8 21:54:44 2004 @@ -33,7 +33,7 @@ */ public class CommandDeploy extends CommandDistribute { public CommandDeploy() { - super("deploy", "1. Common Commands", "[--targets target,target,...] [module] [plan]", + super("deploy", "1. Common Commands", "[--targets target;target;...] [module] [plan]", "Normally both a module and plan are passed to the deployer. " + "Sometimes the module contains a plan, or requires no plan, in which case " + "the plan may be omitted. Sometimes the plan references a module already " + Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java ============================================================================== --- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java (original) +++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/cli/CommandDistribute.java Mon Nov 8 21:54:44 2004 @@ -34,7 +34,7 @@ */ public class CommandDistribute extends AbstractCommand { public CommandDistribute() { - super("distribute", "2. Other Commands", "[--targets target,target,...] [module] [plan]", + super("distribute", "2. Other Commands", "[--targets target;target;...] [module] [plan]", "Processes a module and adds it to the server environment, but does "+ "not start it or mark it to be started in the future." + "Normally both a module and plan are passed to the deployer. " + @@ -146,7 +146,7 @@ private String[] processTargets(String[] args, List targets) { if(args.length >= 2 && args[0].equals("--targets")) { String value = args[1]; - StringTokenizer tok = new StringTokenizer(value, ",", false); + StringTokenizer tok = new StringTokenizer(value, ";", false); while(tok.hasMoreTokens()) { targets.add(tok.nextToken()); }