Author: jfrederic.clere(a)jboss.com Date: 2008-06-18 05:23:46 -0400 (Wed, 18 Jun 2008) New Revision: 670 Modified: trunk/java/org/apache/catalina/Server.java trunk/java/org/apache/catalina/core/StandardServer.java trunk/java/org/apache/catalina/startup/Catalina.java Log: Allow to start several JBossWEB on one machine with multiple IP. Modified: trunk/java/org/apache/catalina/Server.java =================================================================== --- trunk/java/org/apache/catalina/Server.java 2008-06-17 10:29:23 UTC (rev 669) +++ trunk/java/org/apache/catalina/Server.java 2008-06-18 09:23:46 UTC (rev 670) @@ -89,6 +89,20 @@ /** + * Return the address on which we listen to for shutdown commands. + */ + public String getAddress(); + + + /** + * Set the address on which we listen to for shutdown commands. + * + * @param address The new address + */ + public void setAddress(String address); + + + /** * Return the shutdown command string we are waiting for. */ public String getShutdown(); Modified: trunk/java/org/apache/catalina/core/StandardServer.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardServer.java 2008-06-17 10:29:23 UTC (rev 669) +++ trunk/java/org/apache/catalina/core/StandardServer.java 2008-06-18 09:23:46 UTC (rev 670) @@ -136,7 +136,12 @@ */ private int port = 8005; + /** + * The address on which we wait for shutdown commands. + */ + private String address = "localhost"; + /** * A random number generator that is <strong>only</strong> used if * the shutdown command string is longer than 1024 characters. @@ -280,6 +285,27 @@ /** + * Return the address on which we listen to for shutdown commands. + */ + public String getAddress() { + + return (this.address); + + } + + + /** + * Set the address on which we listen to for shutdown commands. + * + * @param address The new address + */ + public void setAddress(String address) { + + this.address = address; + + } + + /** * Return the shutdown command string we are waiting for. */ public String getShutdown() { @@ -371,9 +397,10 @@ try { serverSocket = new ServerSocket(port, 1, - InetAddress.getByName("localhost")); + InetAddress.getByName(address)); } catch (IOException e) { - log.error("StandardServer.await: create[" + port + log.error("StandardServer.await: create[" + address + + ":" + port + "]: ", e); System.exit(1); } Modified: trunk/java/org/apache/catalina/startup/Catalina.java =================================================================== --- trunk/java/org/apache/catalina/startup/Catalina.java 2008-06-17 10:29:23 UTC (rev 669) +++ trunk/java/org/apache/catalina/startup/Catalina.java 2008-06-18 09:23:46 UTC (rev 670) @@ -412,7 +412,7 @@ // Stop the existing server try { - Socket socket = new Socket("localhost", server.getPort()); + Socket socket = new Socket(server.getAddress(), server.getPort()); OutputStream stream = socket.getOutputStream(); String shutdown = server.getShutdown(); for (int i = 0; i < shutdown.length(); i++)