jlaskowski 2005/06/16 18:29:52
Modified: modules/core/src/java/org/openejb/server/admin
AdminDaemon.java Stop.java
Log:
Fix for #OPENEJB-26: Remove references to sf.net in text and help files
Revision Changes Path
1.2 +138 -138
openejb1/modules/core/src/java/org/openejb/server/admin/AdminDaemon.java
Index: AdminDaemon.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/server/admin/AdminDaemon.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AdminDaemon.java 26 Mar 2004 21:42:52 -0000 1.1
+++ AdminDaemon.java 16 Jun 2005 22:29:52 -0000 1.2
@@ -1,138 +1,138 @@
-/**
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- * statements and notices. Redistributions must also contain a
- * copy of this document.
- *
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * 3. The name "OpenEJB" must not be used to endorse or promote
- * products derived from this Software without prior written
- * permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
- *
- * 4. Products derived from this Software may not be called "OpenEJB"
- * nor may "OpenEJB" appear in their names without prior written
- * permission of The OpenEJB Group. OpenEJB is a registered
- * trademark of The OpenEJB Group.
- *
- * 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.sf.net/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2001 (C) The OpenEJB Group. All Rights Reserved.
- *
- * $Id$
- */
-package org.openejb.server.admin;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.openejb.server.ServerService;
-import org.openejb.server.ServiceManager;
-import org.openejb.server.ServiceException;
-import org.openejb.client.RequestMethods;
-
-/**
- * This is the base class for orcistrating the other daemons
- * which actually accept and react to calls coming in from
- * different protocols or channels.
- *
- * To perform this task, this class will
- * newInstance()
- * init( port, properties)
- * start()
- * stop()
- *
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
- */
-public class AdminDaemon implements ServerService {
-
- public void init(Properties props) throws Exception {
- }
-
-
- 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();
-
- if (requestType == -1) {return;}
-
- switch (requestType) {
- case RequestMethods.STOP_REQUEST_Quit:
- case RequestMethods.STOP_REQUEST_quit:
- case RequestMethods.STOP_REQUEST_Stop:
- case RequestMethods.STOP_REQUEST_stop:
- ServiceManager.getManager().stop();
- //stop(clientIP, serverSocket.getInetAddress());
-
- }
-
- // Exceptions should not be thrown from these methods
- // They should handle their own exceptions and clean
- // things up with the client accordingly.
- } catch ( SecurityException e ) {
- //logger.error( "Security error: "+ e.getMessage() );
- } catch ( Throwable e ) {
- //logger.error( "Unexpected error", e );
- //System.out.println("ERROR: "+clienntIP.getHostAddress()+": "
+e.getMessage());
- } finally {
- try {
- if ( in != null ) in.close();
- if ( socket != null ) socket.close();
- } catch ( Throwable t ){
- //logger.error("Encountered problem while closing connection
with client: "+t.getMessage());
- }
- }
- }
-
- public void start() throws ServiceException {
- }
-
- public void stop() throws ServiceException {
- }
-
- /**
- * Gets the port number that the
- * daemon is listening on.
- */
- public int getPort() {
- return 0;
- }
-
- public String getIP() {
- return "";
- }
-
- public String getName() {
- return "admin thread";
- }
-
-}
+/**
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ * statements and notices. Redistributions must also contain a
+ * copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and the
+ * following disclaimer in the documentation and/or other
+ * materials provided with the distribution.
+ *
+ * 3. The name "OpenEJB" must not be used to endorse or promote
+ * products derived from this Software without prior written
+ * permission of The OpenEJB Group. For written permission,
+ * please contact [EMAIL PROTECTED]
+ *
+ * 4. Products derived from this Software may not be called "OpenEJB"
+ * nor may "OpenEJB" appear in their names without prior written
+ * permission of The OpenEJB Group. OpenEJB is a registered
+ * trademark of The OpenEJB Group.
+ *
+ * 5. Due credit should be given to the OpenEJB Project
+ * (http://www.openejb.org/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2001 (C) The OpenEJB Group. All Rights Reserved.
+ *
+ * $Id$
+ */
+package org.openejb.server.admin;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import org.openejb.server.ServerService;
+import org.openejb.server.ServiceManager;
+import org.openejb.server.ServiceException;
+import org.openejb.client.RequestMethods;
+
+/**
+ * This is the base class for orcistrating the other daemons
+ * which actually accept and react to calls coming in from
+ * different protocols or channels.
+ *
+ * To perform this task, this class will
+ * newInstance()
+ * init( port, properties)
+ * start()
+ * stop()
+ *
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
+ */
+public class AdminDaemon implements ServerService {
+
+ public void init(Properties props) throws Exception {
+ }
+
+
+ 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();
+
+ if (requestType == -1) {return;}
+
+ switch (requestType) {
+ case RequestMethods.STOP_REQUEST_Quit:
+ case RequestMethods.STOP_REQUEST_quit:
+ case RequestMethods.STOP_REQUEST_Stop:
+ case RequestMethods.STOP_REQUEST_stop:
+ ServiceManager.getManager().stop();
+ //stop(clientIP, serverSocket.getInetAddress());
+
+ }
+
+ // Exceptions should not be thrown from these methods
+ // They should handle their own exceptions and clean
+ // things up with the client accordingly.
+ } catch ( SecurityException e ) {
+ //logger.error( "Security error: "+ e.getMessage() );
+ } catch ( Throwable e ) {
+ //logger.error( "Unexpected error", e );
+ //System.out.println("ERROR: "+clienntIP.getHostAddress()+": "
+e.getMessage());
+ } finally {
+ try {
+ if ( in != null ) in.close();
+ if ( socket != null ) socket.close();
+ } catch ( Throwable t ){
+ //logger.error("Encountered problem while closing connection
with client: "+t.getMessage());
+ }
+ }
+ }
+
+ public void start() throws ServiceException {
+ }
+
+ public void stop() throws ServiceException {
+ }
+
+ /**
+ * Gets the port number that the
+ * daemon is listening on.
+ */
+ public int getPort() {
+ return 0;
+ }
+
+ public String getIP() {
+ return "";
+ }
+
+ public String getName() {
+ return "admin thread";
+ }
+
+}
1.3 +168 -168
openejb1/modules/core/src/java/org/openejb/server/admin/Stop.java
Index: Stop.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/server/admin/Stop.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Stop.java 14 May 2004 08:43:04 -0000 1.2
+++ Stop.java 16 Jun 2005 22:29:52 -0000 1.3
@@ -1,168 +1,168 @@
-/**
- * Redistribution and use of this software and associated documentation
- * ("Software"), with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * 1. Redistributions of source code must retain copyright
- * statements and notices. Redistributions must also contain a
- * copy of this document.
- *
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions and the
- * following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * 3. The name "OpenEJB" must not be used to endorse or promote
- * products derived from this Software without prior written
- * permission of The OpenEJB Group. For written permission,
- * please contact [EMAIL PROTECTED]
- *
- * 4. Products derived from this Software may not be called "OpenEJB"
- * nor may "OpenEJB" appear in their names without prior written
- * permission of The OpenEJB Group. OpenEJB is a registered
- * trademark of The OpenEJB Group.
- *
- * 5. Due credit should be given to the OpenEJB Project
- * (http://openejb.sf.net/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright 2001 (C) The OpenEJB Group. All Rights Reserved.
- *
- * $Id$
- */
-package org.openejb.server.admin;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.ConnectException;
-import java.net.Socket;
-import java.net.URL;
-import java.util.Properties;
-
-import org.openejb.util.JarUtils;
-
-/**
- * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
- */
-public class Stop implements org.openejb.client.RequestMethods {
-
- /**
- *
- * @param host The ip address the Remote Server is running on
- * @param port The port the Remote Server is running on
- */
- public static void stop(String host, int port) {
- try{
-
- Socket socket = new Socket(host, port);
- OutputStream out = socket.getOutputStream();
-
- out.write( STOP_REQUEST_Stop );
-
- } catch (ConnectException e){
- System.out.println(":: server not running ::");
- } catch (Exception e){
- e.printStackTrace();
- }
- }
-
- public void stop() {
- stop("localhost",4200);
- }
-
- public static void main(String [] args) {
- try {
-
- // The ip address the Remote Server is running on
- String host = "localhost";
-
- // The port the Remote Server is running on
- int port = 4200;
-
- for (int i=0; i < args.length; i++){
- if (args[i].equals("-h")){
- if (args.length > i+1 ) {
- host = args[++i];
- }
- } else if (args[i].equals("-p")){
- if (args.length > i+1 ) {
- port = Integer.parseInt( args[++i] );
- }
- } else if (args[i].equals("-help")){
- printHelp();
- return;
- } else if (args[i].equals("-examples")){
- printExamples();
- return;
- }
- }
-
- stop( host, port );
- } catch ( Exception re ) {
- System.err.println("[EJB Server] FATAL ERROR: "+
re.getMessage());
- re.printStackTrace();
- }
- }
-
- private static void printHelp() {
- String header = "OpenEJB Remote Server ";
- try {
- JarUtils.setHandlerSystemProperty();
- Properties versionInfo = new Properties();
- versionInfo.load( new URL(
"resource:/openejb-version.properties" ).openConnection().getInputStream() );
- header += versionInfo.get( "version" );
- } catch (java.io.IOException e) {
- }
-
- System.out.println( header );
-
- // Internationalize this
- try {
- InputStream in = new URL( "resource:/openejb/stop.txt"
).openConnection().getInputStream();
-
- int b = in.read();
- while (b != -1) {
- System.out.write( b );
- b = in.read();
- }
- } catch (java.io.IOException e) {
- }
- }
-
- private static void printExamples() {
- String header = "OpenEJB Remote Server ";
- try {
- JarUtils.setHandlerSystemProperty();
- Properties versionInfo = new Properties();
- versionInfo.load( new URL(
"resource:/openejb-version.properties" ).openConnection().getInputStream() );
- header += versionInfo.get( "version" );
- } catch (java.io.IOException e) {
- }
-
- System.out.println( header );
-
- // Internationalize this
- try {
- InputStream in = new URL( "resource:/openejb/stop-examples.txt"
).openConnection().getInputStream();
-
- int b = in.read();
- while (b != -1) {
- System.out.write( b );
- b = in.read();
- }
- } catch (java.io.IOException e) {
- }
- }
-}
+/**
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ * statements and notices. Redistributions must also contain a
+ * copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce the
+ * above copyright notice, this list of conditions and the
+ * following disclaimer in the documentation and/or other
+ * materials provided with the distribution.
+ *
+ * 3. The name "OpenEJB" must not be used to endorse or promote
+ * products derived from this Software without prior written
+ * permission of The OpenEJB Group. For written permission,
+ * please contact [EMAIL PROTECTED]
+ *
+ * 4. Products derived from this Software may not be called "OpenEJB"
+ * nor may "OpenEJB" appear in their names without prior written
+ * permission of The OpenEJB Group. OpenEJB is a registered
+ * trademark of The OpenEJB Group.
+ *
+ * 5. Due credit should be given to the OpenEJB Project
+ * (http://www.openejb.org/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2001 (C) The OpenEJB Group. All Rights Reserved.
+ *
+ * $Id$
+ */
+package org.openejb.server.admin;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.Socket;
+import java.net.URL;
+import java.util.Properties;
+
+import org.openejb.util.JarUtils;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">David Blevins</a>
+ */
+public class Stop implements org.openejb.client.RequestMethods {
+
+ /**
+ *
+ * @param host The ip address the Remote Server is running on
+ * @param port The port the Remote Server is running on
+ */
+ public static void stop(String host, int port) {
+ try{
+
+ Socket socket = new Socket(host, port);
+ OutputStream out = socket.getOutputStream();
+
+ out.write( STOP_REQUEST_Stop );
+
+ } catch (ConnectException e){
+ System.out.println(":: server not running ::");
+ } catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ public void stop() {
+ stop("localhost",4200);
+ }
+
+ public static void main(String [] args) {
+ try {
+
+ // The ip address the Remote Server is running on
+ String host = "localhost";
+
+ // The port the Remote Server is running on
+ int port = 4200;
+
+ for (int i=0; i < args.length; i++){
+ if (args[i].equals("-h")){
+ if (args.length > i+1 ) {
+ host = args[++i];
+ }
+ } else if (args[i].equals("-p")){
+ if (args.length > i+1 ) {
+ port = Integer.parseInt( args[++i] );
+ }
+ } else if (args[i].equals("-help")){
+ printHelp();
+ return;
+ } else if (args[i].equals("-examples")){
+ printExamples();
+ return;
+ }
+ }
+
+ stop( host, port );
+ } catch ( Exception re ) {
+ System.err.println("[EJB Server] FATAL ERROR: "+
re.getMessage());
+ re.printStackTrace();
+ }
+ }
+
+ private static void printHelp() {
+ String header = "OpenEJB Remote Server ";
+ try {
+ JarUtils.setHandlerSystemProperty();
+ Properties versionInfo = new Properties();
+ versionInfo.load( new URL(
"resource:/openejb-version.properties" ).openConnection().getInputStream() );
+ header += versionInfo.get( "version" );
+ } catch (java.io.IOException e) {
+ }
+
+ System.out.println( header );
+
+ // Internationalize this
+ try {
+ InputStream in = new URL( "resource:/openejb/stop.txt"
).openConnection().getInputStream();
+
+ int b = in.read();
+ while (b != -1) {
+ System.out.write( b );
+ b = in.read();
+ }
+ } catch (java.io.IOException e) {
+ }
+ }
+
+ private static void printExamples() {
+ String header = "OpenEJB Remote Server ";
+ try {
+ JarUtils.setHandlerSystemProperty();
+ Properties versionInfo = new Properties();
+ versionInfo.load( new URL(
"resource:/openejb-version.properties" ).openConnection().getInputStream() );
+ header += versionInfo.get( "version" );
+ } catch (java.io.IOException e) {
+ }
+
+ System.out.println( header );
+
+ // Internationalize this
+ try {
+ InputStream in = new URL( "resource:/openejb/stop-examples.txt"
).openConnection().getInputStream();
+
+ int b = in.read();
+ while (b != -1) {
+ System.out.write( b );
+ b = in.read();
+ }
+ } catch (java.io.IOException e) {
+ }
+ }
+}
