Return-Path: 
 <commits-return-1558-apmail-gump-commits-archive=www.apache.org@gump.apache.org>
Delivered-To: apmail-gump-commits-archive@www.apache.org
Received: (qmail 57402 invoked from network); 22 Jun 2005 23:17:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 22 Jun 2005 23:17:28 -0000
Received: (qmail 62737 invoked by uid 500); 22 Jun 2005 23:17:26 -0000
Mailing-List: contact commits-help@gump.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@gump.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@gump.apache.org>
List-Post: <mailto:commits@gump.apache.org>
List-Id: <commits.gump.apache.org>
Reply-To: general@gump.apache.org
Delivered-To: mailing list commits@gump.apache.org
Received: (qmail 62651 invoked by uid 500); 22 Jun 2005 23:17:25 -0000
Delivered-To: apmail-gump-cvs@apache.org
Received: (qmail 62429 invoked by uid 99); 22 Jun 2005 23:17:23 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 22 Jun 2005 16:17:23 -0700
Received: (qmail 57280 invoked by uid 1721); 22 Jun 2005 23:17:22 -0000
Date: 22 Jun 2005 23:17:22 -0000
Message-ID: <20050622231722.57279.qmail@minotaur.apache.org>
From: sebb@apache.org
To: gump-cvs@apache.org
Subject: cvs commit: gump/project jakarta-jmeter.xml
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

sebb        2005/06/22 16:17:22

  Modified:    project  jakarta-jmeter.xml
  Log:
  Javadoc needs logkit; remove CVS build
  
  Revision  Changes    Path
  1.127     +11 -104   gump/project/jakarta-jmeter.xml
  
  Index: jakarta-jmeter.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-jmeter.xml,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- jakarta-jmeter.xml	22 Jun 2005 18:26:37 -0000	1.126
  +++ jakarta-jmeter.xml	22 Jun 2005 23:17:22 -0000	1.127
  @@ -121,96 +121,6 @@
       <jar name="lib/xstream-1.1.jar" id="xstream"/>
     </project>
     
  -  <project name="jakarta-jmeter-cvs">
  -        <!-- Build JMeter from CVS versions of dependencies -->
  -    <package>org.apache.jmeter</package>
  -
  -    <ant target="gump-build">
  -      <property name="jmeter.version" value="@@DATE@@"/>
  -      <property name="gump.run" value="true"/>
  -      <!-- The version of this file -->
  -      <property name="version.projectfile" value="$Revision$"/>
  -      <property name="date.projectfile" value="$Date$"/>
  -    </ant>
  -
  -    <depend project="ant" />
  -    <depend project="jaf" />
  -    <depend project="javamail" />
  -    <depend project="jsse" />
  -    
  -    <depend project="bsh"/>
  -    <option project="jakarta-bsf"/>
  -    
  -    <depend project="jms"/>
  -
  -    <!-- Try to ensure that cvs builds after jmeter -->
  -    <option project="jakarta-jmeter">
  -        <noclasspath/>
  -    </option>
  -    
  -    <work nested="build/core"/>
  -    <work nested="build/htmlparser"/>
  -    <work nested="build/jorphan"/>
  -    
  -    <!-- Allow http to build: -->
  -    <work nested="build/components"/>
  -
  -    <!-- Allow Monitor to build -->
  -    <work nested="build/protocol/http"/>
  -    <work nested="build/monitor/model"/>
  -    
  -    <work nested="lib/batik-awt-util.jar"/>
  -
  -    <work nested="lib/xpp3_min-1.1.3.4.I.jar"/>
  -    <work nested="lib/xstream-1.1.jar"/>
  -
  -    <work nested="lib/excalibur-logger-1.1.jar"/>
  -    <work nested="lib/excalibur-compatibility-1.1.jar"/>
  -    <work nested="lib/excalibur-i18n-1.1.jar"/>
  -    
  -    <work nested="lib/excalibur-datasource-1.1.1.jar"/>
  -    <work nested="lib/excalibur-pool-1.2.jar"/>
  -    <work nested="lib/excalibur-instrument-1.0.jar"/>
  -    
  -    <work nested="lib/avalon-framework-4.1.4.jar"/>
  -    <work nested="lib/commons-collections.jar"/>
  -    <work nested="lib/jakarta-oro-2.0.8.jar"/>
  -    <work nested="lib/jdom-1.0.jar"/>
  -    <work nested="lib/junit.jar"/>
  -    <work nested="lib/js.jar"/>
  -    <work nested="lib/logkit-1.2.jar"/>
  -    <work nested="lib/soap.jar"/>
  -    <work nested="lib/Tidy.jar"/>
  -
  -    <work nested="lib/commons-logging.jar"/>
  -    <work nested="lib/commons-httpclient-2.0.jar"/>
  -
  -
  -    <!-- needed for documentation -->
  -    <work nested="lib/velocity-1.4-dev.jar"/>
  -    <depend project="jdom"/>
  -    
  -    <!-- are these still needed ? -->
  -    <work nested="lib/xalan.jar"/>
  -    <work nested="lib/xercesImpl.jar"/>
  -    <work nested="lib/xml-apis.jar"/>
  -
  -    <!-- Export the JMeter jars -->
  -    <home nested="." />
  -
  -    <jar name="dist/jakarta-jmeter-@@DATE@@_bin.zip" />
  -    <jar name="dist/jakarta-jmeter-@@DATE@@_src.zip" />
  -    <jar name="dist/jakarta-jmeter-@@DATE@@_lib.zip" />
  -    <license name="LICENSE"/>
  -    <jar name="NOTICE" />
  -    <jar name="INSTALLING" />
  -
  -    <nag from="Gump-build &lt;sebb@apache.org&gt;"
  -         to="jmeter-dev@jakarta.apache.org">
  -        <regexp pattern="/BUILD FAILED/" subject="JMeter CVS Build Failure"/>
  -    </nag>
  -  </project>
  -
     <project name="jakarta-jmeter-docs">
           <!-- Build JMeter docs -->
       <package>org.apache.jmeter</package>
  @@ -251,11 +161,6 @@
   
       <depend project="ant" />
   
  -    <depend project="jakarta-jmeter-cvs">
  -        <noclasspath/>
  -    </depend>
  -
  -<!-- Add jars that would otherwise come from jmeter-cvs -->
       <depend project="jaf" />
       <depend project="javamail" />
       <depend project="jsse" />
  @@ -336,6 +241,8 @@
       <option project="jakarta-bsf"/>
       
       <depend project="jms"/>
  +	
  +    <depend project="avalon-logkit"/>
   
       <work nested="lib/batik-awt-util.jar"/>