gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r578803 - /gump/metadata/project/jakarta-jmeter.xml
Date Mon, 24 Sep 2007 13:19:40 GMT
Author: sebb
Date: Mon Sep 24 06:19:37 2007
New Revision: 578803

URL: http://svn.apache.org/viewvc?rev=578803&view=rev
Log:
Re-establish JMeter trunk build

Modified:
    gump/metadata/project/jakarta-jmeter.xml

Modified: gump/metadata/project/jakarta-jmeter.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/jakarta-jmeter.xml?rev=578803&r1=578802&r2=578803&view=diff
==============================================================================
--- gump/metadata/project/jakarta-jmeter.xml (original)
+++ gump/metadata/project/jakarta-jmeter.xml Mon Sep 24 06:19:37 2007
@@ -20,12 +20,13 @@
   <url href="http://jakarta.apache.org/jmeter/" />
   <description>
     Pure Java load testing and performance measurement tool.
+    Trunk build
   </description>
 
-  <svn repository="jakarta-svn" dir="jmeter/trunk" />
-  
-  <project name="jakarta-jmeter">
-        <!-- Compile from latest versions of dependencies -->
+  <svn repository="jakarta-svn" dir="jmeter/trunk"/>
+
+  <project name="jakarta-jmeter-svn">
+  	<!-- Build JMeter from latest versions of dependencies -->
     <package>org.apache.jmeter</package>
 
     <ant target="gump-build">
@@ -34,126 +35,75 @@
       <!-- The version of this file -->
       <property name="version.projectfile" value="$Revision$"/>
       <property name="date.projectfile" value="$Date$"/>
-      <!-- Gump does not yet support Java 1.5 - see if we can build with 1.4 -->
-      <property name="target.java.version" value="1.4"/>
-      <property name="src.java.version"    value="1.4"/>
-      
-      <!--
-        These properties are passed to the build process, so the names need to agree with
-        the ones used in build.xml. However, at present the properties are only used for
-        creating the list of jars to be exported.
-      -->
-      <depend property="avalon-framework-api.jar" project="excalibur-framework-api"/>

-      <depend property="avalon-framework.jar" project="excalibur-framework-impl"/>

-
-      <depend property="jakarta-oro.jar" project="jakarta-oro"/>
-      <depend property="junit.jar" project="junit"/>
-      <depend property="logkit.jar" project="excalibur-logkit"/>
-      <!-- are the x jars still needed ? -->
-      <depend property="xalan.jar" project="xalan" id="xalan"/>
-      <depend property="xerces.jar" project="xml-xerces" id="xml-parser"/>
-      <depend property="xml-apis.jar" project="xml-apis" id="xml-apis"/>
-      
-      <depend property="jdom.jar" project="jdom"/>
-      <depend property="js.jar" project="rhino"/>
-      <depend property="soap.jar" project="ws-soap"/>
-
-      <!-- Ensure work directories don't get dropped from classpath -->
-      <mkdir dir="build/core"/>
-      <mkdir dir="build/htmlparser"/>
-      <mkdir dir="build/jorphan"/>
-                
-      <!-- Allow http to build: -->
-      <mkdir dir="build/components"/>
-      
-      <!-- Allow Monitor to build -->
-      <mkdir dir="build/protocol/http"/>
-      <mkdir dir="build/monitor/model"/>
-
     </ant>
+    
+	<!-- Ensure work directories don't get dropped from classpath -->
+	<mkdir dir="build/core"/>
+	<mkdir dir="build/jorphan"/>
+	
+	<!-- Allow http to build: -->
+	<mkdir dir="build/components"/>
 
-    <depend project="ant" />
+	<!-- Allow Monitor to build -->
+	<mkdir dir="build/protocol/http"/>
+	<mkdir dir="build/monitor/model"/>
 
-    <!-- Probably no longer needed with Java 1.4 -->
+    <depend project="ant" />
     <depend project="jaf" />
     <depend project="javamail" />
     <depend project="jsse" />
-
+    <depend project="jms" />
+    <depend project="rhino" />
+    
+    <option project="bsh" ids="bsh-core"/>
+    <depend project="jakarta-bsf"/>
+    <depend project="commons-codec"/>
+    <depend project="commons-io"/>
+    <depend project="commons-lang"/>
+    <depend project="commons-jexl"/>
+    <depend project="commons-httpclient"/>
+    <depend project="commons-net"/>
+    
     <depend project="commons-collections"/>
-    <depend project="jtidy" />
-    <depend project="excalibur-logger" />
-    <depend project="excalibur-legacy"/>
-
-    <depend project="excalibur-datasource"/>
-    <depend project="excalibur-pool"/>
-    <depend project="excalibur-instrument-api"/>
-
-    <depend project="xml-batik"/>
-
     <depend project="commons-logging"/>
