craigmcc 01/08/23 15:15:43
Modified: catalina/src/share/org/apache/catalina Server.java
catalina/src/share/org/apache/catalina/core
StandardServer.java
Added: catalina/src/share/org/apache/catalina ServerFactory.java
Log:
Add a singleton that will return the Server at the top of the component
tree, without requiring a reference to any component in the tree.
Revision Changes Path
1.7 +8 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Server.java
Index: Server.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Server.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Server.java 2001/07/22 21:02:45 1.6
+++ Server.java 2001/08/23 22:15:43 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Server.java,v 1.6
2001/07/22 21:02:45 pier Exp $
- * $Revision: 1.6 $
- * $Date: 2001/07/22 21:02:45 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Server.java,v 1.7
2001/08/23 22:15:43 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/08/23 22:15:43 $
*
* ====================================================================
*
@@ -85,9 +85,13 @@
* specified by the <code>port</code> property. When a connection is accepted,
* the first line is read and compared with the specified shutdown command.
* If the command matches, shutdown of the server is initiated.
+ * <p>
+ * <strong>NOTE</strong> - The concrete implementation of this class should
+ * register the (singleton) instance with the <code>ServerFactory</code>
+ * class in its constructor(s).
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/07/22 21:02:45 $
+ * @version $Revision: 1.7 $ $Date: 2001/08/23 22:15:43 $
*/
public interface Server {
1.1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ServerFactory.java
Index: ServerFactory.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ServerFactory.java,v
1.1 2001/08/23 22:15:43 craigmcc Exp $
* $Revision: 1.1 $
* $Date: 2001/08/23 22:15:43 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 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 end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``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 APACHE SOFTWARE FOUNDATION 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.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.catalina;
/**
* <p><strong>ServerFactory</strong> allows the registration of the
* (singleton) <code>Server</code> instance for this JVM, so that it
* can be accessed independently of any existing reference to the
* component hierarchy. This is important for administration tools
* that are built around the internal component implementation classes.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/08/23 22:15:43 $
*/
public class ServerFactory {
// ------------------------------------------------------- Static Variables
/**
* The singleton <code>Server</code> instance for this JVM.
*/
private static Server server = null;
// --------------------------------------------------------- Public Methods
/**
* Return the singleton <code>Server</code> instance for this JVM.
*/
public static Server getServer() {
return (server);
}
/**
* Set the singleton <code>Server</code> instance for this JVM. This
* method must <strong>only</strong> be called from a constructor of
* the (singleton) <code>Server</code> instance that is created for
* this execution of Catalina.
*
* @param theServer The new singleton instance
*/
public static void setServer(Server theServer) {
if (server == null)
server = theServer;
}
}
1.11 +19 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StandardServer.java 2001/08/21 20:22:28 1.10
+++ StandardServer.java 2001/08/23 22:15:43 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
1.10 2001/08/21 20:22:28 craigmcc Exp $
- * $Revision: 1.10 $
- * $Date: 2001/08/21 20:22:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
1.11 2001/08/23 22:15:43 craigmcc Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/08/23 22:15:43 $
*
* ====================================================================
*
@@ -77,6 +77,7 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Server;
+import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -88,11 +89,25 @@
* (but not required) when deploying and starting Catalina.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/08/21 20:22:28 $
+ * @version $Revision: 1.11 $ $Date: 2001/08/23 22:15:43 $
*/
public final class StandardServer
implements Lifecycle, Server {
+
+
+ // ------------------------------------------------------------ Constructor
+
+
+ /**
+ * Construct a default instance of this class.
+ */
+ public StandardServer() {
+
+ super();
+ ServerFactory.setServer(this);
+
+ }
// ----------------------------------------------------- Instance Variables
