Permalink
Browse files

Tag for pre-release

git-svn-id: https://svn.apache.org/repos/asf/jmeter/tags/v2_6_RC1@1237128 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent c66467e commit 56ce44dcb6567c5600fc976a79b4be8650d52381 @milamberspace milamberspace committed Jan 28, 2012
Showing with 48 additions and 17 deletions.
  1. +4 −1 build.xml
  2. +7 −0 docs/download_jmeter.cgi
  3. +13 −13 docs/download_jmeter.html
  4. +21 −0 docs/usermanual/hints_and_tips.html
  5. +1 −1 xdocs/download_jmeter.xml
  6. +2 −2 xdocs/overview.html
View
@@ -1859,7 +1859,7 @@ run JMeter unless all the JMeter jars are added.
<fileset dir="${dest.docs.api}" includes="**/*.html"/>
</delete>
<echo level="info">Updating overview to ${docversion}</echo>
- <replaceregexp match="version [\d.]+"
+ <replaceregexp match="version [\d.a-zA-Z]+"
encoding="${encoding}"
replace="version ${docversion}"
flags="g" byline="true">
@@ -1934,6 +1934,9 @@ run JMeter unless all the JMeter jars are added.
<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.">
View
@@ -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 $*
+
View
@@ -264,7 +264,7 @@
<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 @@
<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 @@
<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>
@@ -227,6 +227,27 @@
The Help Menu also has an option to display the GUI and test element class names.
You can use these to determine the correct property setting to change the logging level.
+</p>
+<p>
+
+It is sometimes very useful to see Log messages to debug dynamic scripting languages like BeanShell or
+groovy used in JMeter.
+Since 2.6, you can view log messages directly in JMeter GUI, to do so, use menu Options > Log Viewer,
+a log console will appear at the bottom of the interface.
+Note that log messages are cleared each time you disable this option.
+By default this log console is disabled, you can enable it by changing in jmeter.properties:
+
+<ul>
+
+
+<li>
+jmeter.loggerpanel.display=true
+</li>
+
+
+</ul>
+
+
</p>
</blockquote>
</td></tr>
@@ -18,7 +18,7 @@
<!DOCTYPE document
[
-<!ENTITY release '2.5.2'>
+<!ENTITY release '2.6'>
]>
<document>
View
@@ -18,7 +18,7 @@
<!-- This file is copied into the Javadoc overview -->
<html>
<body>
-This is the documentation for Apache JMeter version 2.6-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT API.
-@version 2.6-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT
+This is the documentation for Apache JMeter version 2.6 API.
+@version 2.6
</body>
</html>

0 comments on commit 56ce44d

Please sign in to comment.