svn commit: r1788319 - in /jmeter/trunk: README.md build.xml xdocs/building.xml xdocs/changes.xml

[fs...@apache.org]

Author: fschumacher
Date: Thu Mar 23 20:44:50 2017
New Revision: 1788319

URL: http://svn.apache.org/viewvc?rev=1788319&view=rev
Log:
Build improvements to better enable builds in environments that are behind a proxy.

Bugzilla Id: 60886

Modified:
    jmeter/trunk/README.md
    jmeter/trunk/build.xml
    jmeter/trunk/xdocs/building.xml
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/README.md
URL: http://svn.apache.org/viewvc/jmeter/trunk/README.md?rev=1788319&r1=1788318&r2=1788319&view=diff
==============================================================================
--- jmeter/trunk/README.md (original)
+++ jmeter/trunk/README.md Thu Mar 23 20:44:50 2017
@@ -113,10 +113,13 @@ but won't be used at run-time.
 _This is useful for testing what happens if the optional jars are not
 downloaded by other JMeter users._
 
-If you are behind a proxy, you will have to set an environment entry for ant to use the proxy:
+If you are behind a proxy, you can set a few build properties in `build-local.properties` for ant to use the proxy:
 
-```sh
-export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 -Dhttp.user=login -Dhttp.pass=xxxxx"
+```
+proxy.host=proxy.example.invalid
+proxy.port=8080
+proxy.user=your_user_name
+proxy.pass=your_password
 ```
 
 ### Test builds

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1788319&r1=1788318&r2=1788319&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Mar 23 20:44:50 2017
@@ -3029,7 +3029,7 @@ run JMeter unless all the JMeter jars ar
   </target>
 
   <!-- Get a zip file and unpack it -->
-  <target name="_get_zipfile" if="_get_zipfile" unless="file.exists">
+  <target name="_get_zipfile" if="_get_zipfile" unless="file.exists" depends="setproxy">
     <get src="${loc}/${zip}"
          dest="${build.dir}/${zip}"
          usetimestamp="true" ignoreerrors="false"/>
@@ -3050,7 +3050,7 @@ run JMeter unless all the JMeter jars ar
   </target>
 
   <!-- Download a jar file and check its hash; if correct, move to correct directory -->
-  <target name="_get_jarfile" if="_get_jarfile" unless="file.exists">
+  <target name="_get_jarfile" if="_get_jarfile" unless="file.exists" depends="setproxy">
     <echo message="Fetching: ${path}/${jar}" level="info"/>
     <get src="${loc}/${jar}"
          dest="${build.dir}/${jar}"
@@ -3575,4 +3575,10 @@ run JMeter unless all the JMeter jars ar
 
   <target name="nightlysonar" depends="_coverage.prepare, nightly, _coverage.report, _sonar" />
 
+  <target name="setproxy" if="${proxy.use}">
+    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+    <echo message="Using ${proxy.host}:${proxy.port} to download file"/>
+  </target>
+
 </project>

Modified: jmeter/trunk/xdocs/building.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/building.xml?rev=1788319&r1=1788318&r2=1788319&view=diff
==============================================================================
--- jmeter/trunk/xdocs/building.xml (original)
+++ jmeter/trunk/xdocs/building.xml Thu Mar 23 20:44:50 2017
@@ -59,9 +59,12 @@ ant download_jars
 This will retrieve any missing jars.
 </p>
 <note>
-If you are behind a proxy, you will have to set an environment entry for ant to use the proxy:
+If you are behind a proxy, you can set a few build properties for ant to use the proxy:
 <source>
-export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 -Dhttp.user=login -Dhttp.pass=xxxxx"
+proxy.host=proxy.example.invalid
+proxy.port=8080
+proxy.user=your_user_name
+proxy.pass=your_password
 </source>
 </note>
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1788319&r1=1788318&r2=1788319&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Mar 23 20:44:50 2017
@@ -313,6 +313,7 @@ listeners hold and a rework of the way G
     <li><bug>60813</bug>JSR223 Test element : Take into account JMeterStopTestNowException, JMeterStopTestException and JMeterStopThreadException</li>
     <li><bug>60814</bug>Menu : Add <code>Open Recent</code> menu item to make recent files loading more obvious</li>
     <li><bug>60815</bug>Drop "Reset GUI" from menu</li>
+    <li><bug>60886</bug>Build improvements to better enable builds in environments that are behind a proxy.</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>