Author: sebb
Date: Thu Aug 29 16:02:42 2013
New Revision: 1518684
URL: http://svn.apache.org/r1518684
Log:
Collapse suggested exclusion RE into a single line to reduce clutter on GUI
Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Modified: jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1518684&r1=1518683&r2=1518684&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Thu Aug 29 16:02:42 2013
@@ -496,7 +496,8 @@ upgrade_properties=/bin/upgrade.properti
#proxy.number.requests=true
# List of URL patterns that will be added to URL Patterns to exclude in Proxy
-#proxy.excludes.suggested=.*\\.js;.*\\.css;.*\\.swf;.*\\.gif;.*\\.png;.*\\.jpg;.*\\.jpeg;.*\\.bmp;.*\\.ico;.*\\.woff
+# Separate multiple lines with ;
+#proxy.excludes.suggested=.*\\.(bmp|css|js|gif|ico|jpe?g|png|swf|woff)
# Change the default HTTP Sampler (currently HttpClient4)
# Java:
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1518684&r1=1518683&r2=1518684&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Thu Aug 29 16:02:42 2013
@@ -85,7 +85,7 @@ public class ProxyControlGui extends Log
private static final String USE_DEFAULT_HTTP_IMPL = ""; // $NON-NLS-1$
private static final String SUGGESTED_EXCLUSIONS =
- JMeterUtils.getPropDefault("proxy.excludes.suggested",
".*\\.js;.*\\.css;.*\\.swf;.*\\.gif;.*\\.png;.*\\.jpg;.*\\.jpeg;.*\\.bmp;.*\\.ico;.*\\.woff");
// $NON-NLS-1$
+ JMeterUtils.getPropDefault("proxy.excludes.suggested",
".*\\.(bmp|css|js|gif|ico|jpe?g|png|swf|woff)"); // $NON-NLS-1$
private JTextField portField;
