henning 2002/07/25 10:20:34
Modified: src/java/org/apache/turbine Turbine.java
src/java/org/apache/turbine/services/logging
TurbineLoggingService.java
Log:
Changed getRealPath("") to getRealPath("/") to make some servlet
containers happy, that choke on "". Suggested by Stephane Bailliez
<[EMAIL PROTECTED]> after problems with iPlanet Application
Server.
Revision Changes Path
1.21 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Turbine.java 24 Jul 2002 15:01:34 -0000 1.20
+++ Turbine.java 25 Jul 2002 17:20:33 -0000 1.21
@@ -207,14 +207,14 @@
|| applicationRoot.equals("webContext"))
{
applicationRoot = config.getServletContext()
- .getRealPath("");
+ .getRealPath("/");
}
// Set the webapp root. The applicationRoot and the
// webappRoot will be the same when the application is
// deployed, but during development they may have
// different values.
- webappRoot = config.getServletContext().getRealPath("");
+ webappRoot = config.getServletContext().getRealPath("/");
// Create any directories that need to be setup for
// a running Turbine application.
1.4 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/logging/TurbineLoggingService.java
Index: TurbineLoggingService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/logging/TurbineLoggingService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineLoggingService.java 5 Apr 2002 07:04:55 -0000 1.3
+++ TurbineLoggingService.java 25 Jul 2002 17:20:34 -0000 1.4
@@ -195,7 +195,7 @@
//add webappRoot manually - cos logging is a primary
//service and so it is not yet defined
- String webappRoot = context.getRealPath("");
+ String webappRoot = context.getRealPath("/");
resources.setProperty(Turbine.WEBAPP_ROOT,webappRoot);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
