Author: dblevins Date: Thu May 27 22:09:25 2010 New Revision: 949020 URL: http://svn.apache.org/viewvc?rev=949020&view=rev Log: svn merge -r 946704:946705 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=946705&view=rev ------------------------------------------------------------------------ r946705 | dblevins | 2010-05-20 09:48:26 -0700 (Thu, 20 May 2010) | 3 lines One more part for OPENEJB-1249 Call the Server.stop() method on shutdown ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) openejb/branches/openejb-3.1.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 22:09:25 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946485,946489,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946485,946489,946705,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 22:09:25 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 -/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946485,946489,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989,946485,946489,946705,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 27 22:09:25 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 -/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946485,946489,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989,946485,946489,946705,946792,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548 Modified: openejb/branches/openejb-3.1.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java?rev=949020&r1=949019&r2=949020&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java (original) +++ openejb/branches/openejb-3.1.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java Thu May 27 22:09:25 2010 @@ -21,9 +21,10 @@ import java.net.*; import java.util.*; import org.apache.openejb.server.ServerService; -import org.apache.openejb.server.ServiceManager; import org.apache.openejb.server.ServiceException; +import org.apache.openejb.server.Server; import org.apache.openejb.client.RequestMethodConstants; +import org.apache.openejb.loader.SystemInstance; public class AdminDaemon implements ServerService { @@ -32,11 +33,9 @@ public class AdminDaemon implements Serv public void service(Socket socket) throws ServiceException, IOException { InputStream in = null; - InetAddress clientIP = null; try { in = socket.getInputStream(); - clientIP = socket.getInetAddress(); byte requestType = (byte) in.read(); @@ -49,7 +48,8 @@ public class AdminDaemon implements Serv case RequestMethodConstants.STOP_REQUEST_quit: case RequestMethodConstants.STOP_REQUEST_Stop: case RequestMethodConstants.STOP_REQUEST_stop: - ServiceManager.getManager().stop(); + Server server = SystemInstance.get().getComponent(Server.class); + server.stop(); }
