cziegeler 01/05/30 01:48:53
Modified: src/org/apache/cocoon/servlet CocoonServlet.java
Log:
Patch for duplicate separators in log dir
Revision Changes Path
1.10 +14 -12 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CocoonServlet.java 2001/05/29 17:05:00 1.9
+++ CocoonServlet.java 2001/05/30 08:48:52 1.10
@@ -58,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/05/29 17:05:00 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/05/30 08:48:52 $
*/
public class CocoonServlet extends HttpServlet {
@@ -178,13 +178,13 @@
String classDir = context.getRealPath("/WEB-INF/classes");
String libDir = context.getRealPath("/WEB-INF/lib");
-
+
File root = null;
if(libDir != null)
root = new File(libDir);
else
root = workDir;
-
+
if(classDir != null) {
buildClassPath.append(classDir);
@@ -276,10 +276,12 @@
}
if (logDir == null) {
- if(context.getRealPath("/") != null)
- logDir = context.getRealPath("/") + "/WEB-INF/logs/";
- else
- logDir = "./WEB-INF/logs/";
+ if(context.getRealPath("/") != null) {
+ logDir = context.getRealPath("/");
+ if (logDir.endsWith(File.separator) == false) logDir = logDir +
File.separator;
+ logDir = logDir + "WEB-INF"+File.separator+"logs"+File.separator;
+ } else
+ logDir =
"."+File.separator+"WEB-INF"+File.separator+"logs"+File.separator;
}
this.appContext.put(Constants.CONTEXT_LOG_DIR, logDir);
@@ -541,7 +543,7 @@
throws Exception {
HttpEnvironment env;
URL url = null;
-
+
String path = this.servletContext.getRealPath("/");
log.debug("getRealPath for /: " + path);
if(path == null) {
@@ -551,15 +553,15 @@
path = path.substring(0,path.length()-"WEB-INF".length());
log.debug("Path for Root: " + path);
}
-
+
if(path.indexOf(':')>1)
url = new URL(path);
- else
+ else
url = (new File(path)).toURL();
log.debug("URL for Root: " + url);
-
+
env = new HttpEnvironment(uri,
- url,
+ url,
req,
res,
this.servletContext,
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
