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 8638 invoked by uid 2016); 12 Oct 1999 08:30:48 -0000
Delivered-To: apcore-jakarta-tomcat-cvs@apache.org
Received: (qmail 8636 invoked by uid 257); 12 Oct 1999 08:30:47 -0000
Date: 12 Oct 1999 08:30:47 -0000
Message-ID: <19991012083047.8635.qmail@hyperreal.org>
From: gonzo@hyperreal.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util
 URLUtil.java

gonzo       99/10/12 01:30:47

  Modified:    src/share/org/apache/tomcat/util URLUtil.java
  Log:
  should take care of context docBase configs
  with the following formats:
  
  	war:file:ex.war
  	file:ex.war
  	file:./ex.war
  	file:examples
  
  still need to resolve:
  
  	war:ex.war
  	file:../build/examples
  
  Revision  Changes    Path
  1.2       +5 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- URLUtil.java	1999/10/09 00:20:56	1.1
  +++ URLUtil.java	1999/10/12 08:30:46	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/URLUtil.java,v 1.1 1999/10/09 00:20:56 duncan Exp $
  - * $Revision: 1.1 $
  - * $Date: 1999/10/09 00:20:56 $
  + * $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 $
    *
    * ====================================================================
    *
  @@ -96,7 +96,8 @@
   	//        construct file uri by prepending the
   	//        working directory
   
  -	if (s.indexOf(":/") > -1) {
  +	if (s.indexOf("://") > -1 ||
  +            s.indexOf("file:") > -1 ) {
   	    resolve = new URL(s);
   	} else if (url != null) {
   	    resolve = new URL(url, s);