You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/11/30 01:16:49 UTC

svn commit: r1040356 - in /jakarta/jmeter/trunk: bin/ src/protocol/http/org/apache/jmeter/protocol/http/config/gui/ src/protocol/http/org/apache/jmeter/protocol/http/control/gui/ src/protocol/http/org/apache/jmeter/protocol/http/proxy/ src/protocol/htt...

Author: sebb
Date: Tue Nov 30 00:16:48 2010
New Revision: 1040356

URL: http://svn.apache.org/viewvc?rev=1040356&view=rev
Log:
Allow HTTP implementation to be selected at run-time

Removed:
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
Modified:
    jakarta/jmeter/trunk/bin/saveservice.properties
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: jakarta/jmeter/trunk/bin/saveservice.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/saveservice.properties?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/saveservice.properties (original)
+++ jakarta/jmeter/trunk/bin/saveservice.properties Tue Nov 30 00:16:48 2010
@@ -128,10 +128,13 @@ HTTPFileArgs=org.apache.jmeter.protocol.
 HttpDefaultsGui=org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui
 HttpMirrorControl=org.apache.jmeter.protocol.http.control.HttpMirrorControl
 HttpMirrorControlGui=org.apache.jmeter.protocol.http.control.gui.HttpMirrorControlGui
-HTTPSampler=org.apache.jmeter.protocol.http.sampler.HTTPSampler
-HTTPSampler2=org.apache.jmeter.protocol.http.sampler.HTTPSampler2
-HttpTestSampleGui=org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui
-HttpTestSampleGui2=org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui2
+# Merge previous 2 HTTP samplers into one
+HTTPSampler_=org.apache.jmeter.protocol.http.sampler.HTTPSampler
+HTTPSampler2_=org.apache.jmeter.protocol.http.sampler.HTTPSampler2
+HTTPSamplerProxy,HTTPSampler,HTTPSampler2=org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy
+# Merge GUIs
+HttpTestSampleGui,HttpTestSampleGui2=org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui
+#HttpTestSampleGui2=org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui2
 IfController=org.apache.jmeter.control.IfController
 IfControllerPanel=org.apache.jmeter.control.gui.IfControllerPanel
 IncludeController=org.apache.jmeter.control.IncludeController

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java Tue Nov 30 00:16:48 2010
@@ -45,8 +45,13 @@ public class MultipartUrlConfigGui exten
     }
 
     // not currently used
-    public MultipartUrlConfigGui(boolean value) {
-        super(value);
+    public MultipartUrlConfigGui(boolean showSamplerFields) {
+        super(showSamplerFields);
+        init();
+    }
+
+    public MultipartUrlConfigGui(boolean showSamplerFields, boolean showImplementation) {
+        super(showSamplerFields, showImplementation);
         init();
     }
 

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java Tue Nov 30 00:16:48 2010
@@ -38,6 +38,7 @@ import org.apache.jmeter.gui.util.Horizo
 import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.TestElement;
@@ -89,17 +90,25 @@ public class UrlConfigGui extends JPanel
     private JCheckBox useMultipartForPost;
 
     private JLabeledChoice method;
+    
+    private JLabeledChoice httpImplementation;
 
     private final boolean notConfigOnly;
-    // set this true to suppress some items for use in HTTP Request defaults
+    // set this false to suppress some items for use in HTTP Request defaults
+    
+    private final boolean showImplementation; // Set false for AJP
 
     public UrlConfigGui() {
-        notConfigOnly=true;
-        init();
+        this(true);
     }
 
     public UrlConfigGui(boolean value) {
-        notConfigOnly=value;
+        this(value, true);
+    }
+
+    public UrlConfigGui(boolean showSamplerFields, boolean showImplementation) {
+        notConfigOnly=showSamplerFields;
+        this.showImplementation = showImplementation;
         init();
     }
 
@@ -112,6 +121,9 @@ public class UrlConfigGui extends JPanel
             useKeepAlive.setSelected(true);
             useMultipartForPost.setSelected(false);
         }
+        if (showImplementation) {
+            httpImplementation.setText(""); // $NON-NLS-1$
+        }
         path.setText(""); // $NON-NLS-1$
         port.setText(""); // $NON-NLS-1$
         proxyHost.setText(""); // $NON-NLS-1$
