geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1173554 - /geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java
Date Wed, 21 Sep 2011 10:11:16 GMT
Author: violalu
Date: Wed Sep 21 10:11:16 2011
New Revision: 1173554

URL: http://svn.apache.org/viewvc?rev=1173554&view=rev
Log:
GERONIMO-6168 Fix illegalArgumentException when redirect undeploy output to a file

Modified:
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java?rev=1173554&r1=1173553&r2=1173554&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandStart.java
Wed Sep 21 10:11:16 2011
@@ -61,11 +61,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{
@@ -75,7 +75,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));
                             }
                         }
                     }



Mime
View raw message