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/24 20:39:20 UTC
svn commit: r1038781 - in
/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler:
HTTPSampler2.java HTTPSamplerBase.java
Author: sebb
Date: Wed Nov 24 19:39:20 2010
New Revision: 1038781
URL: http://svn.apache.org/viewvc?rev=1038781&view=rev
Log:
Promote ipSource to base class
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?rev=1038781&r1=1038780&r2=1038781&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java Wed Nov 24 19:39:20 2010
@@ -122,8 +122,6 @@ public class HTTPSampler2 extends HTTPSa
private static final String PROXY_DOMAIN =
JMeterUtils.getPropDefault("http.proxyDomain",""); // $NON-NLS-1$ $NON-NLS-2$
- public static final String IP_SOURCE = "HTTPSampler.ipSource"; // $NON-NLS-1$
-
static final InetAddress localAddress;
private static final String localHost;
@@ -1172,13 +1170,4 @@ public class HTTPSampler2 extends HTTPSa
}
return client != null;
}
-
-
- public void setIpSource(String value) {
- setProperty(IP_SOURCE, value, "");
- }
-
- public String getIpSource() {
- return getPropertyAsString(IP_SOURCE,"");
- }
}
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1038781&r1=1038780&r2=1038781&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Wed Nov 24 19:39:20 2010
@@ -82,6 +82,7 @@ public abstract class HTTPSamplerBase ex
private static final Logger log = LoggingManager.getLoggerForClass();
+ //+ JMX names - do not change
public static final String ARGUMENTS = "HTTPsampler.Arguments"; // $NON-NLS-1$
public static final String AUTH_MANAGER = "HTTPSampler.auth_manager"; // $NON-NLS-1$
@@ -128,8 +129,13 @@ public abstract class HTTPSamplerBase ex
public static final String URL = "HTTPSampler.URL"; // $NON-NLS-1$
- public static final String CLIENT = "HTTPSampler.client"; // $NON-NLS-1$
-
+ /**
+ * IP source to use - does not apply to Java HTTP implementation currently
+ */
+ public static final String IP_SOURCE = "HTTPSampler.ipSource"; // $NON-NLS-1$
+ //- JMX names
+
+
public static final String DEFAULT_METHOD = GET; // $NON-NLS-1$
// Supported methods:
private static final String [] METHODS = {
@@ -315,17 +321,6 @@ public abstract class HTTPSamplerBase ex
return protocol;
}
-
- // Not used?
- public String getClient() {
- return getPropertyAsString(CLIENT);
- }
-
- // Not used?
- public void setClient(String client){
- setProperty(CLIENT,client);
- }
-
/**
* Sets the Path attribute of the UrlConfig object Also calls parseArguments
* to extract and store any query arguments
@@ -1428,6 +1423,7 @@ public abstract class HTTPSamplerBase ex
// (previously these were implemented in all TestElements)
public void threadStarted(){
}
+
public void threadFinished(){
}
@@ -1541,5 +1537,19 @@ public abstract class HTTPSamplerBase ex
removeProperty(FILE_NAME);
removeProperty(MIMETYPE);
}
+
+ /**
+ * set IP source to use - does not apply to Java HTTP implementation currently
+ */
+ public void setIpSource(String value) {
+ setProperty(IP_SOURCE, value, "");
+ }
+
+ /**
+ * get IP source to use - does not apply to Java HTTP implementation currently
+ */
+ public String getIpSource() {
+ return getPropertyAsString(IP_SOURCE,"");
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org