jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1542623 - /jmeter/trunk/bin/jmeter.properties
Date Sun, 17 Nov 2013 00:59:18 GMT
Author: sebb
Date: Sun Nov 17 00:59:18 2013
New Revision: 1542623

URL: http://svn.apache.org/r1542623
Log:
Proxy recorder has been renamed; tidy up comments

Modified:
    jmeter/trunk/bin/jmeter.properties

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1542623&r1=1542622&r2=1542623&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sun Nov 17 00:59:18 2013
@@ -485,17 +485,20 @@ sampleresult.timestamp.start=true
 upgrade_properties=/bin/upgrade.properties
 
 #---------------------------------------------------------------------------
-# JMeter Proxy recorder configuration
+# JMeter Test Script recorder configuration
+#
+# N.B. The element was originally call the Proxy recorder, which is why the
+# properties have the prefix "proxy".
 #---------------------------------------------------------------------------
 
-# If the proxy detects a gap of at least 1s (default) between HTTP requests,
+# If the recorder detects a gap of at least 1s (default) between HTTP requests,
 # it assumes that the user has clicked a new URL
 #proxy.pause=1000
 
 # Add numeric prefix to Sampler names (default false)
 #proxy.number.requests=true
 
-# List of URL patterns that will be added to URL Patterns to exclude in Proxy
+# List of URL patterns that will be added to URL Patterns to exclude
 # Separate multiple lines with ;
 #proxy.excludes.suggested=.*\\.(bmp|css|js|gif|ico|jpe?g|png|swf|woff)
 
@@ -531,13 +534,7 @@ upgrade_properties=/bin/upgrade.properti
 #proxy.binary.filesuffix=.binary
 
 #---------------------------------------------------------------------------
-# JMeter Proxy configuration
-#---------------------------------------------------------------------------
-# use command-line flags for user-name and password
-#http.proxyDomain=NTLM domain, if required by HTTPClient sampler
-
-#---------------------------------------------------------------------------
-# JMeter Proxy Server configuration
+# Test Script Recorder certificate configuration
 #---------------------------------------------------------------------------
 
 #proxy.cert.directory=<JMeter bin directory>
@@ -554,6 +551,10 @@ upgrade_properties=/bin/upgrade.properti
 # If false, will revert to using a single key with no certificate
 #proxy.cert.dynamic_keys=true
 
+#---------------------------------------------------------------------------
+# Test Script Recorder miscellaneous configuration
+#---------------------------------------------------------------------------
+
 # Whether to attempt disabling of samples that resulted from redirects
 # where the generated samples use auto-redirection
 #proxy.redirect.disabling=true
@@ -562,6 +563,12 @@ upgrade_properties=/bin/upgrade.properti
 #proxy.ssl.protocol=SSLv3
 
 #---------------------------------------------------------------------------
+# JMeter Proxy configuration
+#---------------------------------------------------------------------------
+# use command-line flags for user-name and password
+#http.proxyDomain=NTLM domain, if required by HTTPClient sampler
+
+#---------------------------------------------------------------------------
 # HTTPSampleResponse Parser configuration
 #---------------------------------------------------------------------------
 



Mime
View raw message