You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@apache.org on 2001/02/11 05:13:04 UTC

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

rubys       01/02/10 20:13:04

  Modified:    catalina/src/share/org/apache/catalina/startup
                        CatalinaBlock.java
  Log:
  Keep up with the latest Avalon changes
  Submitted by: Jason van Zyl <jv...@periapt.com>
  ----------------------------------------------------------------------
  
  Revision  Changes    Path
  1.2       +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaBlock.java
  
  Index: CatalinaBlock.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaBlock.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CatalinaBlock.java	2000/11/13 06:42:30	1.1
  +++ CatalinaBlock.java	2001/02/11 04:13:03	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaBlock.java,v 1.1 2000/11/13 06:42:30 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/11/13 06:42:30 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaBlock.java,v 1.2 2001/02/11 04:13:03 rubys Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/02/11 04:13:03 $
    *
    * ====================================================================
    *
  @@ -63,15 +63,15 @@
   
   package org.apache.catalina.startup;
   
  -import org.apache.avalon.ConfigurationException;
  -import org.apache.avalon.Configuration;
  -import org.apache.avalon.blocks.AbstractBlock;
  +import org.apache.avalon.configuration.ConfigurationException;
  +import org.apache.avalon.configuration.Configuration;
  +import org.apache.phoenix.AbstractBlock;
   
   /**
    * Catalina wrapper for Avalon.
    * 
    * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   
   public final class CatalinaBlock