giacomo 01/03/23 08:15:22
Modified: src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
Log:
Made the "extra-classpath" extend from the context root if an entry therein
is defined in a relative way (read not having a "path.separator" at the first
position
Revision Changes Path
No revision
No revision
1.1.4.72 +17 -2
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.71
retrieving revision 1.1.4.72
diff -u -r1.1.4.71 -r1.1.4.72
--- CocoonServlet.java 2001/03/19 17:08:44 1.1.4.71
+++ CocoonServlet.java 2001/03/23 16:15:21 1.1.4.72
@@ -62,7 +62,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.1.4.71 $ $Date: 2001/03/19 17:08:44 $
+ * @version CVS $Revision: 1.1.4.72 $ $Date: 2001/03/23 16:15:21 $
*/
public class CocoonServlet extends HttpServlet {
@@ -187,7 +187,22 @@
throws ServletException {
String extraClassPath = getInitParameter("extra-classpath");
if ((extraClassPath != null) && (extraClassPath.trim().equals("")
== false)) {
- return extraClassPath;
+ StringBuffer sb = new StringBuffer();
+ StringTokenizer st = new StringTokenizer(extraClassPath,
System.getProperty("path.separator"), false);
+ int i = 0;
+ while (st.hasMoreTokens()) {
+ String s = st.nextToken();
+ if (i++ > 0)
+ sb.append(System.getProperty("path.separator"));
+ if (s.charAt(0) ==
System.getProperty("file.separator").charAt(0)) {
+ log.debug ("extraClassPath is absolute: " +
extraClassPath);
+ sb.append(s);
+ } else {
+ log.debug ("extraClassPath is not absolute: " +
context.getRealPath("/") + extraClassPath);
+ sb.append(context.getRealPath("/") + extraClassPath);
+ }
+ }
+ return sb.toString();
}
return "";
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
