You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2002/01/03 02:48:48 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina Server.java

craigmcc    02/01/02 17:48:48

  Modified:    catalina/src/share/org/apache/catalina Server.java
  Log:
  Update the javadocs on o.a.c.Server to reflect the introduction of the
  Service layer underneath.
  
  Submitted by:	Christopher K. St. John <ck...@distributopia.com>
  
  Revision  Changes    Path
  1.9       +11 -15    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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Server.java	8 Nov 2001 21:10:21 -0000	1.8
  +++ Server.java	3 Jan 2002 01:48:48 -0000	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Server.java,v 1.8 2001/11/08 21:10:21 remm Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/11/08 21:10:21 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Server.java,v 1.9 2002/01/03 01:48:48 craigmcc Exp $
  + * $Revision: 1.9 $
  + * $Date: 2002/01/03 01:48:48 $
    *
    * ====================================================================
    *
  @@ -67,20 +67,16 @@
   import org.apache.catalina.deploy.NamingResources;
   
   /**
  - * A <b>Server</b> represents one convenient way to package a set of
  - * <code>Connectors</code> associated with a particular <code>Container</code>.
  - * You can have several many-to-one relationships (set of Connectors associated
  - * with one Container) by adding one or more Connectors first, followed by the
  - * corresponding Container, and then repeating this pattern.
  - * <p>
  - * This interface (and the corresonding implementation) exist to simplify
  - * configuring Catalina from a <code>server.xml</code> file.  It has no
  - * functional role once the server has been started.
  + * A <code>Server</code> element represents the entire Catalina
  + * servlet container.  Its attributes represent the characteristics of
  + * the servlet container as a whole.  A <code>Server</code> may contain
  + * one or more <code>Services</code>, and the top level set of naming
  + * resources.
    * <p>
    * Normally, an implementation of this interface will also implement
    * <code>Lifecycle</code>, such that when the <code>start()</code> and
  - * <code>stop()</code> methods are called, all of the defined Containers
  - * and Connectors are also started or stopped.
  + * <code>stop()</code> methods are called, all of the defined
  + * <code>Services</code> are also started or stopped.
    * <p>
    * In between, the implementation must open a server socket on the port number
    * specified by the <code>port</code> property.  When a connection is accepted,
  @@ -92,7 +88,7 @@
    * class in its constructor(s).
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.8 $ $Date: 2001/11/08 21:10:21 $
  + * @version $Revision: 1.9 $ $Date: 2002/01/03 01:48:48 $
    */
   
   public interface Server {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>