Return-Path: 
 <avalon-cvs-return-12752-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 74530 invoked from network); 14 Dec 2002 09:09:14 -0000
Received: from exchange.sun.com (HELO nagoya.betaversion.org) (192.18.33.10)
  by daedalus.apache.org with SMTP; 14 Dec 2002 09:09:14 -0000
Received: (qmail 25807 invoked by uid 97); 14 Dec 2002 09:10:35 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 25773 invoked by uid 97); 14 Dec 2002 09:10:34 -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 25762 invoked by uid 97); 14 Dec 2002 09:10:33 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 14 Dec 2002 09:09:08 -0000
Message-ID: <20021214090908.29931.qmail@icarus.apache.org>
From: hammant@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit: jakarta-avalon-excalibur/altrmi 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/12/14 01:09:08

  Modified:    altrmi   build.xml
  Log:
  Make Jetty dependancy optional.
  
  Revision  Changes    Path
  1.50      +11 -22    jakarta-avalon-excalibur/altrmi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- build.xml	13 Dec 2002 15:11:26 -0000	1.49
  +++ build.xml	14 Dec 2002 09:09:07 -0000	1.50
  @@ -12,7 +12,6 @@
   
   
       <property name ="jetty.rel"    value="4.2.2"/>
  -    <property name="jetty.jars.dir" value="${lib.dir}/jetty-jars"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -88,7 +87,7 @@
   
   
       <!-- Compiles the source code -->
  -    <target name="compile" depends="dependencies,checkNecessaryJars" description="Compiles the source code">
  +    <target name="compile" depends="dependencies, warnJettyJars" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -101,6 +100,7 @@
               target="1.2">
               <classpath refid="project.class.path" />
               <include name="**/*.java"/>
  +            <exclude name="org/apache/excalibur/altrmi/server/impl/http/*.java" unless="jetty.present"/>
           </javac>
   
           <rmic base="${build.classes}"
  @@ -143,6 +143,7 @@
               target="1.2">
               <classpath refid="test.class.path" />
               <include name="**/*.java"/>
  +            <exclude name="org/apache/excalibur/altrmi/test/http/*.java" unless="jetty.present"/>
           </javac>
   
           <taskdef name="attributes" classname="org.apache.commons.attributes.task.AttributesCompiler">
  @@ -511,18 +512,14 @@
   
       </target>
   
  -    <target name="checkNecessaryJars" depends="checkJettyJars" unless="jetty.present">
  -        <echo>****************************</echo>
  -        <echo>* Please execute target    *</echo>
  -        <echo>* 'get-jetty' in           *</echo>
  -        <echo>* jetty.xml build file     *</echo>
  -        <echo>* to download six mega-    *</echo>
  -        <echo>* bytes of Jetty from      *</echo>
  -        <echo>* Sourceforge              *</echo>
  -        <echo>****************************</echo>
  -
  -        <fail message="Jetty needed. See above."/>
  -
  +    <target name="warnJettyJars" depends="checkJettyJars" unless="jetty.present">
  +        <echo>*************************************</echo>
  +        <echo>* Please execute target 'get-jetty' *</echo>
  +        <echo>* in to download six megabytes of   *</echo>
  +        <echo>* Jetty from SourceForge. This will *</echo>
  +        <echo>* enable the http transport types   *</echo>
  +        <echo>* for AltRMI                        *</echo>
  +        <echo>*************************************</echo>
       </target>
   
   
  @@ -536,14 +533,6 @@
           usetimestamp="true"/>
   
         <unzip src="jetty-download/Jetty-${jetty.rel}.zip" dest="jetty-download/Jetty-${jetty.rel}" />
  -
  -      <delete file="${jetty.jars.dir}/*.jar"/>
  -
  -      <copy todir="${jetty.jars.dir}" flatten="true">
  -        <fileset dir="jetty-download/Jetty-${jetty.rel}">
  -          <include  name="**/lib/*.jar"/>
  -        </fileset>
  -      </copy>
   
      </target>
   
  
  
  

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