greenrd 00/12/13 07:27:53
Modified: src/org/apache/cocoon/processor/xsp XSPProcessor.java
Log:
more ways to set classpath
Revision Changes Path
1.34 +14 -7
xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPProcessor.java
Index: XSPProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/XSPProcessor.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XSPProcessor.java 2000/12/01 23:36:44 1.33
+++ XSPProcessor.java 2000/12/13 15:27:52 1.34
@@ -1,4 +1,4 @@
-/*-- $Id: XSPProcessor.java,v 1.33 2000/12/01 23:36:44 greenrd Exp $ --
+/*-- $Id: XSPProcessor.java,v 1.34 2000/12/13 15:27:52 greenrd Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -78,7 +78,7 @@
* This class implements the XSP engine.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version $Revision: 1.33 $ $Date: 2000/12/01 23:36:44 $
+ * @version $Revision: 1.34 $ $Date: 2000/12/13 15:27:52 $
*/
public class XSPProcessor extends AbstractActor
implements Processor, Configurable, Status, Cacheable
@@ -212,13 +212,20 @@
}
// Languages other than Java may also need to use the classpath to link
to Java code
- // Try to get the classpath from catalina or tomcat first; if that fails
use the
- // standard one.
- String classpath = (String)
- this.servletContext.getAttribute("org.apache.catalina.jsp_classpath");
+ // Try to get the classpath from conf or Catalina or Tomcat or Resin
first;
+ // if that all fails, use the standard one.
+ String classpath = (String) conf.get ("localclasspath");
if (classpath == null) {
classpath = (String)
- this.servletContext.getAttribute("org.apache.tomcat.jsp_classpath");
+
this.servletContext.getAttribute("org.apache.catalina.jsp_classpath");
+ if (classpath == null) {
+ classpath = (String)
+
this.servletContext.getAttribute("org.apache.tomcat.jsp_classpath");
+ if (classpath == null) {
+ classpath = (String)
+ this.servletContext.getAttribute ("caucho.class.path");
+ }
+ }
}
if (classpath == null)
classpath = "";