remm 01/01/25 11:09:34
Modified: catalina/src/share/org/apache/catalina/core
ApplicationContext.java StandardContext.java
catalina/src/share/org/apache/catalina/loader
StandardLoader.java
Log:
- HttpServletRequest.getPathTranslated and ServletContext.getRealPath
will now return null if the current resources are not filesystem based.
Note: That change (temporarily) breaks Jasper if anything but the FileDirContext
is used.
Revision Changes Path
1.13 +7 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ApplicationContext.java 2001/01/24 22:39:56 1.12
+++ ApplicationContext.java 2001/01/25 19:09:15 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.12 2001/01/24 22:39:56 remm Exp $
- * $Revision: 1.12 $
- * $Date: 2001/01/24 22:39:56 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.13 2001/01/25 19:09:15 remm Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/01/25 19:09:15 $
*
* ====================================================================
*
@@ -107,7 +107,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.12 $ $Date: 2001/01/24 22:39:56 $
+ * @version $Revision: 1.13 $ $Date: 2001/01/25 19:09:15 $
*/
public final class ApplicationContext
@@ -361,7 +361,9 @@
*/
public String getRealPath(String path) {
- // Here, we return a fake path
+ if (!context.isFilesystemBased())
+ return null;
+
File file = new File(basePath, path);
return (file.getAbsolutePath());
1.38 +24 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- StandardContext.java 2001/01/25 18:36:22 1.37
+++ StandardContext.java 2001/01/25 19:09:17 1.38
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.37 2001/01/25 18:36:22 remm Exp $
- * $Revision: 1.37 $
- * $Date: 2001/01/25 18:36:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.38 2001/01/25 19:09:17 remm Exp $
+ * $Revision: 1.38 $
+ * $Date: 2001/01/25 19:09:17 $
*
* ====================================================================
*
@@ -138,7 +138,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.37 $ $Date: 2001/01/25 18:36:22 $
+ * @version $Revision: 1.38 $ $Date: 2001/01/25 19:09:17 $
*/
public class StandardContext
@@ -443,6 +443,12 @@
private boolean useNaming = true;
+ /**
+ * Filesystem based flag.
+ */
+ private boolean filesystemBased = false;
+
+
// ----------------------------------------------------- Context Properties
@@ -465,6 +471,17 @@
/**
+ * Returns true if the resources associated with this context are
+ * filesystem based.
+ */
+ public boolean isFilesystemBased() {
+
+ return (filesystemBased);
+
+ }
+
+
+ /**
* Return the set of initialized application listener objects,
* in the order they were specified in the web application deployment
* descriptor, for this application.
@@ -916,6 +933,9 @@
if (resources instanceof BaseDirContext) {
if (resources instanceof BaseDirContext)
((BaseDirContext) resources).setDocBase(getBasePath());
+ }
+ if (resources instanceof FileDirContext) {
+ filesystemBased = true;
}
super.setResources(resources);
if (started)
1.18 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
Index: StandardLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StandardLoader.java 2001/01/24 04:32:20 1.17
+++ StandardLoader.java 2001/01/25 19:09:27 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.17 2001/01/24 04:32:20 remm Exp $
- * $Revision: 1.17 $
- * $Date: 2001/01/24 04:32:20 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.18 2001/01/25 19:09:27 remm Exp $
+ * $Revision: 1.18 $
+ * $Date: 2001/01/25 19:09:27 $
*
* ====================================================================
*
@@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.17 $ $Date: 2001/01/24 04:32:20 $
+ * @version $Revision: 1.18 $ $Date: 2001/01/25 19:09:27 $
*/
public final class StandardLoader
@@ -942,7 +942,7 @@
servletContext.getRealPath(repository.substring(5));
else
continue;
- if (repository.endsWith("/"))
+ if ((repository == null) || (repository.endsWith("/")))
continue;
if (n > 0)
classpath.append(File.pathSeparator);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
