cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config ServerXmlReader.java

[costin]

costin      01/07/28 17:43:28

  Modified:    src/share/org/apache/tomcat/modules/config
                        ServerXmlReader.java
  Log:
  Fix for the fix.
  
  The original fix allowed modules to be defined in server.xml ( or equivalent ).
  If the modules are loaded from modules.xml, the loader will automatically
  add the new rules.
  If the cached properties files are used - we need to add the rules explicitely.
  
  The "modules" note is also used by ContextXmlReader, to avoid parsing the
  same file multiple times.
  
  Revision  Changes    Path
  1.16      +2 -1      
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java
  
  Index: ServerXmlReader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ServerXmlReader.java      2001/07/28 03:09:32     1.15
  +++ ServerXmlReader.java      2001/07/29 00:43:28     1.16
  @@ -129,7 +129,7 @@
        setPropertiesRules( cm, xh );
        setTagRules( xh );
        addDefaultTags(cm, xh);
  -     addTagRules( cm, xh );
  +     //addTagRules( cm, xh );
        setBackward( xh );
   
        // load the config file(s)
  @@ -284,6 +284,7 @@
                cachedM.lastModified() > f.lastModified() ) {
                // XXX check the other modules-foo.xml
                loadCachedModules(cachedM, modules );
  +             addTagRules( cm, xh );
                return;
            } else {
                loadConfigFile( xh, f, cm );