[jboss-cvs] JBossAS SVN: r68539 - in projects/test/trunk/src/main/java/org/jboss: test/util/server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: akostadinov
Date: 2007-12-22 08:49:02 -0500 (Sat, 22 Dec 2007)
New Revision: 68539

Modified:
   projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StartServerTask.java
   projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StopServerTask.java
   projects/test/trunk/src/main/java/org/jboss/test/util/server/Server.java
   projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerController.java
Log:
support password protected servers as well make build fail on unsuccessful shutdown optional; add error message; http://www.jboss.com/index.html?module=bb&op=viewtopic&t=126217

Modified: projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StartServerTask.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StartServerTask.java	2007-12-22 12:09:30 UTC (rev 68538)
+++ projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StartServerTask.java	2007-12-22 13:49:02 UTC (rev 68539)
@@ -45,6 +45,7 @@
    public void execute() throws BuildException
    {
       ServerManager manager = (ServerManager) getProject().getReference(ConfigManagerTask.MANAGER_REF);
+      if ( manager == null ) throw new BuildException("Can't find reference to server manager. Consider context you execute server tasks.");
       try
       {
          manager.startServer(name);

Modified: projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StopServerTask.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StopServerTask.java	2007-12-22 12:09:30 UTC (rev 68538)
+++ projects/test/trunk/src/main/java/org/jboss/ant/taskdefs/server/StopServerTask.java	2007-12-22 13:49:02 UTC (rev 68539)
@@ -40,6 +40,8 @@
 
    private String name;
 
+   private boolean failonerror = false;
+
    /**
     * Stop the server.
     */
@@ -47,13 +49,14 @@
    public void execute() throws BuildException
    {
       ServerManager manager = (ServerManager) getProject().getReference(ConfigManagerTask.MANAGER_REF);
+      if ( manager == null ) throw new BuildException("Can't find reference to server manager. Consider context you execute server tasks.");
       try
       {
          manager.stopServer(name);
       }
       catch (IOException e)
       {
-			if (e instanceof ServerShutdownException)
+			if (e instanceof ServerShutdownException && !failonerror)
 			{
 				log("Unable to shutdown server properly: " + e, Project.MSG_ERR);
 			}
@@ -73,4 +76,14 @@
    {
       this.name = name;
    }
+
+   /**
+    * Set failonerror.
+    * 
+    * @param failonerror Choice to set.
+    */
+   public void setFailOnError(boolean flag)
+   {
+      this.failonerror = flag;
+   }
 }
\ No newline at end of file

Modified: projects/test/trunk/src/main/java/org/jboss/test/util/server/Server.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/util/server/Server.java	2007-12-22 12:09:30 UTC (rev 68538)
+++ projects/test/trunk/src/main/java/org/jboss/test/util/server/Server.java	2007-12-22 13:49:02 UTC (rev 68539)
@@ -43,6 +43,12 @@
    /** the config to start **/
    private String config;
 
+   /** jmx username **/
+   private String username;
+
+   /** jmx password **/
+   private String password;
+
    /** the arguments to pass to jboss **/
    private List<Argument> arguments = new ArrayList<Argument>();
 
@@ -97,6 +103,51 @@
    }
 
    /**
+    * Get username to pass to org.jboss.Shutdown using
+    * the -u option.
+    *
+    * @return the server jmx username
+    */
+   public String getUsername()
+   {
+      return username;
+   }
+
+   /**
+    * Set username to pass to org.jboss.Shutdown using
+    * the -u option.
+    *
+    * @param username the server jmx username
+    */
+   public void setUsername(String username)
+   {
+      this.username=username;
+   }
+
+   /**
+    * Get password to pass to org.jboss.Shutdown using
+    * the -p option.
+    *
+    * @return the server jmx password
+    */
+
+   public String getPassword()
+   {
+      return password;
+   }
+
+   /**
+    * Set password to pass to org.jboss.Shutdown using
+    * the -p option.
+    *
+    * @param password the server jmx password
+    */
+   public void setPassword(String password)
+   {
+      this.password=password;
+   }
+
+   /**
     * Set the manager.
     * @param manager
     */

Modified: projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerController.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerController.java	2007-12-22 12:09:30 UTC (rev 68538)
+++ projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerController.java	2007-12-22 13:49:02 UTC (rev 68539)
@@ -343,9 +343,17 @@
     */
    private static String getStopCommandLine(Server server, ServerManager manager) throws IOException
    {
+      String strAuth="";
+      String username = server.getUsername();
+      String password = server.getPassword();
+      if ( username != null && password != null )
+      {
+         strAuth = " -u " + username + " -p " + password;
+      }
+
       String execCmd = manager.getJavaExecutable() + " -cp " + manager.getStopClasspath() + " ";
       execCmd = execCmd + SHUTDOWN_CLASS + " --server " + server.getRmiUrl();
-      execCmd = execCmd + " --shutdown";
+      execCmd = execCmd + strAuth +" --shutdown";
       return execCmd;
    }