Return-Path: 
 <avalon-cvs-return-11256-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 56751 invoked from network); 2 Oct 2002 20:07:49 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 2 Oct 2002 20:07:49 -0000
Received: (qmail 4117 invoked by uid 97); 2 Oct 2002 20:08:35 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 4101 invoked by uid 97); 2 Oct 2002 20:08:35 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 4090 invoked by uid 97); 2 Oct 2002 20:08:34 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 2 Oct 2002 20:07:36 -0000
Message-ID: <20021002200736.24087.qmail@icarus.apache.org>
From: hammant@apache.org
To: jakarta-avalon-apps-cvs@apache.org
Subject: cvs commit: jakarta-avalon-apps/httpproxy build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

hammant     2002/10/02 13:07:36

  Modified:    httpproxy build.xml
  Log:
  upgrade phoenixXdoclet
  
  Revision  Changes    Path
  1.21      +5 -20     jakarta-avalon-apps/httpproxy/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/httpproxy/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml	3 Sep 2002 07:37:25 -0000	1.20
  +++ build.xml	2 Oct 2002 20:07:36 -0000	1.21
  @@ -119,12 +119,8 @@
     </target>
   
   
  -  <target name="test-xdoclet">  
  -    <available classname="xdoclet.XDocletMain" classpathref="project.class.path" property="xdoclet.present"/>    
  -  </target>
  -
     <!-- Make .xinfo and manifest automatically for blocks -->
  -  <target name="phoenix-xdoclet" depends="compile" if="xdoclet.present">
  +  <target name="phoenix-xdoclet" depends="compile">
     
       <mkdir dir="${build.xdoclet}"/>
     
  @@ -144,18 +140,8 @@
   
     </target>
   
  -  <!-- Make .xinfo and manifest automatically for blocks -->
  -  <target name="no-phoenix-xdoclet" depends="compile" unless="xdoclet.present">
  -  
  -    <mkdir dir="${build.xdoclet}"/>
  -  
  -    <unzip src="${src.dir}/generated-by-xdoclet.zip" dest="${build.xdoclet}" />
  -
  -  </target>
  -
  -
     <!-- Jars up project -->
  -  <target name="jars" depends="test-xdoclet, phoenix-xdoclet, no-phoenix-xdoclet">
  +  <target name="jars" depends="phoenix-xdoclet">
   
       <mkdir dir="${build.lib}"/>
   
  @@ -207,7 +193,7 @@
     </target>
   
     <!-- Completely build all dists -->
  -  <target name="dist" depends="sars" description="Generates the distribution">
  +  <target name="dist" description="Generates the distribution">
   
       <property name="dist.name" value="${Name}-${version}"/>
   
  @@ -245,6 +231,7 @@
           <include name="common/lib/cornerstone.jar"/>
           <include name="common/lib/phoenix-*"/>
           <include name="common/lib/excalibur-i18n*"/>
  +        <include name="common/lib/qdox-*"/>
         </fileset>
       </zip>
   
  @@ -261,6 +248,7 @@
           <include name="common/lib/cornerstone.jar"/>
           <include name="common/lib/phoenix-*"/>
           <include name="common/lib/excalibur-i18n*"/>
  +        <include name="common/lib/qdox-*"/>
         </tarfileset>      
       </tar>
   
  @@ -305,9 +293,6 @@
       <copy todir="${src.dist.src}">
         <fileset dir="${src.dir}"/>
       </copy>
  -    
  -    <zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
  -         basedir="${build.xdoclet}"/>    
       
       <copy todir="${src.dist.dir}">
         <fileset dir=".">
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>