cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Berin Loritsch <blorit...@apache.org>
Subject Re: [C2] Catalina install working (was: RE: cvs commit: xml-cocoon/src/org/apache/cocoon/servlet CocoonServlet.java)
Date Tue, 27 Feb 2001 17:58:49 GMT
Colin Britton wrote:
> 
> I have tested a clean CVS C2 (with the servlet 2.3 build fix) with
> Catalina nightly (jakarta-tomcat-4.0-20010224.zip) using catalina's
> servlet.jar (servlet 2.3) running on W2K.
> 
> I needed to add the extra-classpath to web.xml which points to the
> servlet.jar used by catalina (it must be this one not a copy of the
> servler.jar placed in the /WEB-INF/lib directory)
> 
> On my system the change to web.xml is this.... (note that Catalina since
> B1 has changed it's directory structure for libs)
> 
>     <init-param>
>        <!-- change param value to path to Catalina's servlet.jar -->
>       <param-name>extra-classpath</param-name>
>       <param-value>..\common\lib\servlet.jar</param-value>
>     </init-param>
> 
> Also note that I did not remove or replace crimson or jaxp or make any
> other changes to catalina to make this work (Hurray!!). I have also
> double checked this with a complete clean install of both Catalina and
> C2.

This is awesome news!  Davanum, you rock! (or should I call you Dims?)

> 
> rgds
> CB
> 
> -----Original Message-----
> From: dims@apache.org [mailto:dims@apache.org]
> Sent: Tuesday, February 27, 2001 10:57 AM
> To: xml-cocoon-cvs@apache.org
> Subject: cvs commit: xml-cocoon/src/org/apache/cocoon/servlet
> CocoonServlet.java
> 
> dims        01/02/27 07:57:12
> 
>   Modified:    .        Tag: xml-cocoon2 build.xml
>                src/org/apache/cocoon/environment/http Tag: xml-cocoon2
>                         HttpRequest22.java HttpRequest23.java
>                src/org/apache/cocoon/servlet Tag: xml-cocoon2
>                         CocoonServlet.java
>   Added:       src/org/apache/cocoon/environment/http Tag: xml-cocoon2
>                         RequestWrapper22.java RequestWrapper23.java
>   Log:
>   Fixed MaybeUpload compilation errors for Servlet 2.3.
>   Need to test it under Tomcat4.0.
> 
>   Revision  Changes    Path
>   No                   revision
> 
> 
>   No                   revision
> 
> 
>   1.6.2.59  +7 -0      xml-cocoon/build.xml
> 
>   Index: build.xml
>   ===================================================================
>   RCS file: /home/cvs/xml-cocoon/build.xml,v
>   retrieving revision 1.6.2.58
>   retrieving revision 1.6.2.59
>   diff -u -r1.6.2.58 -r1.6.2.59
>   --- build.xml 2001/02/22 19:52:09     1.6.2.58
>   +++ build.xml 2001/02/27 15:57:00     1.6.2.59
>   @@ -210,6 +210,7 @@
>        <copy todir="${build.src}" filtering="on">
>          <fileset dir="${src.dir}">
>            <exclude name="**/http/HttpRequest2*.java"/>
>   +        <exclude name="**/http/RequestWrapper2*.java"/>
>            <exclude name="**/http/HttpResponse2*.java"/>
>          </fileset>
>        </copy>
>   @@ -222,6 +223,9 @@
>        <copy
> file="${src.dir}/org/apache/cocoon/environment/http/HttpRequest23.java"
> 
> tofile="${build.src}/org/apache/cocoon/environment/http/HttpRequest.java
> "
>            filtering="on"/>
>   +    <copy
> file="${src.dir}/org/apache/cocoon/environment/http/RequestWrapper23.jav
> a"
>   +
> tofile="${build.src}/org/apache/cocoon/environment/http/RequestWrapper.j
> ava"
>   +        filtering="on"/>
>        <copy
> file="${src.dir}/org/apache/cocoon/environment/http/HttpResponse23.java"
> 
> tofile="${build.src}/org/apache/cocoon/environment/http/HttpResponse.jav
> a"
>            filtering="on"/>
>   @@ -233,6 +237,9 @@
>      <target name="prepare-src-22" depends="prepare-src-23"
> unless="servlet23.present">
>        <copy
> file="${src.dir}/org/apache/cocoon/environment/http/HttpRequest22.java"
> 
> tofile="${build.src}/org/apache/cocoon/environment/http/HttpRequest.java
> "
>   +        filtering="on"/>
>   +    <copy
> file="${src.dir}/org/apache/cocoon/environment/http/RequestWrapper22.jav
> a"
>   +
> tofile="${build.src}/org/apache/cocoon/environment/http/RequestWrapper.j
> ava"
>            filtering="on"/>
>        <copy
> file="${src.dir}/org/apache/cocoon/environment/http/HttpResponse22.java"
> 
> tofile="${build.src}/org/apache/cocoon/environment/http/HttpResponse.jav
> a"
> 
> 
> 
>   No                   revision
> 
> 
>   No                   revision
> 
> 
>   1.1.2.5   +2 -4
> xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRequest22.ja
> va
> 
>   Index: HttpRequest22.java
>   ===================================================================
>   RCS file:
> /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRe
> quest22.java,v
>   retrieving revision 1.1.2.4
>   retrieving revision 1.1.2.5
>   diff -u -r1.1.2.4 -r1.1.2.5
>   --- HttpRequest22.java        2001/02/22 14:03:46     1.1.2.4
>   +++ HttpRequest22.java        2001/02/27 15:57:04     1.1.2.5
>   @@ -21,8 +21,6 @@
>    import javax.servlet.http.HttpServletRequest;
>    import javax.servlet.http.HttpSession;
> 
>   -import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
>   -
>    /**
>     *
>     * Implements the {@link javax.servlet.http.HttpServletRequest}
> interface
>   @@ -49,8 +47,8 @@
>        /* The HttpServletRequest interface methods */
> 
>        public Object get(String name) {
>   -        if (this.req instanceof MaybeUploadRequestWrapper) {
>   -            return ((MaybeUploadRequestWrapper) this.req).get(name);
>   +        if (this.req instanceof RequestWrapper) {
>   +            return ((RequestWrapper) this.req).get(name);
>            } else {
>                String[] values = this.getParameterValues(name);
> 
> 
> 
> 
>   1.1.2.4   +2 -4
> xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRequest23.ja
> va
> 
>   Index: HttpRequest23.java
>   ===================================================================
>   RCS file:
> /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/http/Attic/HttpRe
> quest23.java,v
>   retrieving revision 1.1.2.3
>   retrieving revision 1.1.2.4
>   diff -u -r1.1.2.3 -r1.1.2.4
>   --- HttpRequest23.java        2001/02/22 14:03:47     1.1.2.3
>   +++ HttpRequest23.java        2001/02/27 15:57:05     1.1.2.4
>   @@ -12,8 +12,6 @@
>    import javax.servlet.http.HttpServletRequest;
>    import javax.servlet.http.HttpServletRequestWrapper;
> 
>   -import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
>   -
>    /**
>     *
>     * Implements the {@link javax.servlet.http.HttpServletRequest}
> interface
>   @@ -40,8 +38,8 @@
>        /* The HttpServletRequest interface methods */
> 
>        public Object get(String name) {
>   -        if (this.req instanceof MaybeUploadRequestWrapper) {
>   -            return ((MaybeUploadRequestWrapper) this.req).get(name);
>   +        if (this.req instanceof RequestWrapper) {
>   +            return ((RequestWrapper) this.req).get(name);
>            } else {
>                String[] values = this.getParameterValues(name);
> 
> 
> 
> 
>   No                   revision
> 
> 
>   No                   revision
> 
> 
>   1.1.2.1   +40 -0
> xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper22
> .java
> 
> 
> 
> 
>   1.1.2.1   +55 -0
> xml-cocoon/src/org/apache/cocoon/environment/http/Attic/RequestWrapper23
> .java
> 
> 
> 
> 
>   No                   revision
> 
> 
>   No                   revision
> 
> 
>   1.1.4.68  +7 -8
> 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.j
> ava,v
>   retrieving revision 1.1.4.67
>   retrieving revision 1.1.4.68
>   diff -u -r1.1.4.67 -r1.1.4.68
>   --- CocoonServlet.java        2001/02/27 15:20:48     1.1.4.67
>   +++ CocoonServlet.java        2001/02/27 15:57:10     1.1.4.68
>   @@ -39,6 +39,7 @@
>    import org.apache.cocoon.Notification;
>    import org.apache.cocoon.ResourceNotFoundException;
>    import org.apache.cocoon.environment.http.HttpEnvironment;
>   +import org.apache.cocoon.environment.http.RequestWrapper;
>    import org.apache.cocoon.environment.Environment;
>    import org.apache.cocoon.util.ClassUtils;
>    import org.apache.cocoon.util.NetUtils;
>   @@ -52,8 +53,6 @@
>    import org.apache.log.output.FileOutputLogTarget;
>    import org.apache.log.LogTarget;
> 
>   -import uk.co.weft.maybeupload.MaybeUploadRequestWrapper;
>   -
>    /**
>     * This is the entry point for Cocoon execution as an HTTP Servlet.
>     *
>   @@ -62,7 +61,7 @@
>     * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
>     * @author <a href="mailto:nicolaken@supereva.it">Nicola Ken
> Barozzi</a> Aisa
>     * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
>   - * @version CVS $Revision: 1.1.4.67 $ $Date: 2001/02/27 15:20:48 $
>   + * @version CVS $Revision: 1.1.4.68 $ $Date: 2001/02/27 15:57:10 $
>     */
> 
>    public class CocoonServlet extends HttpServlet {
>   @@ -282,12 +281,12 @@
> 
>            if (contentType.startsWith("multipart/form-data")) {
>                try {
>   -                req = new MaybeUploadRequestWrapper(request,
>   -                                                    this.uploadDir,
>   -
> CocoonServlet.ALLOW_OVERWRITE,
>   -
> CocoonServlet.SILENTLY_RENAME);
>   +                req = new RequestWrapper(request,
>   +                                         this.uploadDir,
>   +
> CocoonServlet.ALLOW_OVERWRITE,
>   +
> CocoonServlet.SILENTLY_RENAME);
>                } catch (Exception e) {
>   -                log.warn("Could not create
> MaybeUploadRequestWrapper", e);
>   +                log.warn("Could not create RequestWrapper", e);
>                    req = request;
>                }
>            }
> 
> 
> 
> 
> ----------------------------------------------------------------------
> 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
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
> For additional commands, email: cocoon-dev-help@xml.apache.org

Mime
View raw message