tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup EngineRuleSet.java HostRuleSet.java
Date Sun, 11 Nov 2001 19:58:35 GMT
remm        01/11/11 11:58:35

  Modified:    catalina/src/share/org/apache/catalina/startup
                        EngineRuleSet.java HostRuleSet.java
  Log:
  - Fix a problem where the "configClass" attribute was used for two things:
    - The config class of the component (either Engine or Host), as intended
    - The config class of the child component (either Host or Context)
    Obviously, this is a problem, as the config class usually doesn't do both.
  - This patch renames the attributes used to define the config class of the
    component. Another solution would be to change the attribute name for the
    config class of the child component, but this was more complex to do.
  
  Revision  Changes    Path
  1.2       +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java
  
  Index: EngineRuleSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EngineRuleSet.java	2001/10/17 00:44:02	1.1
  +++ EngineRuleSet.java	2001/11/11 19:58:35	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java,v
1.1 2001/10/17 00:44:02 craigmcc Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/10/17 00:44:02 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java,v
1.2 2001/11/11 19:58:35 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/11/11 19:58:35 $
    *
    * ====================================================================
    *
  @@ -76,7 +76,7 @@
    * <code>ContextRuleSet</code>, respectively.</p>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.1 $ $Date: 2001/10/17 00:44:02 $
  + * @version $Revision: 1.2 $ $Date: 2001/11/11 19:58:35 $
    */
   
   public class EngineRuleSet extends RuleSetBase {
  @@ -143,7 +143,7 @@
                            new LifecycleListenerRule
                            (digester,
                             "org.apache.catalina.startup.EngineConfig",
  -                          "configClass"));
  +                          "engineConfigClass"));
           digester.addSetNext(prefix + "Engine",
                               "setContainer",
                               "org.apache.catalina.Container");
  
  
  
  1.2       +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostRuleSet.java
  
  Index: HostRuleSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostRuleSet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HostRuleSet.java	2001/10/17 00:44:02	1.1
  +++ HostRuleSet.java	2001/11/11 19:58:35	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostRuleSet.java,v
1.1 2001/10/17 00:44:02 craigmcc Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/10/17 00:44:02 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostRuleSet.java,v
1.2 2001/11/11 19:58:35 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/11/11 19:58:35 $
    *
    * ====================================================================
    *
  @@ -75,7 +75,7 @@
    * be added via instances of <code>ContextRuleSet</code>.</p>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.1 $ $Date: 2001/10/17 00:44:02 $
  + * @version $Revision: 1.2 $ $Date: 2001/11/11 19:58:35 $
    */
   
   public class HostRuleSet extends RuleSetBase {
  @@ -144,7 +144,7 @@
                            new LifecycleListenerRule
                            (digester,
                             "org.apache.catalina.startup.HostConfig",
  -                          "configClass"));
  +                          "hostConfigClass"));
           digester.addSetNext(prefix + "Host",
                               "addChild",
                               "org.apache.catalina.Container");
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message