@@ -163,6 +175,9 @@ public class UrlConfigGui extends JPanel
             element.setProperty(new BooleanProperty(HTTPSamplerBase.USE_KEEPALIVE, useKeepAlive.isSelected()));
             element.setProperty(new BooleanProperty(HTTPSamplerBase.DO_MULTIPART_POST, useMultipartForPost.isSelected()));
         }
+        if (showImplementation) {
+            element.setProperty(HTTPSamplerBase.IMPLEMENTATION, httpImplementation.getText(),"");
+        }
     }
 
     /**
@@ -200,6 +215,9 @@ public class UrlConfigGui extends JPanel
             useKeepAlive.setSelected(((AbstractTestElement) el).getPropertyAsBoolean(HTTPSamplerBase.USE_KEEPALIVE));
             useMultipartForPost.setSelected(((AbstractTestElement) el).getPropertyAsBoolean(HTTPSamplerBase.DO_MULTIPART_POST));
         }
+        if (showImplementation) {
+            httpImplementation.setText(el.getPropertyAsString(HTTPSamplerBase.IMPLEMENTATION));
+        }
     }
 
     private void init() {// called from ctor, so must not be overridable
@@ -430,8 +448,16 @@ public class UrlConfigGui extends JPanel
     }
 
     protected JPanel getProtocolAndMethodPanel() {
+
+        // Implementation
+        
+        if (showImplementation) {
+            httpImplementation = new JLabeledChoice(JMeterUtils.getResString("http_implementation"), // $NON-NLS-1$
+                    HTTPSamplerFactory.getImplementations());
+            httpImplementation.addValue("");
+        }
         // PROTOCOL
-        protocol = new JTextField(10);
+        protocol = new JTextField(4);
         // CONTENT_ENCODING
         contentEncoding = new JTextField(10);
 
@@ -446,6 +472,9 @@ public class UrlConfigGui extends JPanel
 
         JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
 
+        if (showImplementation) {
+            panel.add(httpImplementation);
+        }
         panel.add(protocolLabel);
         panel.add(protocol);
         panel.add(Box.createHorizontalStrut(5));

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/AjpSamplerGui.java Tue Nov 30 00:16:48 2010
@@ -27,7 +27,7 @@ public class AjpSamplerGui extends HttpT
     private static final long serialVersionUID = 240L;
 
     public AjpSamplerGui() {
-        super();
+        super(true);
     }
 
     @Override

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java Tue Nov 30 00:16:48 2010
@@ -28,8 +28,8 @@ import javax.swing.JPanel;
 import org.apache.jmeter.gui.util.HorizontalPanel;
 import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.protocol.http.config.gui.MultipartUrlConfigGui;
-import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
 import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
@@ -54,7 +54,18 @@ public class HttpTestSampleGui extends A
 
     private JLabeledTextField embeddedRE; // regular expression used to match against embedded resource URLs
 
+    private JLabeledTextField sourceIpAddr; // does not apply to Java implementation
+
+    private final boolean isAJP;
+    
     public HttpTestSampleGui() {
+        isAJP = false;
+        init();
+    }
+
+    // For use by AJP
+    protected HttpTestSampleGui(boolean ajp) {
+        isAJP = ajp;
         init();
     }
 
@@ -70,13 +81,16 @@ public class HttpTestSampleGui extends A
         isMon.setSelected(samplerBase.isMonitor());
         useMD5.setSelected(samplerBase.useMD5());
         embeddedRE.setText(samplerBase.getEmbeddedUrlRE());
+        if (!isAJP) {
+            sourceIpAddr.setText(samplerBase.getIpSource());
+        }
     }
 
     /**
      * {@inheritDoc}
      */
     public TestElement createTestElement() {
-        HTTPSamplerBase sampler = HTTPSamplerFactory.newInstance();// create default sampler
+        HTTPSamplerBase sampler = new HTTPSamplerProxy();
         modifyTestElement(sampler);
         return sampler;
     }
@@ -100,6 +114,9 @@ public class HttpTestSampleGui extends A
         samplerBase.setMonitor(isMon.isSelected());
         samplerBase.setMD5(useMD5.isSelected());
         samplerBase.setEmbeddedUrlRE(embeddedRE.getText());
+        if (!isAJP) {
+            samplerBase.setIpSource(sourceIpAddr.getText());
+        }
         this.configureTestElement(sampler);
     }
 
@@ -117,7 +134,7 @@ public class HttpTestSampleGui extends A
         add(makeTitlePanel(), BorderLayout.NORTH);
 
         // URL CONFIG
