jmeter-commits mailing list archives

Author: milamber
Date: Tue Sep 25 21:01:59 2012
New Revision: 1390131

URL: http://svn.apache.org/viewvc?rev=1390131&view=rev
Log:
Define HTTPClient 4 for the default HTTP Request (and Proxy element to generate the HTTP requests)
In Proxy Server, need to changes to retrieve the selected order (no based on JCombo list index)
Bugzilla Id: 53931

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1390131&r1=1390130&r2=1390131&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Tue Sep 25 21:01:59 2012
@@ -203,10 +203,14 @@ public class ProxyControl extends Generi
         setProperty(new BooleanProperty(ADD_ASSERTIONS, b));
     }
 
+    @Deprecated
     public void setSamplerTypeName(int samplerTypeName) {
         setProperty(new IntegerProperty(SAMPLER_TYPE_NAME, samplerTypeName));
     }
 
+    public void setSamplerTypeName(String samplerTypeName) {
+        setProperty(new StringProperty(SAMPLER_TYPE_NAME, samplerTypeName));
+    }
     public void setSamplerRedirectAutomatically(boolean b) {
         samplerRedirectAutomatically.set(b);
         setProperty(new BooleanProperty(SAMPLER_REDIRECT_AUTOMATICALLY, b));

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=1390131&r1=1390130&r2=1390131&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
Tue Sep 25 21:01:59 2012
@@ -240,7 +240,7 @@ public class ProxyControlGui extends Log
             model.setCaptureHttpHeaders(httpHeaders.isSelected());
             model.setGroupingMode(groupingMode.getSelectedIndex());
             model.setAssertions(addAssertions.isSelected());
-            model.setSamplerTypeName(samplerTypeName.getSelectedIndex());
+            model.setSamplerTypeName(HTTPSamplerFactory.getImplementations()[samplerTypeName.getSelectedIndex()]);
             model.setSamplerRedirectAutomatically(samplerRedirectAutomatically.isSelected());
             model.setSamplerFollowRedirects(samplerFollowRedirects.isSelected());
             model.setUseKeepAlive(useKeepAlive.isSelected());