-    <depend project="commons-httpclient"/>
-
-    <option project="bsh"/>
-    <option project="jakarta-bsf"/>
-
-    <depend project="jms"/>
+    <depend project="jakarta-oro"/>
+    <depend project="avalon-framework-impl"/>
+    <depend project="avalon-framework-api"/>
+    <depend project="avalon-logkit"/>
+    <depend project="velocity-engine"/>
 
+    <depend project="xstream"/>
+    <depend project="xpp3"/>
+    <option project="junit3" runtime="true"/>
+    
     <work nested="build/core"/>
-    <work nested="build/htmlparser"/>
     <work nested="build/jorphan"/>
     
-    <depend project="xpp3"/>
-    <depend project="xstream"/>
-    
-        <!-- Allow http to build: -->
+    <!-- Allow http to build: -->
     <work nested="build/components"/>
 
     <!-- Allow Monitor to build -->
     <work nested="build/protocol/http"/>
     <work nested="build/monitor/model"/>
 
-    <!-- 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 Build Failure"/>
-    </nag>
-  </project>
-  
-  <project name="xstream">
-  	<url href="http://xstream.codehaus.org/"/>
-  	<description>XStream is a simple library to serialize objects to XML and back again
-  	</description>
-    <jar name="lib/xstream-1.1.2.jar" id="xstream"/>
-  </project>
-  
-  <project name="jakarta-jmeter-docs">
-        <!-- Build JMeter docs -->
-    <package>org.apache.jmeter</package>
-
-    <ant target="docs-printable">
-      <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="excalibur-logkit"/>
-    <depend project="commons-collections"/>
-    <depend project="velocity-engine" ids="velocity" />
-    <depend project="jdom" runtime="true"/>
+    <work nested="lib/batik-awt-util-1.6.jar"/>
     
+    <work nested="lib/excalibur-datasource-1.1.1.jar"/>
+    <work nested="lib/excalibur-instrument-1.0.jar"/>
+    <work nested="lib/excalibur-logger-1.1.jar"/>
+    <work nested="lib/excalibur-pool-1.2.jar"/>
+    <work nested="lib/htmlparser-2.0-20060923.jar"/>
+    <work nested="lib/htmllexer-2.0-20060923.jar"/>
+    <work nested="lib/jCharts-0.7.5.jar"/>
+    <work nested="lib/jdom-1.0.jar"/>
+    <work nested="lib/soap.jar"/>
+    <work nested="lib/Tidy.jar"/>
+
+    <!-- are these still needed ? -->
+    <work nested="lib/xalan.jar"/>
+    <work nested="lib/xercesImpl.jar"/>
+    <work nested="lib/xml-apis.jar"/>
+
     <nag from="Gump-build &lt;sebb@apache.org&gt;"
          to="jmeter-dev@jakarta.apache.org">
         <regexp pattern="/BUILD FAILED/" subject="JMeter CVS Build Failure"/>
@@ -165,62 +115,70 @@
     <ant target="gump-test">
       <property name="jmeter.version" value="@@DATE@@"/>
       <property name="gump.run" value="true"/>
-      <!-- Temp hack to make up for missing workspace property ... -->
-      <property name="java.awt.headless" value="true"/>
       <!-- The version of this file -->
       <property name="version.projectfile" value="$Revision$"/>
       <property name="date.projectfile" value="$Date$"/>
+      <!--  hack to try to solve work pathname problem - or at least see if test could
work... -->
+      <property name="build.test.gump" value="/usr/local/gump/public/workspace/jakarta-jmeter/build/test"/>
     </ant>
 
     <depend project="ant" />
-    
-    <!-- ensure it runs after the build -->
-    <depend project="jakarta-jmeter">
+
+	<mkdir dir="build/test"/>
+
+    <depend project="jakarta-jmeter-svn">
     	<noclasspath/>
     </depend>
 
     <depend project="jaf" />
     <depend project="javamail" />
     <depend project="jsse" />
-
+    <depend project="jms" />
+    <depend project="rhino" />
     <option project="bsh"/>
-    <option project="jakarta-bsf"/>
+    <depend project="jakarta-bsf"/>
+    <depend project="commons-codec"/>
+    <depend project="commons-io"/>
+    <depend project="commons-lang"/>
+    <depend project="commons-jexl"/>
+    <depend project="commons-httpclient"/>
+    <depend project="commons-net"/>
 
-    <depend project="jms"/>
-   
-    <depend project="xml-batik"/>
+    <depend project="commons-collections"/>
+    <depend project="commons-logging"/>
+    <depend project="jakarta-oro"/>
+    <depend project="avalon-framework-impl"/>
+    <depend project="avalon-framework-api"/>
+    <depend project="avalon-logkit"/>
+    <depend project="velocity-engine"/>
 
-    <depend project="xpp3"/>
     <depend project="xstream"/>
+    <depend project="xpp3"/>
+    <option project="junit3" runtime="true"/>
 