-        urlConfigGui = new MultipartUrlConfigGui();
+        urlConfigGui = new MultipartUrlConfigGui(true, !isAJP);
         add(urlConfigGui, BorderLayout.CENTER);
 
         // OPTIONAL TASKS
@@ -146,6 +163,13 @@ public class HttpTestSampleGui extends A
         // Embedded URL match regex
         embeddedRE = new JLabeledTextField(JMeterUtils.getResString("web_testing_embedded_url_pattern"),30); // $NON-NLS-1$
         optionalTasksPanel.add(embeddedRE, BorderLayout.CENTER);
+
+        if (!isAJP) {
+            // Add a new field source ip address (for HC implementations only)
+            sourceIpAddr = new JLabeledTextField(JMeterUtils.getResString("web_testing2_source_ip")); // $NON-NLS-1$
+            optionalTasksPanel.add(sourceIpAddr, BorderLayout.EAST);
+        }
+
         return optionalTasksPanel;
     }
 
@@ -168,5 +192,8 @@ public class HttpTestSampleGui extends A
         useMD5.setSelected(false);
         urlConfigGui.clear();
         embeddedRE.setText(""); // $NON-NLS-1$
+        if (!isAJP) {
+            sourceIpAddr.setText(""); // $NON-NLS-1$
+        }
     }
 }

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java Tue Nov 30 00:16:48 2010
@@ -38,9 +38,7 @@ import org.apache.jmeter.protocol.http.c
 import org.apache.jmeter.protocol.http.control.Header;
 import org.apache.jmeter.protocol.http.control.HeaderManager;
 import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui;
-import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui2;
 import org.apache.jmeter.protocol.http.gui.HeaderPanel;
