You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/03/12 00:40:52 UTC
svn commit: r517049 - in /jakarta/jmeter/branches/rel-2-2:
src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
xdocs/changes.xml
Author: sebb
Date: Sun Mar 11 16:40:52 2007
New Revision: 517049
URL: http://svn.apache.org/viewvc?view=rev&rev=517049
Log:
Bug 40325 - allow specification of proxyuser and proxypassword for WebServiceSampler
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java?view=diff&rev=517049&r1=517048&r2=517049
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java Sun Mar 11 16:40:52 2007
@@ -39,6 +39,7 @@
import org.apache.jorphan.io.TextFile;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jmeter.JMeter;
import org.apache.jmeter.gui.JMeterFileFilter;
import org.apache.jmeter.protocol.http.control.AuthManager;
import org.apache.jmeter.protocol.http.control.Authorization;
@@ -88,6 +89,13 @@
public static final String TIMEOUT = "WebserviceSampler.timeout";
+ private static final String PROXY_USER =
+ JMeterUtils.getPropDefault(JMeter.HTTP_PROXY_USER,""); // $NON-NLS-1$
+
+ private static final String PROXY_PASS =
+ JMeterUtils.getPropDefault(JMeter.HTTP_PROXY_PASS,""); // $NON-NLS-1$
+
+
/*
* Random class for generating random numbers.
*/
@@ -484,6 +492,10 @@
if (phost.length() > 0 && pport > 0) {
spconn.setProxyHost(phost);
spconn.setProxyPort(pport);
+ if (PROXY_USER.length()>0 && PROXY_PASS.length()>0){
+ spconn.setProxyUserName(PROXY_USER);
+ spconn.setProxyPassword(PROXY_PASS);
+ }
}
}
// by default we maintain the session.
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=517049&r1=517048&r2=517049
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sun Mar 11 16:40:52 2007
@@ -176,6 +176,7 @@
<li>RunningSample</li>
</ul>
</li>
+<li>Bug 40325 - allow specification of proxyuser and proxypassword for WebServiceSampler</li>
</ul>
<h3>Version 2.2</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org