dims 01/07/10 05:34:22
Modified: src/org/apache/cocoon/generation JspGenerator.java
webapp sitemap.xmap
Log:
Added a parameter for JspGenerator for specifying the JspServlet class name.
Revision Changes Path
1.9 +23 -3 xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java
Index: JspGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JspGenerator.java 2001/07/07 11:43:30 1.8
+++ JspGenerator.java 2001/07/10 12:34:16 1.9
@@ -30,6 +30,9 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.parser.Parser;
@@ -47,12 +50,29 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/07/07 11:43:30 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/07/10 12:34:16 $
*/
-public class JspGenerator extends ServletGenerator implements Recyclable {
+public class JspGenerator extends ServletGenerator implements Recyclable,
Configurable {
+ /** The Servlet Include Path */
public static final String INC_SERVLET_PATH =
"javax.servlet.include.servlet_path";
+ /** The Default Servlet Class Name for Tomcat 3.X and 4.X*/
+ public static final String DEFAULT_SERVLET_CLASS =
"org.apache.jasper.servlet.JspServlet";
+
+ /** Servlet Class Name */
+ public String jspServletClass = DEFAULT_SERVLET_CLASS;
+
+ public void configure(Configuration conf) throws ConfigurationException
+ {
+ if (conf != null)
+ {
+ Configuration child = conf.getChild("jsp-servlet-class");
+ this.jspServletClass = child.getValue(DEFAULT_SERVLET_CLASS);
+ getLogger().debug("JspServlet class is " + this.jspServletClass);
+ }
+ }
+
/**
* Generate XML data from JSP.
*/
@@ -73,7 +93,7 @@
MyServletResponse response = new MyServletResponse(httpResponse);
// start JSPServlet.
- Class clazz =
Thread.currentThread().getContextClassLoader().loadClass("org.apache.jasper.servlet.JspServlet");
+ Class clazz =
Thread.currentThread().getContextClassLoader().loadClass(this.jspServletClass);
HttpServlet jsp = (HttpServlet) clazz.newInstance();
jsp.init(new
config((ServletContext)this.objectModel.get(HttpEnvironment.HTTP_SERVLET_CONTEXT)));
jsp.service(request, response);
1.22 +3 -1 xml-cocoon2/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sitemap.xmap 2001/07/10 10:53:26 1.21
+++ sitemap.xmap 2001/07/10 12:34:20 1.22
@@ -16,7 +16,9 @@
<map:generator name="script"
src="org.apache.cocoon.generation.ScriptGenerator"/>
<map:generator name="velocity"
src="org.apache.cocoon.generation.VelocityGenerator"/>
<map:generator name="html"
src="org.apache.cocoon.generation.HTMLGenerator" label="content"/>
- <map:generator name="jsp"
src="org.apache.cocoon.generation.JspGenerator"/>
+ <map:generator name="jsp"
src="org.apache.cocoon.generation.JspGenerator">
+ <jsp-servlet-class>org.apache.jasper.servlet.JspServlet</jsp-servlet-class>
+ </map:generator>
<map:generator name="stream"
src="org.apache.cocoon.generation.StreamGenerator"/>
</map:generators>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
