Return-Path: <pier@locus.apache.org>
Mailing-List: contact cocoon-dev-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list cocoon-dev@xml.apache.org
Received: (qmail 24174 invoked by uid 500); 17 Feb 2000 08:39:23 -0000
Delivered-To: apmail-xml-cocoon-cvs@apache.org
Received: (qmail 24171 invoked by uid 1023); 17 Feb 2000 08:39:23 -0000
Date: 17 Feb 2000 08:39:23 -0000
Message-ID: <20000217083923.24170.qmail@locus.apache.org>
From: pier@locus.apache.org
To: xml-cocoon-cvs@apache.org
Subject: cvs commit: xml-cocoon build.xml

pier        00/02/17 00:39:23

  Modified:    .        Tag: xml-cocoon2-alpha0 build.xml
  Log:
  Modifications for Servlet 2.2 compatibility.
  Thanks to Gerard van Enk <gerard.van.enk@eo.nl>.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.28.2.2  +18 -0     xml-cocoon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/build.xml,v
  retrieving revision 1.28.2.1
  retrieving revision 1.28.2.2
  diff -u -r1.28.2.1 -r1.28.2.2
  --- build.xml	2000/02/10 13:49:29	1.28.2.1
  +++ build.xml	2000/02/17 08:39:22	1.28.2.2
  @@ -20,11 +20,29 @@
           <copydir src="${src}" dest="${build.src}" ignore="package.html"/>
       </target>
   
  +    <target name="prepare-with-jsdk2.2" depends="prepare">
  +       <delete file="${build.src}/org/apache/cocoon/servlet/CocoonServletRequest.java"/>
  +       <delete file="${build.src}/org/apache/cocoon/servlet/CocoonServletResponse.java"/>
  +       <copyfile src="${src}/org/apache/cocoon/servlet/CocoonServletRequest.java.Servlet22" 
  +                 dest="${build.src}/org/apache/cocoon/servlet/CocoonServletRequest.java"/>
  +       <copyfile src="${src}/org/apache/cocoon/servlet/CocoonServletResponse.java.Servlet22" 
  +                 dest="${build.src}/org/apache/cocoon/servlet/CocoonServletResponse.java"/>
  +    </target>
  +
       <target name="compile" depends="prepare">
           <javac srcdir="${build.src}" destdir="${build.bin}"/>
       </target>
   
  +    <target name="compile-with-jsdk2.2" depends="prepare-with-jsdk2.2, compile">
  +      <echo message="compiled with jsdk2.2"/>
  +    </target>
  +
       <target name="package" depends="compile">
  +        <mkdir dir="${bin}"/>
  +        <jar jarfile="${jar}" basedir="${build.bin}" items="org"/>
  +    </target>
  +
  +    <target name="package-with-jsdk2.2" depends="compile-with-jsdk2.2">
           <mkdir dir="${bin}"/>
           <jar jarfile="${jar}" basedir="${build.bin}" items="org"/>
       </target>