jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1685257 - in /jmeter/trunk: bin/jmeter-report bin/jmeter-report.bat build.xml
Date Sat, 13 Jun 2015 13:47:42 GMT
Author: pmouawad
Date: Sat Jun 13 13:47:41 2015
New Revision: 1685257

URL: http://svn.apache.org/r1685257
Log:
Bug 57269 - Drop org.apache.jmeter.reports package
Remove broken code
Bugzilla Id: 57269

Removed:
    jmeter/trunk/bin/jmeter-report
    jmeter/trunk/bin/jmeter-report.bat
Modified:
    jmeter/trunk/build.xml

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1685257&r1=1685256&r2=1685257&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sat Jun 13 13:47:41 2015
@@ -443,8 +443,8 @@
     <pathelement location="${lib.dir}/${commons-logging.jar}"/>
     <pathelement location="${lib.dir}/${commons-math3.jar}"/>
     <pathelement location="${lib.dir}/${commons-net.jar}"/>
-    <pathelement location="${lib.dir}/${commons-pool2.jar}"/>
-    <pathelement location="${lib.dir}/${dnsjava.jar}"/>
+  	<pathelement location="${lib.dir}/${commons-pool2.jar}"/>
+  	<pathelement location="${lib.dir}/${dnsjava.jar}"/>
     <pathelement location="${lib.dir}/${excalibur-datasource.jar}"/>
     <pathelement location="${lib.dir}/${excalibur-instrument.jar}"/>
     <pathelement location="${lib.dir}/${excalibur-logger.jar}"/>
@@ -1161,7 +1161,7 @@ run JMeter unless all the JMeter jars ar
   </target>
 
   <target name="install" depends="package" description="Install JMeter. (Compiles code
and creates jars)">
-    <fixcrlf encoding="${encoding}" srcdir="." eol="lf" includes="bin/*.sh bin/jmeter
bin/jmeter-server bin/jmeter-report bin/mirror-server"/>
+    <fixcrlf encoding="${encoding}" srcdir="." eol="lf" includes="bin/*.sh bin/jmeter
bin/jmeter-server bin/mirror-server"/>
   </target>
 
   <target name="install-examples" depends="compile-examples" description="Build and installs
the example components.">
@@ -1268,7 +1268,7 @@ run JMeter unless all the JMeter jars ar
       These need special handling to create the correct file mode
   -->
   <property name="dist.executables"
-    value="${dest.jar.jmeter}/jmeter ${dest.jar.jmeter}/jmeter-server ${dest.jar.jmeter}/jmeter-report
${dest.jar.jmeter}/mirror-server ${dest.jar.jmeter}/*.sh ${extras.dir}/*.sh"/>
+    value="${dest.jar.jmeter}/jmeter ${dest.jar.jmeter}/jmeter-server ${dest.jar.jmeter}/mirror-server
${dest.jar.jmeter}/*.sh ${extras.dir}/*.sh"/>
 
   <!-- List of files in source distribution that are eol=native -->
   <!--
@@ -2209,7 +2209,7 @@ run JMeter unless all the JMeter jars ar
     <!-- No need for Javadoc patch (CVE-2013-1571) now we are using Java 7 minimum -->
   </target>
 
-<!--
+      <!--
     Run Doccheck: See http://java.sun.com/j2se/javadoc/doccheck/docs/DocCheck.html
     and http://java.sun.com/j2se/javadoc/doccheck/
     Download the doclet, and put the jar in lib/opt.
@@ -2550,7 +2550,7 @@ run JMeter unless all the JMeter jars ar
           <param name="batchtest.variable" value="sample_variables"/>
           <param name="batchtest.value" value="REFERENCE,JSESSIONID"/>
       </antcall>
-
+  	
       <antcall target="batchtest">
           <param name="batchtest.name" value="Bug56811"/>
       </antcall>
@@ -2820,7 +2820,7 @@ run JMeter unless all the JMeter jars ar
         <process_jarfile jarname="commons-logging"/>
         <process_jarfile jarname="commons-math3"/>
         <process_jarfile jarname="commons-net"/>
-        <process_jarfile jarname="commons-pool2"/>
+    	<process_jarfile jarname="commons-pool2"/>
         <process_jarfile jarname="dnsjava"/>
         <process_jarfile jarname="excalibur-datasource"/>
         <process_jarfile jarname="excalibur-instrument"/>
@@ -2965,7 +2965,7 @@ run JMeter unless all the JMeter jars ar
         </checkstyle>
 
     </target>
-
+  
     <target name="sign_dist"
       description="Sign release artifacts in dist and dist/maven.  Usage: ant sign_dist -Dgpg.keyname=key-id
[-Dgpg.secretKeyring=path-to-keyring]      ">
       <scriptdef name="gpg" language="beanshell">



Mime
View raw message