You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by di...@apache.org on 2001/09/08 01:04:33 UTC

cvs commit: xml-cocoon2/src/org/apache/cocoon/components/jsp JSPEngineImpl.java

dims        01/09/07 16:04:33

  Modified:    src/org/apache/cocoon/components/jsp Tag: cocoon_20_branch
                        JSPEngineImpl.java
  Log:
  Patch for JSPEngineImpl from Konstantin. (Sync with C2.1 code)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +14 -14    xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImpl.java
  
  Index: JSPEngineImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/jsp/JSPEngineImpl.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- JSPEngineImpl.java	2001/08/20 14:07:26	1.1.2.2
  +++ JSPEngineImpl.java	2001/09/07 23:04:33	1.1.2.3
  @@ -20,8 +20,8 @@
   import org.apache.avalon.framework.logger.AbstractLoggable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.components.parser.Parser;
  -import org.xml.sax.SAXException;
  +//import org.apache.cocoon.components.parser.Parser;
  +//import org.xml.sax.SAXException;
   
   import javax.servlet.RequestDispatcher;
   import javax.servlet.Servlet;
  @@ -48,7 +48,7 @@
    * functionality - overrides the output method and returns the byte(s). 
    *
    * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/20 14:07:26 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/09/07 23:04:33 $
    */
   public class JSPEngineImpl extends AbstractLoggable 
       implements JSPEngine, Contextualizable, Composable, Configurable, ThreadSafe, Disposable {
  @@ -70,9 +70,9 @@
       }
   
       /**
  -     * Set the sitemap-provided configuration. 
  +     * Set the sitemap-provided configuration.
        * @param conf The configuration information
  -     * @exception ConfigurationException 
  +     * @exception ConfigurationException
        */
       public void configure(Configuration conf) throws ConfigurationException {
           Parameters params = Parameters.fromConfiguration(conf);
  @@ -94,15 +94,15 @@
        * execute the JSP and return the output
        *
        * @param context The Servlet Context
  -     * @exception IOException 
  -     * @exception ServletException 
  -     * @exception SAXException 
  -     * @exception Exception 
  +     * @exception IOException
  +     * @exception ServletException
  +     * @exception SAXException
  +     * @exception Exception
        */
  -    public byte[] executeJSP(String url, HttpServletRequest httpRequest, HttpServletResponse httpResponse, ServletContext context) 
  -        throws IOException, ServletException, SAXException, Exception {
  +    public byte[] executeJSP(String url, HttpServletRequest httpRequest, HttpServletResponse httpResponse, ServletContext context)
  +        throws IOException, ServletException/*, SAXException*/, Exception {
   
  -        Parser parser = null;
  +//        Parser parser = null;
           byte[] bytes = null;
   
           MyServletRequest request = new MyServletRequest(httpRequest, url);
  @@ -115,7 +115,7 @@
           jsp.service(request, response);
   
           bytes = response.toByteArray();
  -        ByteArrayInputStream input = new ByteArrayInputStream(bytes);
  +//        ByteArrayInputStream input = new ByteArrayInputStream(bytes);
   
           // clean up
           jsp.destroy();
  @@ -138,7 +138,7 @@
           ServletContext c;
           public config(ServletContext c) {this.c = c; }
   
  -        public String getServletName() { return "JspGenerator"; }
  +        public String getServletName() { return "JSPEngineImpl"; }
           public Enumeration getInitParameterNames()
                  { return c.getInitParameterNames(); }
           public ServletContext getServletContext() { return c; }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org