[jboss-cvs] JBossAS SVN: r99560 - in projects/server-manager/trunk: src/main/java/org/jboss/jbossas/servermanager and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2010-01-18 18:30:08 -0500 (Mon, 18 Jan 2010)
New Revision: 99560

Modified:
   projects/server-manager/trunk/pom.xml
   projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
Log:
JBASM-33 and pom updates preparing release for AS 6

Modified: projects/server-manager/trunk/pom.xml
===================================================================
--- projects/server-manager/trunk/pom.xml	2010-01-18 21:30:40 UTC (rev 99559)
+++ projects/server-manager/trunk/pom.xml	2010-01-18 23:30:08 UTC (rev 99560)
@@ -33,9 +33,9 @@
       Versioning
       
     -->
-    <version.org.jboss.security>2.0.3.SP1</version.org.jboss.security>
-    <version.jbossas>5.0.1.GA</version.jbossas>
-    <version.org.jboss.logging>2.0.5.GA</version.org.jboss.logging>
+    <version.org.jboss.security>2.0.4.SP2</version.org.jboss.security>
+    <version.jbossas>6.0.0.M1</version.jbossas>
+    <version.org.jboss.logging>2.1.0.GA</version.org.jboss.logging>
 
     <!-- External -->
     <version.junit_junit>4.4</version.junit_junit>
@@ -137,7 +137,7 @@
     <dependency>
       <groupId>org.jboss.naming</groupId>
       <artifactId>jnp-client</artifactId>
-      <version>${version.jbossas}</version>
+      <version>5.0.4.GA</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>

Modified: projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
===================================================================
--- projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2010-01-18 21:30:40 UTC (rev 99559)
+++ projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2010-01-18 23:30:08 UTC (rev 99560)
@@ -425,11 +425,15 @@
 		
       if (!server.isRunning())
       {
-         throw new IllegalArgumentException("The " + server.getName() + " is not running; it cannot be stopped.");
+         //throw new IllegalArgumentException("The " + server.getName() + " is not running; it cannot be stopped.");
+         // JBASM-33
+        System.err.println("The server " + server.getName() + " is not running; it cannot be stopped.");
       }
+	else
+      {
+      	System.out.println("Shutting down server: " + server.getName());
+      }
 
-      System.out.println("Shutting down server: " + server.getName());
-
       /** Catch everything as we want the server killed unconditionally **/
       try
       {