You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jmeter.apache.org by fs...@apache.org on 2018/01/27 10:23:03 UTC

svn commit: r1822381 - /jmeter/trunk/xdocs/usermanual/properties_reference.xml

Author: fschumacher
Date: Sat Jan 27 10:23:03 2018
New Revision: 1822381

URL: http://svn.apache.org/viewvc?rev=1822381&view=rev
Log:
Add a bit more details to the default values.

Modified:
    jmeter/trunk/xdocs/usermanual/properties_reference.xml

Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1822381&r1=1822380&r2=1822381&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sat Jan 27 10:23:03 2018
@@ -354,7 +354,7 @@ JMETER-SERVER</source>
     Defaults to: <code>true</code>
 </property>
 <property name="server.rmi.ssl.keystore.type">
-    Type of keystore for RMI connection security
+    Type of keystore for RMI connection security. Possible values are dependent on the JVM in use, but commonly supported are <code>JKS</code> and <code>PKCS12</code>.
     Defaults to: <code>JKS</code>
 </property>
 <property name="server.rmi.ssl.keystore.file">
@@ -371,18 +371,18 @@ JMETER-SERVER</source>
 </property>
 <property name="server.rmi.ssl.truststore.type">
     Type of truststore for RMI connection security
-    Defaults to: <code>JKS</code>
+    Defaults to: the value of <code>server.rmi.ssl.keystore.type</code>, which is <code>JKS</code>
 </property>
 <property name="server.rmi.ssl.truststore.file">
     Keystore file that contains certificate
-    Defaults to: <code>rmi_keystore.jks</code>
+    Defaults to: the value of <code>server.rmi.ssl.keystore.file</code>, which is <code>rmi_keystore.jks</code>
 </property>
 <property name="server.rmi.ssl.truststore.password">
     Password of Trust store
-    Defaults to: <code>changeit</code>
+    Defaults to: the value of <code>server.rmi.ssl.keystore.password</code>, which is <code>changeit</code>
 </property>
 <property name="server.rmi.ssl.disable">
-    Set this to true if you don't want to use SSL for RMI
+    Set this to <code>true</code> if you don't want to use SSL for RMI
     Defaults to: <code>false</code>
 </property>
 </properties>