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-catalina/catalina/src/share/org/apache/catalina/startup Catalina.java SetAllPropertiesRule.java
Date Fri, 14 Nov 2003 10:02:10 GMT
remm        2003/11/14 02:02:10

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
                        SetAllPropertiesRule.java
  Log:
  - Use the extended digester for system property replacement.
  - Note: Although the code is not very optimized, this does not have any
    impact on startup time, at least on my computer.
  
  Revision  Changes    Path
  1.22      +6 -5      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Catalina.java	25 Sep 2003 03:08:56 -0000	1.21
  +++ Catalina.java	14 Nov 2003 10:02:10 -0000	1.22
  @@ -76,6 +76,7 @@
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.Server;
   import org.apache.catalina.core.StandardServer;
  +import org.apache.catalina.util.CatalinaDigester;
   import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.Rule;
   import org.apache.tomcat.util.log.SystemLogHandler;
  @@ -290,7 +291,7 @@
       protected Digester createStartDigester() {
           long t1=System.currentTimeMillis();
           // Initialize the digester
  -        Digester digester = new Digester();
  +        Digester digester = new CatalinaDigester();
           if (debug>0)
               digester.setDebug(debug);
           digester.setValidating(false);
  
  
  
  1.3       +3 -16     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java
  
  Index: SetAllPropertiesRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SetAllPropertiesRule.java	17 Oct 2003 14:42:51 -0000	1.2
  +++ SetAllPropertiesRule.java	14 Nov 2003 10:02:10 -0000	1.3
  @@ -99,22 +99,9 @@
                   name = attributes.getQName(i);
               }
               String value = attributes.getValue(i);
  -            value = IntrospectionUtils.replaceProperties
  -                (value, new SystemPropertyPropertyResource());
               IntrospectionUtils.setProperty(digester.peek(), name, value);
           }
   
  -    }
  -
  -
  -    // ----------------------------- SystemPropertyPropertyResource Inner Class
  -
  -
  -    protected class SystemPropertyPropertyResource
  -        implements IntrospectionUtils.PropertySource {
  -        public String getProperty(String key) {
  -            return System.getProperty(key);
  -        }
       }
   
   
  
  
  

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


Mime
View raw message