[jboss-cvs] JBossAS SVN: r70290 - in projects/server-manager/trunk/src/main/java: org and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 1 17:26:31 EST 2008
Author: ALRubinger
Date: 2008-03-01 17:26:31 -0500 (Sat, 01 Mar 2008)
New Revision: 70290
Added:
projects/server-manager/trunk/src/main/java/org/
projects/server-manager/trunk/src/main/java/org/jboss/
projects/server-manager/trunk/src/main/java/org/jboss/servermanager/
projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/
projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerManager.java
Removed:
projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerManager.java
Modified:
projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/Argument.java
projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/Property.java
projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/Server.java
projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerController.java
projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerShutdownException.java
Log:
Resolved compilation errors
Copied: projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server (from rev 70283, projects/test/trunk/src/main/java/org/jboss/test/util/server)
Modified: projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/Argument.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/util/server/Argument.java 2008-02-29 18:34:47 UTC (rev 70283)
+++ projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/Argument.java 2008-03-01 22:26:31 UTC (rev 70290)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.util.server;
+package org.jboss.servermanager.server;
/**
* A command line argument.
Modified: projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/Property.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/util/server/Property.java 2008-02-29 18:34:47 UTC (rev 70283)
+++ projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/Property.java 2008-03-01 22:26:31 UTC (rev 70290)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.util.server;
+package org.jboss.servermanager.server;
/**
* A Property.
Modified: projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/Server.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/util/server/Server.java 2008-02-29 18:34:47 UTC (rev 70283)
+++ projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/Server.java 2008-03-01 22:26:31 UTC (rev 70290)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.util.server;
+package org.jboss.servermanager.server;
import java.io.File;
import java.io.PrintWriter;
Modified: projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerController.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerController.java 2008-02-29 18:34:47 UTC (rev 70283)
+++ projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerController.java 2008-03-01 22:26:31 UTC (rev 70290)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.util.server;
+package org.jboss.servermanager.server;
import java.io.BufferedReader;
import java.io.File;
Deleted: projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerManager.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerManager.java 2008-02-29 18:34:47 UTC (rev 70283)
+++ projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerManager.java 2008-03-01 22:26:31 UTC (rev 70290)
@@ -1,262 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.util.server;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-
-/**
- * A ServerManager.
- *
- * @author <a href="ryan.campbell at jboss.com">Ryan Campbell</a>
- * @version $Revision$
- */
-public class ServerManager
-{
- /**
- * Wait for 45 secs
- */
- // set jbossas.startup.timeout property in env.ANT_OPTS
- private static final int WAIT_TIME = Integer.parseInt(System.getProperty("jbossas.startup.timeout", "45"));
- private static final int START_TIME = Integer.parseInt(System.getProperty("jbossas.startup.timeout", "120"));
-
- /** jboss root **/
- private String jbossHome;
-
- /** the jvm executable **/
- private String jvm = "java";
-
- /** the java home to use**/
- private String javaHome;
-
- private String udpGroup;
-
- /** list of all configured servers **/
- private List<Server> servers = new ArrayList<Server>();
-
- /**
- * Create a new ServerManager. Make sure all servers are killed on shutdown.
- *
- */
- public ServerManager()
- {
- Thread cleanupThread = new Thread()
- {
- public void run()
- {
- for (Iterator iter = servers.iterator(); iter.hasNext();)
- {
- Server server = (Server) iter.next();
- if (server.isRunning())
- {
- System.err.println("Found server \""+server.getName()+"\" still running; stopping it.");
- try
- {
- ServerController.stopServer(server, ServerManager.this);
- }
- catch (IOException e)
- {
- System.err.println("Failed to stop server(s) on shutdown.");
- e.printStackTrace(System.err);
- }
- }
- }
- }
- };
-
- Runtime.getRuntime().addShutdownHook(cleanupThread);
-
- }
-
- /**
- * Add a server
- *
- * @param newServer
- */
- public void addServer(Server newServer)
- {
- newServer.setManager(this);
- servers.add(newServer);
- }
-
- /**
- * Get the server by name. Can't use a hashmap because of
- * Ant.
- *
- * @param name the name of the server
- * @return the server
- */
- public Server getServer(String name)
- {
- for (Iterator iter = servers.iterator(); iter.hasNext();)
- {
- Server server = (Server) iter.next();
- if (server.getName().equals(name))
- {
- return server;
- }
- }
- throw new IllegalArgumentException("There is no server named: " + name);
- }
-
- /**
- * Start the named server.
- *
- * @param serverName
- * @throws IOException
- */
- public void startServer(String serverName) throws IOException
- {
- ServerController.startServer(getServer(serverName), this);
- }
-
- /**
- * Stop the named server
- *
- * @param name
- * @throws IOException
- */
- public void stopServer(String name) throws IOException
- {
- ServerController.stopServer(getServer(name), this);
- }
-
- /**
- * Get the jvm.
- *
- * @return the jvm.
- * @throws IOException
- */
- public String getJavaExecutable() throws IOException
- {
- return new File(javaHome + File.separator + "bin",jvm).getCanonicalPath();
- }
-
- /**
- * Set the jvm.
- *
- * @param jvm The jvm to set.
- */
- public void setJvm(String jvm)
- {
- this.jvm = jvm;
- }
-
- /**
- * Set the javaHome.
- *
- * @param javaHome The javaHome to set.
- */
- public void setJavaHome(String javaHome)
- {
- this.javaHome = javaHome;
- }
-
- /**
- * @param jbossHome The jBossHome to set.
- */
- public void setJbossHome(String jbossHome)
- {
- this.jbossHome = jbossHome;
- }
-
- /**
- * The classpath to run the server
- *
- * @return the classpath as a string
- */
- protected String getStartClasspath()
- {
- File runjar = new File(jbossHome + "/bin/run.jar");
- File javaJar = new File(javaHome + "/lib/tools.jar");
- return runjar.toString() + File.pathSeparator + javaJar.toString();
- }
-
- /**
- * The classpath used to stop the server.
- *
- * @return the string to put on the classpath
- */
- protected String getStopClasspath()
- {
- File shutdownJar = new File(jbossHome + "/bin/shutdown.jar");
- File clientJar = new File(jbossHome + "/client/jbossall-client.jar");
- File logJar = new File(jbossHome + "/client/jboss-common.jar");
- return shutdownJar.toString() + File.pathSeparator + clientJar.toString()+ File.pathSeparator
- + logJar.toString();
- }
-
- /**
- * Get the jboss home.
- *
- * @return the home directory as a string
- */
- public String getJBossHome()
- {
- return jbossHome;
- }
-
- /**
- * How long to wait (in seconds) for a server to shutdown
- *
- * @return the shutdown timeout
- */
- public int getShutdownTimeout()
- {
- return WAIT_TIME;
- }
-
- /**
- * How long to wait (in seconds) for a server to startup
- *
- * @return the startup timeout
- */
- public int getStartupTimeout()
- {
- return START_TIME;
- }
-
- /**
- * Get the udpGroup.
- *
- * @return the udpGroup.
- */
- protected String getUdpGroup()
- {
- return udpGroup;
- }
-
- /**
- * Set the udpGroup.
- *
- * @param udpGroup The udpGroup to set.
- */
- public void setUdpGroup(String udpGroup)
- {
- this.udpGroup = udpGroup;
- }
-
-}
Copied: projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerManager.java (from rev 70289, projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerManager.java)
===================================================================
--- projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerManager.java (rev 0)
+++ projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerManager.java 2008-03-01 22:26:31 UTC (rev 70290)
@@ -0,0 +1,262 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.servermanager.server;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+/**
+ * A ServerManager.
+ *
+ * @author <a href="ryan.campbell at jboss.com">Ryan Campbell</a>
+ * @version $Revision$
+ */
+public class ServerManager
+{
+ /**
+ * Wait for 45 secs
+ */
+ // set jbossas.startup.timeout property in env.ANT_OPTS
+ private static final int WAIT_TIME = Integer.parseInt(System.getProperty("jbossas.startup.timeout", "45"));
+ private static final int START_TIME = Integer.parseInt(System.getProperty("jbossas.startup.timeout", "120"));
+
+ /** jboss root **/
+ private String jbossHome;
+
+ /** the jvm executable **/
+ private String jvm = "java";
+
+ /** the java home to use**/
+ private String javaHome;
+
+ private String udpGroup;
+
+ /** list of all configured servers **/
+ private List<Server> servers = new ArrayList<Server>();
+
+ /**
+ * Create a new ServerManager. Make sure all servers are killed on shutdown.
+ *
+ */
+ public ServerManager()
+ {
+ Thread cleanupThread = new Thread()
+ {
+ public void run()
+ {
+ for (Iterator<Server> iter = servers.iterator(); iter.hasNext();)
+ {
+ Server server = iter.next();
+ if (server.isRunning())
+ {
+ System.err.println("Found server \""+server.getName()+"\" still running; stopping it.");
+ try
+ {
+ ServerController.stopServer(server, ServerManager.this);
+ }
+ catch (IOException e)
+ {
+ System.err.println("Failed to stop server(s) on shutdown.");
+ e.printStackTrace(System.err);
+ }
+ }
+ }
+ }
+ };
+
+ Runtime.getRuntime().addShutdownHook(cleanupThread);
+
+ }
+
+ /**
+ * Add a server
+ *
+ * @param newServer
+ */
+ public void addServer(Server newServer)
+ {
+ newServer.setManager(this);
+ servers.add(newServer);
+ }
+
+ /**
+ * Get the server by name. Can't use a hashmap because of
+ * Ant.
+ *
+ * @param name the name of the server
+ * @return the server
+ */
+ public Server getServer(String name)
+ {
+ for (Iterator<Server> iter = servers.iterator(); iter.hasNext();)
+ {
+ Server server = iter.next();
+ if (server.getName().equals(name))
+ {
+ return server;
+ }
+ }
+ throw new IllegalArgumentException("There is no server named: " + name);
+ }
+
+ /**
+ * Start the named server.
+ *
+ * @param serverName
+ * @throws IOException
+ */
+ public void startServer(String serverName) throws IOException
+ {
+ ServerController.startServer(getServer(serverName), this);
+ }
+
+ /**
+ * Stop the named server
+ *
+ * @param name
+ * @throws IOException
+ */
+ public void stopServer(String name) throws IOException
+ {
+ ServerController.stopServer(getServer(name), this);
+ }
+
+ /**
+ * Get the jvm.
+ *
+ * @return the jvm.
+ * @throws IOException
+ */
+ public String getJavaExecutable() throws IOException
+ {
+ return new File(javaHome + File.separator + "bin",jvm).getCanonicalPath();
+ }
+
+ /**
+ * Set the jvm.
+ *
+ * @param jvm The jvm to set.
+ */
+ public void setJvm(String jvm)
+ {
+ this.jvm = jvm;
+ }
+
+ /**
+ * Set the javaHome.
+ *
+ * @param javaHome The javaHome to set.
+ */
+ public void setJavaHome(String javaHome)
+ {
+ this.javaHome = javaHome;
+ }
+
+ /**
+ * @param jbossHome The jBossHome to set.
+ */
+ public void setJbossHome(String jbossHome)
+ {
+ this.jbossHome = jbossHome;
+ }
+
+ /**
+ * The classpath to run the server
+ *
+ * @return the classpath as a string
+ */
+ protected String getStartClasspath()
+ {
+ File runjar = new File(jbossHome + "/bin/run.jar");
+ File javaJar = new File(javaHome + "/lib/tools.jar");
+ return runjar.toString() + File.pathSeparator + javaJar.toString();
+ }
+
+ /**
+ * The classpath used to stop the server.
+ *
+ * @return the string to put on the classpath
+ */
+ protected String getStopClasspath()
+ {
+ File shutdownJar = new File(jbossHome + "/bin/shutdown.jar");
+ File clientJar = new File(jbossHome + "/client/jbossall-client.jar");
+ File logJar = new File(jbossHome + "/client/jboss-common.jar");
+ return shutdownJar.toString() + File.pathSeparator + clientJar.toString()+ File.pathSeparator
+ + logJar.toString();
+ }
+
+ /**
+ * Get the jboss home.
+ *
+ * @return the home directory as a string
+ */
+ public String getJBossHome()
+ {
+ return jbossHome;
+ }
+
+ /**
+ * How long to wait (in seconds) for a server to shutdown
+ *
+ * @return the shutdown timeout
+ */
+ public int getShutdownTimeout()
+ {
+ return WAIT_TIME;
+ }
+
+ /**
+ * How long to wait (in seconds) for a server to startup
+ *
+ * @return the startup timeout
+ */
+ public int getStartupTimeout()
+ {
+ return START_TIME;
+ }
+
+ /**
+ * Get the udpGroup.
+ *
+ * @return the udpGroup.
+ */
+ protected String getUdpGroup()
+ {
+ return udpGroup;
+ }
+
+ /**
+ * Set the udpGroup.
+ *
+ * @param udpGroup The udpGroup to set.
+ */
+ public void setUdpGroup(String udpGroup)
+ {
+ this.udpGroup = udpGroup;
+ }
+
+}
Modified: projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerShutdownException.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/util/server/ServerShutdownException.java 2008-02-29 18:34:47 UTC (rev 70283)
+++ projects/server-manager/trunk/src/main/java/org/jboss/servermanager/server/ServerShutdownException.java 2008-03-01 22:26:31 UTC (rev 70290)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.util.server;
+package org.jboss.servermanager.server;
import java.io.IOException;
More information about the jboss-cvs-commits
mailing list