From commits-return-5977-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Oct 1 12:12:04 2016 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B7ABE19E65 for ; Sat, 1 Oct 2016 12:12:04 +0000 (UTC) Received: (qmail 60763 invoked by uid 500); 1 Oct 2016 12:12:04 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 60727 invoked by uid 500); 1 Oct 2016 12:12:04 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 60718 invoked by uid 99); 1 Oct 2016 12:12:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Oct 2016 12:12:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 4121A1A08EA for ; Sat, 1 Oct 2016 12:12:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id A7CuH3Ce9qvy for ; Sat, 1 Oct 2016 12:12:02 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id E85185F39A for ; Sat, 1 Oct 2016 12:12:01 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id EA9CBE01DC for ; Sat, 1 Oct 2016 12:12:00 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id AD7953A09EA for ; Sat, 1 Oct 2016 12:11:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1763004 - /jmeter/trunk/xdocs/usermanual/properties_reference.xml Date: Sat, 01 Oct 2016 12:11:59 -0000 To: commits@jmeter.apache.org From: fschumacher@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161001121159.AD7953A09EA@svn01-us-west.apache.org> Author: fschumacher Date: Sat Oct 1 12:11:58 2016 New Revision: 1763004 URL: http://svn.apache.org/viewvc?rev=1763004&view=rev Log: Reformat, markup changes and correction of mispelled attributes. 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=1763004&r1=1763003&r2=1763004&view=diff ============================================================================== --- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original) +++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sat Oct 1 12:11:58 2016 @@ -52,20 +52,25 @@ These properties are only taken into acc
-Preferred GUI language. Comment out to use the JVM default locale's language.
, example:language=en -This property is the only one that must be set in jmeter.properties file -To fully configure language ensure you set locale, see Internationalization: Understanding Locale in the Java Platform. -Example for English: --Duser.language=en -Duser.region=EN - + + Preferred GUI language. Comment out to use the JVM default locale's language.
+ Example: language=en + This property is the only one that must be set in jmeter.properties file + To fully configure language ensure you set locale, see Internationalization: Understanding Locale in the Java Platform. + Example for English: + -Duser.language=en -Duser.region=EN + - Additional locale(s) to add to the displayed list.
The current default list is: en, fr, - de, no, es, tr, ja, zh_CN, + Additional locale(s) to add to the displayed list.
+ The current default list is: en, fr, + de, no, es, tr, + ja, zh_CN, zh_TW, pl, pt_BR.
See JMeterMenuBar#makeLanguageMenu()
The entries are a comma-separated list of language names.
- Example: locales.add=zu + Example: locales.add=zu +
@@ -82,31 +87,37 @@ These must now be defined in the s The system.properties file gives more flexibility. By default, SSL session contexts are now created per-thread, rather than being shared.
- The old behaviour can be enabled by setting this property to true. Defaults to: false + The old behaviour can be enabled by setting this property to true. Defaults to: false + Be aware that https default protocol may vary depending on the version of JVM. See Diagnosing TLS, SSL and HTTPS - and 58236. - Default HTTPS protocol level: https.default.protocol=TLS. - This may need to be changed to: https.default.protocol=SSLv3 + and 58236. + Default HTTPS protocol level: https.default.protocol=TLS + This may need to be changed to: https.default.protocol=SSLv3 + List of protocols to enable. You may have to select only a subset if you find issues with target server.
This is needed when server does not support Socket version negotiation, this can lead to errors like: javax.net.ssl.SSLPeerUnverifiedException: peer not authenticated or java.net.SocketException: Connection reset.
- See 54759, example: https.socket.protocols=SSLv2Hello SSLv3 TLSv1 + See 54759, example: https.socket.protocols=SSLv2Hello SSLv3 TLSv1 + Control if we allow reuse of cached SSL context between iterations.
Set the value to false to reset the SSL context each iteration.
- Defaults to: true + Defaults to: true + Start index to be used with keystores with many entries.
The default is to use entry 0, i.e. the first.
- Defaults to: 0 + Defaults to: 0 + End index to be used with keystores with many entries.
- Defaults to: 0 + Defaults to: 0 +
@@ -119,18 +130,22 @@ The system.properties file or "CrossPlatform" which means JMeter will use the corresponding string returned by UIManager.get<name>LookAndFeelClassName().
LAF can be overridden by os.name (lowercased, spaces replaced by '_').
- + Take for example an os.name of Windows 10.
- JMeter would look first for a property jmeter.laf.windows_10=javax.swing.plaf.metal.MetalLookAndFeel.
+ JMeter would look first for a property + jmeter.laf.windows_10=javax.swing.plaf.metal.MetalLookAndFeel Failing that, the OS family os.name would be used shortened to the first space. In our example - JMeter would therefore look for a property jmeter.laf.windows=com.sun.java.swing.plaf.windows.WindowsLookAndFeel. + JMeter would therefore look for a property + jmeter.laf.windows=com.sun.java.swing.plaf.windows.WindowsLookAndFeel - Mac apparently looks better with the System LAF set through jmeter.laf.mac=System. - Failing that, the JMeter default laf can be defined through: jmeter.laf=System + Mac apparently looks better with the System LAF set through + jmeter.laf.mac=System + Failing that, the JMeter default laf can be defined through: + jmeter.laf=System If none of the above jmeter.laf properties are defined, JMeter uses the CrossPlatform LAF. This is because the CrossPlatform LAF generally looks better than the System LAF. - See 52026 for details. + See 52026 for details.