giacomo 00/12/05 22:21:59
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Constants.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
Log:
Patch to make Cocoon 2 easily deployable under Resin 1.2. Submitted by Rick
Tessner.
Revision Changes Path
No revision
No revision
1.1.2.11 +2 -1 xml-cocoon/src/org/apache/cocoon/Attic/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Constants.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- Constants.java 2000/11/08 20:34:48 1.1.2.10
+++ Constants.java 2000/12/06 06:21:55 1.1.2.11
@@ -10,7 +10,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/11/08 20:34:48 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/12/06 06:21:55 $
*/
public interface Constants {
@@ -54,6 +54,7 @@
public static final String CATALINA_SERVLET_CLASSPATH =
"org.apache.catalina.jsp_classpath";
public static final String TOMCAT_SERVLET_CLASSPATH =
"org.apache.tomcat.jsp_classpath";
+ public static final String RESIN_SERVLET_CLASSPATH = "caucho.class.path";
public final static String ERROR_NAMESPACE_URI =
"http://apache.org/cocoon/"; + CONF_VERSION + "/error";
public final static String ERROR_NAMESPACE_PREFIX = "error";
No revision
No revision
1.1.4.34 +6 -3
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.33
retrieving revision 1.1.4.34
diff -u -r1.1.4.33 -r1.1.4.34
--- CocoonServlet.java 2000/11/30 21:42:08 1.1.4.33
+++ CocoonServlet.java 2000/12/06 06:21:56 1.1.4.34
@@ -51,7 +51,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
- * @version CVS $Revision: 1.1.4.33 $ $Date: 2000/11/30 21:42:08 $
+ * @version CVS $Revision: 1.1.4.34 $ $Date: 2000/12/06 06:21:56 $
*/
public class CocoonServlet extends HttpServlet {
@@ -83,7 +83,7 @@
String path = this.context.getRealPath("/") +
"/WEB-INF/logs/cocoon.log";
- Category cocoonCategory = LogKit.createCategory("cocoon",
Priority.DEBUG);
+ Category cocoonCategory = LogKit.createCategory("cocoon",
Priority.ERROR);
log = LogKit.createLogger(cocoonCategory, new LogTarget[] {
new FileOutputLogTarget(path),
new ServletLogTarget(this.context, Priority.ERROR)
@@ -92,7 +92,7 @@
LogKit.log("Could not set up Cocoon Logger, will use screen
instead", e);
}
- LogKit.setGlobalPriority(Priority.DEBUG);
+ LogKit.setGlobalPriority(Priority.ERROR);
// WARNING (SM): the line below BREAKS the Servlet API portability of
// web applications.
@@ -115,6 +115,9 @@
this.classpath = (String)
context.getAttribute(Cocoon.CATALINA_SERVLET_CLASSPATH);
if (this.classpath == null) {
this.classpath = (String)
context.getAttribute(Cocoon.TOMCAT_SERVLET_CLASSPATH);
+ }
+ if (this.classpath == null) {
+ this.classpath = (String)
context.getAttribute(Cocoon.RESIN_SERVLET_CLASSPATH);
}
this.workDir = ((File)
this.context.getAttribute("javax.servlet.context.tempdir")).toString();
