jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1342361 - in /jmeter/trunk: docs/changes.html docs/usermanual/component_reference.html docs/usermanual/functions.html xdocs/overview.html
Date Thu, 24 May 2012 18:15:55 GMT
Author: milamber
Date: Thu May 24 18:15:54 2012
New Revision: 1342361

URL: http://svn.apache.org/viewvc?rev=1342361&view=rev
Log:
Prepare next release 2.7: update docs tree and overview

Modified:
    jmeter/trunk/docs/changes.html
    jmeter/trunk/docs/usermanual/component_reference.html
    jmeter/trunk/docs/usermanual/functions.html
    jmeter/trunk/xdocs/overview.html

Modified: jmeter/trunk/docs/changes.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/changes.html?rev=1342361&r1=1342360&r2=1342361&view=diff
==============================================================================
--- jmeter/trunk/docs/changes.html (original)
+++ jmeter/trunk/docs/changes.html Thu May 24 18:15:54 2012
@@ -384,13 +384,6 @@ public void populateSampler(HTTPSamplerB
 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 @@ Bug 52968 - Option Start Next Loop in Th
 </li>
 
 
+<li>
+Bug 50898 - IncludeController : NullPointerException loading script in non-GUI mode if Includers
use same element name
+</li>
+
+
 </ul>
 <h3>
 Listeners

Modified: jmeter/trunk/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/component_reference.html?rev=1342361&r1=1342360&r2=1342361&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jmeter/trunk/docs/usermanual/component_reference.html Thu May 24 18:15:54 2012
@@ -11177,7 +11177,51 @@ jdbc:derby://server[:port]/databaseName[
 <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>
 
 

Modified: jmeter/trunk/docs/usermanual/functions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/functions.html?rev=1342361&r1=1342360&r2=1342361&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/functions.html (original)
+++ jmeter/trunk/docs/usermanual/functions.html Thu May 24 18:15:54 2012
@@ -3706,7 +3706,7 @@ ${__char(13,10)} = ${__char(0xD,0xA)} = 
 <br>
 
 
-${__char(165)} = ¥ (yen)
+${__char(165)} = &#165; (yen)
  
 </p>
 </td></tr>

Modified: jmeter/trunk/xdocs/overview.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/overview.html?rev=1342361&r1=1342360&r2=1342361&view=diff
==============================================================================
--- jmeter/trunk/xdocs/overview.html (original)
+++ jmeter/trunk/xdocs/overview.html Thu May 24 18:15:54 2012
@@ -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>
\ No newline at end of file



Mime
View raw message