-import org.apache.jmeter.protocol.http.sampler.HTTPSampler2;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
@@ -260,14 +258,8 @@ public class HttpRequestHdr {
             throws MalformedURLException, IOException {
         // Damn! A whole new GUI just to instantiate a test element?
         // Isn't there a beter way?
-        HttpTestSampleGui tempGui = null;
-        // Create the corresponding gui for the sampler class
-        if(sampler instanceof HTTPSampler2) {
-            tempGui = new HttpTestSampleGui2();
-        }
-        else {
-            tempGui = new HttpTestSampleGui();
-        }
+        HttpTestSampleGui tempGui = new HttpTestSampleGui();
+
         sampler.setProperty(TestElement.GUI_CLASS, tempGui.getClass().getName());
 
         // Populate the sampler

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java Tue Nov 30 00:16:48 2010
@@ -61,6 +61,14 @@ public class HTTPSamplerBaseConverter ex
     @Override
     public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
         final HTTPSamplerBase httpSampler = (HTTPSamplerBase) super.unmarshal(reader, context);
+        // Help convert existing JMX files which use HTTPSampler[2] nodes
+        String nodeName = reader.getNodeName();
+        if (nodeName.equals(HTTPSamplerFactory.HTTP_SAMPLER_JAVA)){
+            httpSampler.setImplementation(HTTPSamplerFactory.IMPL_JAVA);
+        }
+        if (nodeName.equals(HTTPSamplerFactory.HTTP_SAMPLER_APACHE)){
+            httpSampler.setImplementation(HTTPSamplerFactory.IMPL_HTTP_CLIENT3_1);
+        }
         httpSampler.mergeFileProperties();
         return httpSampler;
     }

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFactory.java Tue Nov 30 00:16:48 2010
@@ -22,17 +22,27 @@ import org.apache.jmeter.util.JMeterUtil
 
 /**
  * Factory to return the appropriate HTTPSampler for use with classes that need
- * an HTTPSampler
+ * an HTTPSampler; also creates the implementations for use with HTTPSamplerProxy.
  *
  */
 public class HTTPSamplerFactory {
 
+    // N.B. These values are used in jmeter.properties (jmeter.httpsampler) - do not change
+    // They can alse be used as the implementation name
     /** Use the the default Java HTTP implementation */
     public static final String HTTP_SAMPLER_JAVA = "HTTPSampler"; //$NON-NLS-1$
 
     /** Use Apache HTTPClient HTTP implementation */
     public static final String HTTP_SAMPLER_APACHE = "HTTPSampler2"; //$NON-NLS-1$
 
+    //+ JMX implementation attribute values (also displayed in GUI) - do not change
+    public static final String IMPL_HTTP_CLIENT4 = "HttpClient4";  // $NON-NLS-1$
+
+    public static final String IMPL_HTTP_CLIENT3_1 = "HttpClient3.1"; // $NON-NLS-1$
+    
+    public static final String IMPL_JAVA = "Java"; // $NON-NLS-1$
+    //- JMX
+
     public static final String DEFAULT_CLASSNAME =
         JMeterUtils.getPropDefault("jmeter.httpsampler", HTTP_SAMPLER_JAVA); //$NON-NLS-1$
 
@@ -52,7 +62,7 @@ public class HTTPSamplerFactory {
     /**
      * Create a new instance of the required sampler type
      *
-     * @param alias HTTP_SAMPLER or HTTP_SAMPLER_APACHE
+     * @param alias HTTP_SAMPLER or HTTP_SAMPLER_APACHE or IMPL_HTTP_CLIENT3_1 or IMPL_HTTP_CLIENT4
      * @return the appropriate sampler
      * @throws UnsupportedOperationException if alias is not recognised
      */
@@ -60,12 +70,35 @@ public class HTTPSamplerFactory {
         if (alias.length() == 0) {
             alias = DEFAULT_CLASSNAME;
         }
-        if (alias.equals(HTTP_SAMPLER_JAVA)) {
-            return new HTTPSampler();
+        if (alias.equals(HTTP_SAMPLER_JAVA) || alias.equals(IMPL_JAVA)) {
+            return new HTTPSamplerProxy(IMPL_JAVA);
+        }
+        if (alias.equals(HTTP_SAMPLER_APACHE) || alias.equals(IMPL_HTTP_CLIENT3_1)) {
+            return new HTTPSamplerProxy(IMPL_HTTP_CLIENT3_1);
+        }
+        if (alias.equals(IMPL_HTTP_CLIENT4)) {
+            return new HTTPSamplerProxy(IMPL_HTTP_CLIENT3_1);
+        }
+        throw new IllegalArgumentException("Unknown sampler type: '" + alias+"'");
+    }
+
+    public static String[] getImplementations(){
+        return new String[]{IMPL_JAVA, IMPL_HTTP_CLIENT3_1, IMPL_HTTP_CLIENT4};
+    }
+
+    public static HTTPAbstractImpl getImplementation(String impl, HTTPSamplerBase base){
+        if (impl.trim().length() == 0){
+            impl = DEFAULT_CLASSNAME;
         }
-        if (alias.equals(HTTP_SAMPLER_APACHE)) {
-            return new HTTPSampler2();
+        if (IMPL_JAVA.equals(impl) || HTTP_SAMPLER_JAVA.equals(impl)) {
+            return new HTTPJavaImpl(base);
+        } else if (IMPL_HTTP_CLIENT3_1.equals(impl) || HTTP_SAMPLER_APACHE.equals(impl)) {
+            return new HTTPHC3Impl(base);                
+        } else if (IMPL_HTTP_CLIENT4.equals(impl)) {
+            return new HTTPHC4Impl(base);                
+        } else {
+            throw new IllegalArgumentException("Unknown implementation type: '"+impl+"'");
         }
-        throw new UnsupportedOperationException("Cannot create class: " + alias);
     }
+
 }

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PackageTest.java Tue Nov 30 00:16:48 2010
@@ -27,7 +27,6 @@ import org.apache.jmeter.config.Argument
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui;
 import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui;
-import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui2;
 import org.apache.jmeter.protocol.http.util.HTTPArgument;
 
 public class PackageTest extends TestCase {
@@ -40,11 +39,6 @@ public class PackageTest extends TestCas
         configure(sampler);
     }
 
-    public void testConfiguring2() throws Exception {
-        HTTPSamplerBase sampler = (HTTPSamplerBase) new HttpTestSampleGui2().createTestElement();
-        configure(sampler);
-    }
-
     private void configure(HTTPSamplerBase sampler) throws Exception {
         sampler.addArgument("arg1", "val1");
         ConfigTestElement config = (ConfigTestElement) new HttpDefaultsGui().createTestElement();

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1040356&r1=1040355&r2=1040356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Nov 30 00:16:48 2010
@@ -125,6 +125,7 @@ Also enable reversion to using System.cu
 <h3>HTTP Samplers</h3>
 <ul>
 <li>AJP Sampler now implements Interruptible</li>
+<li>Allow HTTP implementation to be selected at run-time</li>
 </ul>
 
 <h3>Other samplers</h3>



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org