Return-Path: <akv@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 20302 invoked by uid 2016); 8 Nov 1999 03:59:07 -0000
Delivered-To: apcore-jakarta-tomcat-cvs@apache.org
Received: (qmail 20209 invoked by uid 260); 8 Nov 1999 03:58:57 -0000
Date: 8 Nov 1999 03:58:57 -0000
Message-ID: <19991108035857.20191.qmail@hyperreal.org>
From: akv@hyperreal.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
 DefaultServlet.java HttpServletRequestFacade.java ServletContextFacade.java
 ServletLoader.java

akv         99/11/07 19:58:54

  Modified:    src/share/org/apache/tomcat/core DefaultServlet.java
                        HttpServletRequestFacade.java
                        ServletContextFacade.java ServletLoader.java
  Log:
  Changed FilePathUtil to FileUtil and added method that can be used in ServletLoader
  etc instead of using a JDK1.2 only method (File.listFiles()).
  
  Revision  Changes    Path
  1.6       +9 -9      jakarta-tomcat/src/share/org/apache/tomcat/core/DefaultServlet.java
  
  Index: DefaultServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/DefaultServlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultServlet.java	1999/11/03 20:38:52	1.5
  +++ DefaultServlet.java	1999/11/08 03:58:38	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/DefaultServlet.java,v 1.5 1999/11/03 20:38:52 costin Exp $
  - * $Revision: 1.5 $
  - * $Date: 1999/11/03 20:38:52 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/DefaultServlet.java,v 1.6 1999/11/08 03:58:38 akv Exp $
  + * $Revision: 1.6 $
  + * $Date: 1999/11/08 03:58:38 $
    *
    * ====================================================================
    *
  @@ -192,7 +192,7 @@
   	    context.isWARExpanded()) {
   	    String s = context.getWARDir().getAbsolutePath();
   
  -	    docBase = FilePathUtil.patch(s);
  +	    docBase = FileUtil.patch(s);
   	} else {
   	    docBase = context.getDocumentBase().getFile();
   	}
  @@ -200,7 +200,7 @@
           // take care of File.getAbsolutePath() troubles on
           // jdk1.1.x/win
   
  -        absPath = FilePathUtil.patch(absPath);
  +        absPath = FileUtil.patch(absPath);
   
           if (! docBase.endsWith("/")) {
               docBase += "/";
  @@ -349,7 +349,7 @@
           // take care of File.getAbsolutePath() troubles on
           // jdk1.1.x/win
   
  -        absPath = FilePathUtil.patch(absPath);
  +        absPath = FileUtil.patch(absPath);
   
           // This absPath/canPath comparison plugs security holes...
   	// On Windows, makes "x.jsp.", "x.Jsp", and "x.jsp%20" 
  @@ -467,7 +467,7 @@
   
               // case insensitive check
               if (requestedFile.toLowerCase().startsWith(
  -                    FilePathUtil.patch(docBase + maskFile).toLowerCase())) {
  +                    FileUtil.patch(docBase + maskFile).toLowerCase())) {
   	        return true;
   	    }
           }
  @@ -509,7 +509,7 @@
           // take care of File.getAbsolutePath() troubles on
           // jdk1.1.x/win
   
  -        absPath = FilePathUtil.patch(absPath);
  +        absPath = FileUtil.patch(absPath);
   
   	if (File.separatorChar  == '\\') { 
   		// On Windows check ignore case....
  @@ -547,7 +547,7 @@
   	    context.isWARExpanded()) {
   	    String s = context.getWARDir().getAbsolutePath();
   
  -	    docBase = FilePathUtil.patch(s);
  +	    docBase = FileUtil.patch(s);
   	} else {
   	    docBase = context.getDocumentBase().getFile();
   	}
  
  
  
  1.3       +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/core/HttpServletRequestFacade.java
  
  Index: HttpServletRequestFacade.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/HttpServletRequestFacade.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HttpServletRequestFacade.java	1999/10/22 21:52:06	1.2
  +++ HttpServletRequestFacade.java	1999/11/08 03:58:41	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/HttpServletRequestFacade.java,v 1.2 1999/10/22 21:52:06 costin Exp $
  - * $Revision: 1.2 $
  - * $Date: 1999/10/22 21:52:06 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/HttpServletRequestFacade.java,v 1.3 1999/11/08 03:58:41 akv Exp $
  + * $Revision: 1.3 $
  + * $Date: 1999/11/08 03:58:41 $
    *
    * ====================================================================
    *
  @@ -214,7 +214,7 @@
   
                   if (url != null &&
                       url.getProtocol().equals("file")) {
  -                    pathTranslated = FilePathUtil.patch(url.getFile());
  +                    pathTranslated = FileUtil.patch(url.getFile());
                   }
               } catch (MalformedURLException e) {
               }
  
  
  
  1.4       +6 -6      jakarta-tomcat/src/share/org/apache/tomcat/core/ServletContextFacade.java
  
  Index: ServletContextFacade.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletContextFacade.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServletContextFacade.java	1999/11/03 20:38:53	1.3
  +++ ServletContextFacade.java	1999/11/08 03:58:42	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletContextFacade.java,v 1.3 1999/11/03 20:38:53 costin Exp $
  - * $Revision: 1.3 $
  - * $Date: 1999/11/03 20:38:53 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletContextFacade.java,v 1.4 1999/11/08 03:58:42 akv Exp $
  + * $Revision: 1.4 $
  + * $Date: 1999/11/08 03:58:42 $
    *
    * ====================================================================
    *
  @@ -186,7 +186,7 @@
   			    // take care of File.getAbsolutePath()
   			    // troubles on jdk1.1.x/win
   
  -			    realPath = FilePathUtil.patch(absPath);
  +			    realPath = FileUtil.patch(absPath);
   			} else if (url.getProtocol().equalsIgnoreCase(
   			    Constants.Request.HTTP)) {
   			    // XXX
  @@ -204,7 +204,7 @@
   		    // take care of File.getAbsolutePath() troubles on
   		    // jdk1.1.x/win
   
  -	            realPath = FilePathUtil.patch(url.getFile());
  +	            realPath = FileUtil.patch(url.getFile());
                   }
   
   	    }
  @@ -273,7 +273,7 @@
   		// take care of File.getAbsolutePath() troubles
   		// on jdk1.1.x/win
   
  -		absPath = FilePathUtil.patch(absPath);
  +		absPath = FileUtil.patch(absPath);
   
                   if (! absPath.startsWith("/")) {
                       absPath = "/" + absPath;
  
  
  
  1.5       +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/core/ServletLoader.java
  
  Index: ServletLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletLoader.java	1999/11/03 23:43:56	1.4
  +++ ServletLoader.java	1999/11/08 03:58:45	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletLoader.java,v 1.4 1999/11/03 23:43:56 costin Exp $
  - * $Revision: 1.4 $
  - * $Date: 1999/11/03 23:43:56 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletLoader.java,v 1.5 1999/11/08 03:58:45 akv Exp $
  + * $Revision: 1.5 $
  + * $Date: 1999/11/08 03:58:45 $
    *
    * ====================================================================
    *
  @@ -527,7 +527,7 @@
       }
   
       private String[] getJars(File dir, String path) {
  -        File[] files = dir.listFiles();
  +        File[] files = FileUtil.listFiles(dir);
   
           for (int i = 0; i < files.length; i++) {
               File file = files[i];