You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2018/01/26 22:54:00 UTC
svn commit: r1822364 - in /jmeter/trunk: bin/jmeter.properties
xdocs/usermanual/properties_reference.xml
Author: pmouawad
Date: Fri Jan 26 22:54:00 2018
New Revision: 1822364
URL: http://svn.apache.org/viewvc?rev=1822364&view=rev
Log:
Bug 62039 Distributed testing: Provide ability to use SSL
Bugzilla Id: 62039
Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/xdocs/usermanual/properties_reference.xml
Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1822364&r1=1822363&r2=1822364&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Fri Jan 26 22:54:00 2018
@@ -292,38 +292,31 @@ remote_hosts=127.0.0.1
# Define the following property to cause JMeter to exit after the first test
#server.exitaftertest=true
-
#
-# Type of keystore : JKS
+# Configuration of Secure RMI connection
#
+# Type of keystore : JKS
#server.rmi.ssl.keystore.type=JKS
#
# Keystore file that contains private key
-#
#server.rmi.ssl.keystore.file=rmi_keystore.jks
#
# Password of Keystore
-#
#server.rmi.ssl.keystore.password=changeit
#
# Key alias
-#
#server.rmi.ssl.keystore.alias=rmi
#
# Type of truststore : JKS
-#
#server.rmi.ssl.truststore.type=JKS
#
# Keystore file that contains certificate
-#
#server.rmi.ssl.truststore.file=rmi_keystore.jks
#
# Password of Trust store
-#
#server.rmi.ssl.truststore.password=changeit
#
# Set this if you don't want to use SSL for RMI
-#
#server.rmi.ssl.disable=false
#---------------------------------------------------------------------------
# Include Controller
Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1822364&r1=1822363&r2=1822364&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Fri Jan 26 22:54:00 2018
@@ -353,6 +353,38 @@ JMETER-SERVER</source>
From JMeter version 2.3.1, define this property to cause JMeter to exit after the first test.<br/>
Defaults to: <code>true</code>
</property>
+<property name="server.rmi.ssl.keystore.type">
+ Type of keystore for RMI connection security
+ Defaults to: <code>JKS</code>
+</property>
+<property name="server.rmi.ssl.keystore.file">
+ Keystore file that contains private key
+ Defaults to: <code>rmi_keystore.jks</code>
+</property>
+<property name="server.rmi.ssl.keystore.password">
+ Password of Keystore
+ Defaults to: <code>changeit</code>
+</property>
+<property name="server.rmi.ssl.keystore.alias">
+ Key alias
+ Defaults to: <code>rmi</code>
+</property>
+<property name="server.rmi.ssl.truststore.type">
+ Type of truststore for RMI connection security
+ Defaults to: <code>JKS</code>
+</property>
+<property name="server.rmi.ssl.truststore.file">
+ Keystore file that contains certificate
+ Defaults to: <code>rmi_keystore.jks</code>
+</property>
+<property name="server.rmi.ssl.truststore.password">
+ Password of Trust store
+ Defaults to: <code>changeit</code>
+</property>
+<property name="server.rmi.ssl.disable">
+ Set this to true if you don't want to use SSL for RMI
+ Defaults to: <code>false</code>
+</property>
</properties>
</section>
<section name="§-num;.8 Include Controller" anchor="include_controller">