-    <depend project="excalibur-logger" />
-    <depend project="excalibur-legacy"/>
-   
-    <depend project="excalibur-datasource"/>
-    <depend project="excalibur-pool"/>
-    <depend project="excalibur-instrument-api"/>
-    
-    <depend project="excalibur-framework-api"/> 
-    <depend project="excalibur-framework-impl"/> 
-
-    <depend project="commons-collections"/>
-    <depend project="jakarta-oro"/>
-    <depend project="jdom"/>
-    <depend project="junit"/>
-    <depend project="rhino"/>
-    <depend project="excalibur-logkit"/>
-    <depend project="ws-soap"/>
-    <depend project="jtidy" />
-    <depend project="commons-logging"/>
-    <depend project="commons-httpclient"/>
+    <home nested="." />
 
-    <depend project="xalan" id="xalan"/>
-    <depend project="xml-xerces" id="xml-parser"/>
-    <depend project="xml-apis"/>
+    <work nested="lib/batik-awt-util-1.6.jar"/>
+    
+    <work nested="lib/excalibur-datasource-1.1.1.jar"/>
+    <work nested="lib/excalibur-i18n-1.1.jar"/>
+    <work nested="lib/excalibur-instrument-1.0.jar"/>
+    <work nested="lib/excalibur-logger-1.1.jar"/>
+    <work nested="lib/excalibur-pool-1.2.jar"/>
+    <work nested="lib/htmlparser-2.0-20060923.jar"/>
+    <work nested="lib/htmllexer-2.0-20060923.jar"/>
+    <work nested="lib/jCharts-0.7.5.jar"/>
+    <work nested="lib/jdom-1.0.jar"/>
+    <work nested="lib/soap.jar"/>
+    <work nested="lib/Tidy.jar"/>
+
+    <work nested="lib/xalan.jar"/>
+    <work nested="lib/xercesImpl.jar"/>
+    <work nested="lib/xml-apis.jar"/>
 
-    <!-- Add jars needed to run tests -->
+    <!-- Add jars and classes needed to run tests -->
+    <work nested="build/test"/>
     <work nested="lib/jorphan.jar"/>
-    <work nested="lib/htmlparser.jar"/>
     <work nested="lib/ext/ApacheJMeter_components.jar"/>
     <work nested="lib/ext/ApacheJMeter_core.jar"/>
     <work nested="lib/ext/ApacheJMeter_ftp.jar"/>
@@ -229,9 +187,11 @@
     <work nested="lib/ext/ApacheJMeter_java.jar"/>
     <work nested="lib/ext/ApacheJMeter_jdbc.jar"/>
     <work nested="lib/ext/ApacheJMeter_jms.jar"/>
+    <work nested="lib/ext/ApacheJMeter_junit.jar"/>
     <work nested="lib/ext/ApacheJMeter_ldap.jar"/>
     <work nested="lib/ext/ApacheJMeter_mail.jar"/>
     <work nested="lib/ext/ApacheJMeter_monitors.jar"/>
+    <work nested="lib/ext/ApacheJMeter_report.jar"/>
     <work nested="lib/ext/ApacheJMeter_tcp.jar"/>
 
     <nag from="Gump-build &lt;sebb@apache.org&gt;"
@@ -240,64 +200,4 @@
     </nag>
   </project>
   
-  <project name="jakarta-jmeter-javadoc">
-    <package>org.apache.jmeter</package>
-    <ant target="gump-javadoc">
-      <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" />
-
-    <!-- Probably no longer needed with Java 1.4 -->
-    <depend project="jaf" />
-    <depend project="javamail" />
-    <depend project="jsse" />
-
-    <option project="bsh"/>
-    <option project="jakarta-bsf"/>
-    
-    <depend project="jms"/>
-	
-    <depend project="xml-batik"/>
-
-    <depend project="xpp3"/>
-    <depend project="xstream"/>
-
-    <depend project="excalibur-logger" />
-    <depend project="excalibur-legacy"/>
-   
-    <depend project="excalibur-datasource"/>
-    <depend project="excalibur-pool"/>
-    <depend project="excalibur-instrument-api"/>
-    
-    <depend project="excalibur-framework-api"/> 
-    <depend project="excalibur-framework-impl"/> 
-    <depend project="commons-collections"/>
-    <depend project="jakarta-oro"/>
-    <depend project="jdom"/>
-    <depend project="junit"/>
-    <depend project="rhino"/>
-    <depend project="excalibur-logkit"/>
-    <depend project="ws-soap"/>
-    <depend project="jtidy" />
-
-    <depend project="commons-logging"/>
-    <depend project="commons-httpclient"/>
-
-    <depend project="xalan" id="xalan"/>
-    <depend project="xml-xerces" id="xml-parser"/>
-    <depend project="xml-apis"/>
-
-    <!-- Export the JMeter API doc jar -->
-    <home nested="." />
-    <jar name="dist/jakarta-jmeter-@@DATE@@_api.zip" />
-    <!-- needs licenze to keep Gump happy -->
-    <license name="LICENSE"/>
-
-  </project>
-
 </module>



Mime
View raw message