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 Bootstrap.java
Date Fri, 03 Jan 2003 15:39:14 GMT
remm        2003/01/03 07:39:14

  Modified:    catalina/src/share/org/apache/catalina/startup
                        Bootstrap.java
  Log:
  - Add support for catalina.base in loader configuration.
  
  Revision  Changes    Path
  1.10      +8 -4      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
  
  Index: Bootstrap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Bootstrap.java	2 Dec 2002 21:33:12 -0000	1.9
  +++ Bootstrap.java	3 Jan 2003 15:39:13 -0000	1.10
  @@ -92,7 +92,8 @@
       // -------------------------------------------------------------- Constants
   
   
  -    protected static final String CATALINA_TOKEN = "${catalina.home}";
  +    protected static final String CATALINA_HOME_TOKEN = "${catalina.home}";
  +    protected static final String CATALINA_BASE_TOKEN = "${catalina.base}";
       protected static final String HTTP_TOKEN = "http://";
   
   
  @@ -162,9 +163,12 @@
               }
               // Local repository
               boolean packed = false;
  -            if (repository.startsWith(CATALINA_TOKEN)) {
  +            if (repository.startsWith(CATALINA_HOME_TOKEN)) {
                   repository = getCatalinaHome() 
  -                    + repository.substring(CATALINA_TOKEN.length());
  +                    + repository.substring(CATALINA_HOME_TOKEN.length());
  +            } else if (repository.startsWith(CATALINA_BASE_TOKEN)) {
  +                repository = getCatalinaBase() 
  +                    + repository.substring(CATALINA_BASE_TOKEN.length());
               }
               if (repository.endsWith("*.jar")) {
                   packed = true;
  
  
  

--
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