You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2012/09/25 00:50:14 UTC
svn commit: r1389646 - in /jmeter/trunk: bin/jmeter.properties
src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java
xdocs/changes.xml
Author: milamber
Date: Mon Sep 24 22:50:13 2012
New Revision: 1389646
URL: http://svn.apache.org/viewvc?rev=1389646&view=rev
Log:
Define HTTPClient 4 for the default HTTP Request (and Proxy element to generate the HTTP requests)
Bugzilla Id: 53931
Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1389646&r1=1389645&r2=1389646&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Mon Sep 24 22:50:13 2012
@@ -478,7 +478,7 @@ upgrade_properties=/bin/upgrade.properti
# Add numeric prefix to Sampler names (default false)
#proxy.number.requests=true
-# Change the default HTTP Sampler
+# Change the default HTTP Sampler (currently HttpClient4)
# Java:
#jmeter.httpsampler=HTTPSampler
#or
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=1389646&r1=1389645&r2=1389646&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 Mon Sep 24 22:50:13 2012
@@ -625,7 +625,7 @@ public class ProxyControlGui extends Log
m.addElement(s);
}
samplerTypeName = new JComboBox(m);
- samplerTypeName.setSelectedIndex(0);
+ samplerTypeName.setSelectedItem(HTTPSamplerFactory.DEFAULT_CLASSNAME);
samplerTypeName.addItemListener(this);
JLabel label2 = new JLabel(JMeterUtils.getResString("proxy_sampler_type")); // $NON-NLS-1$
label2.setLabelFor(samplerTypeName);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java?rev=1389646&r1=1389645&r2=1389646&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java Mon Sep 24 22:50:13 2012
@@ -45,7 +45,7 @@ public final class HTTPSamplerFactory {
//- JMX
public static final String DEFAULT_CLASSNAME =
- JMeterUtils.getPropDefault("jmeter.httpsampler", HTTP_SAMPLER_JAVA); //$NON-NLS-1$
+ JMeterUtils.getPropDefault("jmeter.httpsampler", IMPL_HTTP_CLIENT4); //$NON-NLS-1$
private HTTPSamplerFactory() {
// Not intended to be instantiated
@@ -84,7 +84,7 @@ public final class HTTPSamplerFactory {
}
public static String[] getImplementations(){
- return new String[]{IMPL_JAVA, IMPL_HTTP_CLIENT3_1, IMPL_HTTP_CLIENT4};
+ return new String[]{IMPL_HTTP_CLIENT4,IMPL_HTTP_CLIENT3_1,IMPL_JAVA};
}
public static HTTPAbstractImpl getImplementation(String impl, HTTPSamplerBase base){
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1389646&r1=1389645&r2=1389646&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Sep 24 22:50:13 2012
@@ -162,6 +162,7 @@ The original behaviour can be restored b
<h3>HTTP Samplers</h3>
<ul>
<li><bugzilla>53675</bugzilla> - Add PATCH verb to HTTP sampler</li>
+<li><bugzilla>53931</bugzilla> - Define HTTPClient 4 for the default HTTP Request (and Proxy element to generate the HTTP requests). Before the default, it was the HTTP Java Sampler</li>
</ul>
<h3>Other samplers</h3>