[jboss-cvs] test/src/main/org/jboss/test/util/server ...

[Anil Saldhana]

  User: asaldhana
  Date: 06/07/12 00:11:56

  Modified:    src/main/org/jboss/test/util/server    Server.java
                        ServerController.java ServerManager.java
  Log:
  JBQA-405: Add the jboss-common.jar to the classpath as part of the shutdown command. This surprisingly was making the test configurations hang
  
  Revision  Changes    Path
  1.4       +2 -2      test/src/main/org/jboss/test/util/server/Server.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Server.java
  ===================================================================
  RCS file: /cvsroot/jboss/test/src/main/org/jboss/test/util/server/Server.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Server.java	30 Oct 2005 00:04:22 -0000	1.3
  +++ Server.java	12 Jul 2006 04:11:56 -0000	1.4
  @@ -33,7 +33,7 @@
    * A Server.
    * 
    * @author <a href="ryan.campbell at jboss.com">Ryan Campbell</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class Server
   {
  
  
  
  1.8       +6 -5      test/src/main/org/jboss/test/util/server/ServerController.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerController.java
  ===================================================================
  RCS file: /cvsroot/jboss/test/src/main/org/jboss/test/util/server/ServerController.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ServerController.java	12 Jul 2006 01:22:47 -0000	1.7
  +++ ServerController.java	12 Jul 2006 04:11:56 -0000	1.8
  @@ -36,7 +36,7 @@
    * Starts, stops, and (eventually) reboots server instances.
    * 
    * @author <a href="ryan.campbell at jboss.com">Ryan Campbell</a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public abstract class ServerController
   {
  @@ -264,6 +264,7 @@
         System.out.println("Shutting down server: " + server.getName());
   
         String shutdownCmd = getStopCommandLine(server, manager);
  +      System.out.println("Shutting down server: " + shutdownCmd);
   
         Runtime.getRuntime().exec(shutdownCmd);
   
  @@ -347,7 +348,7 @@
       * A OutputPumper.  Redirect std err & out to log files.
       * 
       * @author <a href="ryan.campbell at jboss.com">Ryan Campbell</a>
  -    * @version $Revision: 1.7 $
  +    * @version $Revision: 1.8 $
       */
      private static class OutputPumper extends Thread
      {
  
  
  
  1.7       +5 -3      test/src/main/org/jboss/test/util/server/ServerManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/test/src/main/org/jboss/test/util/server/ServerManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ServerManager.java	12 Jul 2006 01:22:47 -0000	1.6
  +++ ServerManager.java	12 Jul 2006 04:11:56 -0000	1.7
  @@ -32,12 +32,12 @@
    * A ServerManager.
    * 
    * @author <a href="ryan.campbell at jboss.com">Ryan Campbell</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public class ServerManager
   { 
      /**
  -    * Wait for 60 secs
  +    * Wait for 45 secs
       */
      private static final int WAIT_TIME = 45;
      private static final int START_TIME = 120;
  @@ -202,7 +202,9 @@
      {
         File shutdownJar = new File(jbossHome + "/bin/shutdown.jar");
         File clientJar = new File(jbossHome + "/client/jbossall-client.jar");
  -      return shutdownJar.toString() + File.pathSeparator + clientJar.toString();
  +      File logJar = new File(jbossHome + "/client/jboss-common.jar");
  +      return shutdownJar.toString() + File.pathSeparator + clientJar.toString()+ File.pathSeparator 
  +           + logJar.toString();
      }
   
      /**