tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/servlets DefaultServlet.java
Date Mon, 01 May 2000 23:06:39 GMT
costin      00/05/01 16:06:39

  Modified:    src/share/org/apache/tomcat/servlets DefaultServlet.java
  Log:
  Removed "War" dependency from DefaultServlet.
  It is possible to add a default servlet that serves files from WAR or
  database, but it will be a different component.
  
  Probably a good idea would be to rename DefaultServlet to FileServlet.
  
  Revision  Changes    Path
  1.16      +1 -8      jakarta-tomcat/src/share/org/apache/tomcat/servlets/DefaultServlet.java
  
  Index: DefaultServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/servlets/DefaultServlet.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DefaultServlet.java	2000/04/21 20:45:09	1.15
  +++ DefaultServlet.java	2000/05/01 23:06:39	1.16
  @@ -456,14 +456,7 @@
   	String[] fileNames = file.list();
           String docBase = "";
   
  -        if (context.getDocumentBase().getProtocol().equalsIgnoreCase("war") &&
  -	    context.isWARExpanded()) {
  -	    String s = context.getWARDir().getAbsolutePath();
  -
  -	    docBase = FileUtil.patch(s);
  -	} else {
  -	    docBase = context.getDocumentBase().getFile();
  -	}
  +	docBase = context.getDocBase();
   
           if (! docBase.endsWith("/")) {
               docBase += "/";
  
  
  

Mime
View raw message