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

[Anil Saldhana]

  User: asaldhana
  Date: 06/07/11 21:22:47

  Modified:    src/main/org/jboss/test/util/server   ServerController.java
                        ServerManager.java
  Log:
  JBQA-405: Make the shutdown timeout shorter to 45 secs rather than the previous value of 120secs
  
  Revision  Changes    Path
  1.7       +3 -2      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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ServerController.java	30 Oct 2005 00:04:22 -0000	1.6
  +++ ServerController.java	12 Jul 2006 01:22:47 -0000	1.7
  @@ -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.6 $
  + * @version $Revision: 1.7 $
    */
   public abstract class ServerController
   {
  @@ -291,6 +291,7 @@
      private static boolean waitOnShutdown(Server server, ServerManager manager)
      {
         int shutdownTimeout = manager.getShutdownTimeout();
  +      System.out.println("shutdownTimeout will be="+shutdownTimeout);
         for (int tries = 0; tries < shutdownTimeout; tries++)
         {
            try
  @@ -346,7 +347,7 @@
       * A OutputPumper.  Redirect std err & out to log files.
       * 
       * @author <a href="ryan.campbell at jboss.com">Ryan Campbell</a>
  -    * @version $Revision: 1.6 $
  +    * @version $Revision: 1.7 $
       */
      private static class OutputPumper extends Thread
      {
  
  
  
  1.6       +10 -5     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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ServerManager.java	30 Oct 2005 00:04:22 -0000	1.5
  +++ ServerManager.java	12 Jul 2006 01:22:47 -0000	1.6
  @@ -32,10 +32,15 @@
    * A ServerManager.
    * 
    * @author <a href="ryan.campbell at jboss.com">Ryan Campbell</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class ServerManager
   {
  +   /**
  +    * Wait for 60 secs
  +    */
  +   private static final int WAIT_TIME = 45;
  +   private static final int START_TIME = 120;
   
      /** jboss root **/
      private String jbossHome;
  @@ -215,7 +220,7 @@
       */
      public int getShutdownTimeout()
      {
  -      return 120;
  +      return WAIT_TIME;
      }
   
      /** 
  @@ -224,7 +229,7 @@
       */
      public int getStartupTimeout()
      {
  -      return 120;
  +      return START_TIME;
      }
   
      /**