Return-Path: <gonzo@hyperreal.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 2873 invoked by uid 2016); 22 Oct 1999 22:56:21 -0000
Delivered-To: apcore-jakarta-tomcat-cvs@apache.org
Received: (qmail 2870 invoked by uid 257); 22 Oct 1999 22:56:20 -0000
Date: 22 Oct 1999 22:56:20 -0000
Message-ID: <19991022225620.2869.qmail@hyperreal.org>
From: gonzo@hyperreal.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util
 Constants.java URLUtil.java

gonzo       99/10/22 15:56:19

  Modified:    src/share/org/apache/tomcat/util Tag: TOMCAT_J2EE_10F_102199
                        Constants.java URLUtil.java
  Log:
  a war docBase can now be specified as a jar, eg:
  
  	e.jar
  	file://foo/e.jar
  	war:http:///foo/e.jar
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.1 +4 -3      jakarta-tomcat/src/share/org/apache/tomcat/util/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Constants.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- Constants.java	1999/10/09 00:20:55	1.1.1.1
  +++ Constants.java	1999/10/22 22:56:17	1.1.1.1.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Constants.java,v 1.1.1.1 1999/10/09 00:20:55 duncan Exp $
  - * $Revision: 1.1.1.1 $
  - * $Date: 1999/10/09 00:20:55 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Constants.java,v 1.1.1.1.2.1 1999/10/22 22:56:17 gonzo Exp $
  + * $Revision: 1.1.1.1.2.1 $
  + * $Date: 1999/10/22 22:56:17 $
    *
    * ====================================================================
    *
  @@ -91,5 +91,6 @@
   
       public static class MIME {
           public static final String WAR = "war";
  +        public static final String JAR = "jar";
       }
   }
  
  
  
  1.2.2.1   +7 -5      jakarta-tomcat/src/share/org/apache/tomcat/util/URLUtil.java
  
  Index: URLUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/URLUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- URLUtil.java	1999/10/12 08:30:46	1.2
  +++ URLUtil.java	1999/10/22 22:56:18	1.2.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/URLUtil.java,v 1.2 1999/10/12 08:30:46 gonzo Exp $
  - * $Revision: 1.2 $
  - * $Date: 1999/10/12 08:30:46 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/URLUtil.java,v 1.2.2.1 1999/10/22 22:56:18 gonzo Exp $
  + * $Revision: 1.2.2.1 $
  + * $Date: 1999/10/22 22:56:18 $
    *
    * ====================================================================
    *
  @@ -124,8 +124,10 @@
   
           if (! resolve.getProtocol().equalsIgnoreCase(
                   org.apache.tomcat.core.Constants.Request.WAR) &&
  -            resolve.getFile().toLowerCase().endsWith(
  -                "." + Constants.MIME.WAR)) {
  +            (resolve.getFile().toLowerCase().endsWith(
  +                "." + Constants.MIME.WAR) ||
  +            (resolve.getFile().toLowerCase().endsWith(
  +                "." + Constants.MIME.JAR)))) {
               URL u = new URL(Constants.MIME.WAR + ":" +
                   resolve.toString());