You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/09/21 11:41:50 UTC
svn commit: r1173543 -
/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java
Author: violalu
Date: Wed Sep 21 09:41:50 2011
New Revision: 1173543
URL: http://svn.apache.org/viewvc?rev=1173543&view=rev
Log:
GERONIMO-6168 Fix illegalArgumentException when redirect undeploy output to a file
Modified:
geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java?rev=1173543&r1=1173542&r2=1173543&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java Wed Sep 21 09:41:50 2011
@@ -63,11 +63,11 @@ public class CommandStart extends Abstra
consoleReader.printNewline();
for(int i = 0; i < done.length; i++) {
TargetModuleID id = done[i];
- DeployUtils.println(getAction()+" "+id.getModuleID()+((multiple && id.getTarget() != null) ? " on "+ id.getTarget().getName() : "")+(id.getWebURL() == null || !getAction().equals("Started") ? "" : " @ "+id.getWebURL()),4, consoleReader);
+ consoleReader.printString(DeployUtils.reformat((getAction()+" "+id.getModuleID()+((multiple && id.getTarget() != null) ? " on "+ id.getTarget().getName() : "")+(id.getWebURL() == null || !getAction().equals("Started") ? "" : " @ "+id.getWebURL())), 4, 72));
if(id.getChildTargetModuleID() != null) {
for (int j = 0; j < id.getChildTargetModuleID().length; j++) {
TargetModuleID child = id.getChildTargetModuleID()[j];
- DeployUtils.println(" `-> "+child.getModuleID()+(child.getWebURL() == null || getAction().toLowerCase().indexOf("started") == -1 ? "" : " @ "+child.getWebURL()),4, consoleReader);
+ consoleReader.printString(DeployUtils.reformat(" `-> "+child.getModuleID()+(child.getWebURL() == null || getAction().toLowerCase().indexOf("started") == -1 ? "" : " @ "+child.getWebURL()),4, 72));
}
} // Also print childs if existing in earlier configuration
else{
@@ -77,7 +77,7 @@ public class CommandStart extends Abstra
if(childs.getChildTargetModuleID() != null) {
for (int j = 0; j < childs.getChildTargetModuleID().length; j++) {
TargetModuleID child = childs.getChildTargetModuleID()[j];
- DeployUtils.println(" `-> "+child.getModuleID()+(child.getWebURL() == null || getAction().toLowerCase().indexOf("started") == -1 ? "" : " @ "+child.getWebURL()),4, consoleReader);
+ consoleReader.printString(DeployUtils.reformat(" `-> "+child.getModuleID()+(child.getWebURL() == null || getAction().toLowerCase().indexOf("started") == -1 ? "" : " @ "+child.getWebURL()),4, 72));
}
}
}