Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Tag for pre-release

git-svn-id: https://svn.apache.org/repos/asf/jmeter/tags/v2_7_RC2@1342362 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit bd69c3acdee8408af82217b1d881b60e77ae9030 1 parent ce8dbf1
@milamberspace milamberspace authored
View
2  build.xml
@@ -482,7 +482,7 @@
JMeter version
This is overridden for formal releases.
-->
- <property name="jmeter.version" value="2.7-SNAPSHOT"/>
+ <property name="jmeter.version" value="2.7"/>
<!-- Remember to change "docversion" below if necessary -->
<condition property="implementation.version"
value="${jmeter.version} r${svn.revision}" else="${jmeter.version}.${DSTAMP}">
View
12 docs/changes.html
@@ -384,13 +384,6 @@
Known bugs
</h2>
<p>
-
-The Include Controller has some problems in non-GUI mode (see Bug 50898).
-In particular, it can cause a NullPointerException if there are two include controllers with the same name.
-The workaround is to use different names for IncludeControllers
-
-</p>
-<p>
The Once Only controller behaves correctly under a Thread Group or Loop Controller,
but otherwise its behaviour is not consistent (or clearly specified).
</p>
@@ -538,6 +531,11 @@
</li>
+<li>
+Bug 50898 - IncludeController : NullPointerException loading script in non-GUI mode if Includers use same element name
+</li>
+
+
</ul>
<h3>
Listeners
View
46 docs/usermanual/component_reference.html
@@ -11177,7 +11177,51 @@
<tr><td>
<p>
The Keystore Config Element lets you configure how Keystore will be loaded and which keys it will use.
-This component is typically used in HTTPs scenarios where you don't want to take into account keystore initialization into account in response time.
+This component is typically used in HTTPS scenarios where you don't want to take into account keystore initialization into account in response time.
+</p>
+
+
+<p>
+To use this element, you need to setup first a Java Key Store with the client certificates you want to test, to do that:
+
+<ol>
+
+
+<li>
+Create your certificates either with Java keytool utility or through your PKI
+</li>
+
+
+<li>
+If created by PKI, import your keys in Java Key Store by converting them to a format acceptable by JKS
+</li>
+
+
+<li>
+Then reference the keystore file through the 2 JVM properties (or add them in system.properties):
+
+<ul>
+
+
+<li>
+-Djavax.net.ssl.keyStore=path_to_keystore
+</li>
+
+
+<li>
+-Djavax.net.ssl.keyStorePassword=password_of_keystore
+</li>
+
+
+</ul>
+
+
+</li>
+
+
+</ol>
+
+
</p>
View
2  docs/usermanual/functions.html
@@ -3706,7 +3706,7 @@
<br>
-${__char(165)} = ¥ (yen)
+${__char(165)} = &#165; (yen)
</p>
</td></tr>
View
4 xdocs/overview.html
@@ -18,7 +18,7 @@
<!-- This file is copied into the Javadoc overview -->
<html>
<body>
-This is the documentation for Apache JMeter version 2.6 API.
-@version 2.6
+This is the documentation for Apache JMeter version 2.7 API.
+@version 2.7
</body>
</html>
Please sign in to comment.
Something went wrong with that request. Please try again.