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 2001/09/04 21:19:48 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardServer.java StandardService.java

craigmcc    01/09/04 12:19:48

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardServer.java StandardService.java
  Log:
  Add human-understandable toString() methods for StandardServer and
  StandardService.
  
  Revision  Changes    Path
  1.12      +17 -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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StandardServer.java	2001/08/23 22:15:43	1.11
  +++ StandardServer.java	2001/09/04 19:19:48	1.12
  @@ -1,7 +1,7 @@
   /*
  - * $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 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v 1.12 2001/09/04 19:19:48 craigmcc Exp $
  + * $Revision: 1.12 $
  + * $Date: 2001/09/04 19:19:48 $
    *
    * ====================================================================
    *
  @@ -89,7 +89,7 @@
    * (but not required) when deploying and starting Catalina.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.11 $ $Date: 2001/08/23 22:15:43 $
  + * @version $Revision: 1.12 $ $Date: 2001/09/04 19:19:48 $
    */
   
   public final class StandardServer
  @@ -394,6 +394,19 @@
               }
               services = results;
           }
  +
  +    }
  +
  +
  +    /**
  +     * Return a String representation of this component.
  +     */
  +    public String toString() {
  +
  +        StringBuffer sb = new StringBuffer("StandardServer[");
  +        sb.append(getPort());
  +        sb.append("]");
  +        return (sb.toString());
   
       }
   
  
  
  
  1.6       +18 -5     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardService.java
  
  Index: StandardService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardService.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StandardService.java	2001/08/23 22:32:10	1.5
  +++ StandardService.java	2001/09/04 19:19:48	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardService.java,v 1.5 2001/08/23 22:32:10 craigmcc Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/08/23 22:32:10 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardService.java,v 1.6 2001/09/04 19:19:48 craigmcc Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/09/04 19:19:48 $
    *
    * ====================================================================
    *
  @@ -84,7 +84,7 @@
    * not required.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.5 $ $Date: 2001/08/23 22:32:10 $
  + * @version $Revision: 1.6 $ $Date: 2001/09/04 19:19:48 $
    */
   
   public final class StandardService
  @@ -116,7 +116,7 @@
       /**
        * The name of this service.
        */
  -    private String name = this.toString();
  +    private String name = null;
   
   
       /**
  @@ -315,6 +315,19 @@
               }
               connectors = results;
           }
  +
  +    }
  +
  +
  +    /**
  +     * Return a String representation of this component.
  +     */
  +    public String toString() {
  +
  +        StringBuffer sb = new StringBuffer("StandardService[");
  +        sb.append(getName());
  +        sb.append("]");
  +        return (sb.toString());
   
       }