You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2012/01/28 18:29:36 UTC

svn commit: r1237102 - in /jmeter/trunk: build.xml docs/download_jmeter.cgi docs/download_jmeter.html xdocs/download_jmeter.xml

Author: milamber
Date: Sat Jan 28 17:29:36 2012
New Revision: 1237102

URL: http://svn.apache.org/viewvc?rev=1237102&view=rev
Log:
Prepare next version 2.6: adjust version in download_jmeter and add download_jmeter.cgi to docs

Added:
    jmeter/trunk/docs/download_jmeter.cgi   (with props)
Modified:
    jmeter/trunk/build.xml
    jmeter/trunk/docs/download_jmeter.html
    jmeter/trunk/xdocs/download_jmeter.xml

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1237102&r1=1237101&r2=1237102&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sat Jan 28 17:29:36 2012
@@ -1934,6 +1934,9 @@ run JMeter unless all the JMeter jars ar
     <copy todir="${dest.docs}/extending">
       <fileset file="${src.docs}/extending/jmeter_tutorial.pdf"/>
     </copy>
+    <copy todir="${dest.docs}/">
+      <fileset file="${src.docs}/download_jmeter.cgi"/>
+    </copy>
   </target>
 
   <target name="docs-printable" depends="init-docs" if="AnakiaTask.present" description="Generate printable HTML documentation.">

Added: jmeter/trunk/docs/download_jmeter.cgi
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/download_jmeter.cgi?rev=1237102&view=auto
==============================================================================
--- jmeter/trunk/docs/download_jmeter.cgi (added)
+++ jmeter/trunk/docs/download_jmeter.cgi Sat Jan 28 17:29:36 2012
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Wrapper script around mirrors.cgi script
+# (we must change to that directory in order for python to pick up the
+#  python includes correctly)
+cd /www/www.apache.org/dyn/mirrors
+/www/www.apache.org/dyn/mirrors/mirrors.cgi $*
+        
\ No newline at end of file

Propchange: jmeter/trunk/docs/download_jmeter.cgi
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/docs/download_jmeter.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/download_jmeter.html?rev=1237102&r1=1237101&r2=1237102&view=diff
==============================================================================
--- jmeter/trunk/docs/download_jmeter.html (original)
+++ jmeter/trunk/docs/download_jmeter.html Sat Jan 28 17:29:36 2012
@@ -264,7 +264,7 @@ KEYS
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<strong>Apache JMeter 2.5.2 (Requires Java 1.5 or later)</strong></font>
+<strong>Apache JMeter 2.6 (Requires Java 1.5 or later)</strong></font>
 </td></tr>
 <tr><td>
 <blockquote>
@@ -280,34 +280,34 @@ KEYS
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="[preferred]/jmeter/binaries/apache-jmeter-2.5.2.tgz">apache-jmeter-2.5.2.tgz</a>
+<a href="[preferred]/jmeter/binaries/apache-jmeter-2.6.tgz">apache-jmeter-2.6.tgz</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.5.2.tgz.md5">md5</a>
+<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.6.tgz.md5">md5</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.5.2.tgz.asc">pgp</a>
+<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.6.tgz.asc">pgp</a>
 </font>
 </td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="[preferred]/jmeter/binaries/apache-jmeter-2.5.2.zip">apache-jmeter-2.5.2.zip</a>
+<a href="[preferred]/jmeter/binaries/apache-jmeter-2.6.zip">apache-jmeter-2.6.zip</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.5.2.zip.md5">md5</a>
+<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.6.zip.md5">md5</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.5.2.zip.asc">pgp</a>
+<a href="http://www.apache.org/dist/jmeter/binaries/apache-jmeter-2.6.zip.asc">pgp</a>
 </font>
 </td>
 </tr>
@@ -328,34 +328,34 @@ KEYS
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="[preferred]/jmeter/source/apache-jmeter-2.5.2_src.tgz">apache-jmeter-2.5.2_src.tgz</a>
+<a href="[preferred]/jmeter/source/apache-jmeter-2.6_src.tgz">apache-jmeter-2.6_src.tgz</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.5.2_src.tgz.md5">md5</a>
+<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.6_src.tgz.md5">md5</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.5.2_src.tgz.asc">pgp</a>
+<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.6_src.tgz.asc">pgp</a>
 </font>
 </td>
 </tr>
 <tr>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="[preferred]/jmeter/source/apache-jmeter-2.5.2_src.zip">apache-jmeter-2.5.2_src.zip</a>
+<a href="[preferred]/jmeter/source/apache-jmeter-2.6_src.zip">apache-jmeter-2.6_src.zip</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.5.2_src.zip.md5">md5</a>
+<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.6_src.zip.md5">md5</a>
 </font>
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.5.2_src.zip.asc">pgp</a>
+<a href="http://www.apache.org/dist/jmeter/source/apache-jmeter-2.6_src.zip.asc">pgp</a>
 </font>
 </td>
 </tr>

Modified: jmeter/trunk/xdocs/download_jmeter.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/download_jmeter.xml?rev=1237102&r1=1237101&r2=1237102&view=diff
==============================================================================
--- jmeter/trunk/xdocs/download_jmeter.xml (original)
+++ jmeter/trunk/xdocs/download_jmeter.xml Sat Jan 28 17:29:36 2012
@@ -18,7 +18,7 @@
 
 <!DOCTYPE document
 [
-<!ENTITY release '2.5.2'>
+<!ENTITY release '2.6'>
 ]>
     
 <document>