Revision: 4438
http://vexi.svn.sourceforge.net/vexi/?rev=4438&view=rev
Author: mkpg2
Date: 2012-10-01 08:12:24 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Test multiple requests.
Test get as well as post.
Update proxy vole.
Modified Paths:
--------------
trunk/org.vexi-tools.httptester/httptester.properties
trunk/org.vexi-tools.httptester/meta/module.xml
trunk/org.vexi-tools.httptester/src/main/java/httptester/Configuration.java
trunk/org.vexi-tools.httptester/src/main/java/httptester/HttpTester.java
trunk/org.vexi-tools.httptester/src/main/java/httptester/Main.java
Added Paths:
-----------
trunk/org.vexi-tools.httptester/src/main/java/httptester/RequestParams.java
Removed Paths:
-------------
trunk/org.vexi-tools.httptester/src/main/java/httptester/MessageParams.java
Modified: trunk/org.vexi-tools.httptester/httptester.properties
===================================================================
--- trunk/org.vexi-tools.httptester/httptester.properties 2012-09-25
00:28:05 UTC (rev 4437)
+++ trunk/org.vexi-tools.httptester/httptester.properties 2012-10-01
08:12:24 UTC (rev 4438)
@@ -1,13 +1,22 @@
# The message to be sent to the internet
-message=<?xml version="1.0" encoding="UTF-8"?>\
+request_count=2
+
+request1.post=<?xml version="1.0" encoding="UTF-8"?>\
<methodCall>\
<methodName>emanate5.Init.isInitialized</methodName>\
<params/>\
</methodCall>
-target.host=sandbox.emanate5.com
-target.port=8084
-target.path=/installation/xmlrpc
+request1.target.host=toynbeehall.emanate5.com
+request1.target.port=8080
+request1.target.path=/installation/xmlrpc
+# The message to be sent to the internet
+request2.target.host=toynbeehall.emanate5.com
+request2.target.port=80
+request2.target.path=/launcher/toynbee_stakeholders
+
+
+
# Proxy options
method.proxy_select=detect_builtin
method.proxy_authenticate=ntlm
Modified: trunk/org.vexi-tools.httptester/meta/module.xml
===================================================================
--- trunk/org.vexi-tools.httptester/meta/module.xml 2012-09-25 00:28:05 UTC
(rev 4437)
+++ trunk/org.vexi-tools.httptester/meta/module.xml 2012-10-01 08:12:24 UTC
(rev 4438)
@@ -8,7 +8,7 @@
<dependencies>
<dependency source="maven-public" org="org.apache.httpcomponents"
name="httpclient" tag="4.1.2"/>
- <dependency source="ebuild" org="com.googlecode.proxyvole"
name="proxyvole" tag="20111102"/>
+ <dependency source="ebuild" org="com.googlecode.proxyvole"
name="proxyvole" tag="20120920"/>
<dependency source="local" name="library.util" />
</dependencies>
</ebuild-module>
Modified:
trunk/org.vexi-tools.httptester/src/main/java/httptester/Configuration.java
===================================================================
--- trunk/org.vexi-tools.httptester/src/main/java/httptester/Configuration.java
2012-09-25 00:28:05 UTC (rev 4437)
+++ trunk/org.vexi-tools.httptester/src/main/java/httptester/Configuration.java
2012-10-01 08:12:24 UTC (rev 4438)
@@ -68,13 +68,17 @@
}
}
- MessageParams constructRequest() throws ConfProblem{
+ int getRequestCount() throws ConfProblem{
+ return Integer.parseInt(expectProperty("request_count"));
+ }
+
+ RequestParams constructRequest(int i) throws ConfProblem{
try{
- String MESSAGE = expectProperty("message");
- String TARGET_HOST = expectProperty("target.host");
- int TARGET_PORT = parsePort("target.port");
- String TARGET_PATH = expectProperty("target.path");
- return new MessageParams(TARGET_HOST, TARGET_PORT, TARGET_PATH,
MESSAGE);
+ String MESSAGE = getProperty("request"+i+".post");
+ String TARGET_HOST = expectProperty("request"+i+".target.host");
+ int TARGET_PORT = parsePort("request"+i+".target.port");
+ String TARGET_PATH = expectProperty("request"+i+".target.path");
+ return new RequestParams(TARGET_HOST, TARGET_PORT, TARGET_PATH,
MESSAGE);
}catch(ConfProblem e){
throw new ConfProblem("Could not construct request", e);
}
Modified:
trunk/org.vexi-tools.httptester/src/main/java/httptester/HttpTester.java
===================================================================
--- trunk/org.vexi-tools.httptester/src/main/java/httptester/HttpTester.java
2012-09-25 00:28:05 UTC (rev 4437)
+++ trunk/org.vexi-tools.httptester/src/main/java/httptester/HttpTester.java
2012-10-01 08:12:24 UTC (rev 4438)
@@ -28,17 +28,18 @@
public class HttpTester {
final Configuration conf;
- MessageParams message;
-
public HttpTester(Configuration conf) {
this.conf = conf;
}
public void run() throws ConfProblem{
try{
- message = conf.constructRequest();
- doApacheHttpRequest(conf.getMethodOfProxySelection(),
conf.getMethodOfProxyAuthentication());
+ int count = conf.getRequestCount();
+ for(int i=1; i<=count; i++){
+ RequestParams message = conf.constructRequest(i);
+ doApacheHttpRequest(conf.getMethodOfProxySelection(),
conf.getMethodOfProxyAuthentication(), message);
+ }
}catch(ConfProblem p){
p.print();
return;
@@ -46,7 +47,7 @@
}
private void log(String s){ System.err.println(s); }
- public void doApacheHttpRequest(MethodOfProxySelection proxySelect,
MethodOfProxyAuthentication proxyAuthenticate) throws ConfProblem{
+ public void doApacheHttpRequest(MethodOfProxySelection proxySelect,
MethodOfProxyAuthentication proxyAuthenticate, RequestParams requestParams)
throws ConfProblem{
log("-------------------- Request ------------------------------");
log("proxy selection method: "+proxySelect);
log("proxy authentication method: "+proxyAuthenticate);
@@ -76,7 +77,7 @@
ProxySelector.getDefault());
httpclient.setRoutePlanner(routePlanner);
- List<Proxy> proxies =
ProxySelector.getDefault().select(message.uri);
+ List<Proxy> proxies =
ProxySelector.getDefault().select(requestParams.uri);
log(proxies.size()+" discovered proxies:- ");
for(Proxy p: proxies){
log(" "+p);
@@ -102,27 +103,33 @@
}
+// String message = message.message;
-
HttpParams params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setContentCharset(params, "UTF-8");
HttpProtocolParams.setUserAgent(params, "Vexi");
HttpProtocolParams.setUseExpectContinue(params, true);
+ String post = requestParams.post;
- BasicHttpEntityEnclosingRequest request = new
BasicHttpEntityEnclosingRequest(
- "POST", message.uriString);
-
+ BasicHttpEntityEnclosingRequest request;
+ if(post!=null){
+ request = new BasicHttpEntityEnclosingRequest(
+ "POST", requestParams.uriString);
+
+
+ ByteArrayEntity entity = new ByteArrayEntity(post.getBytes());
+ entity.setContentType("text/xml");
+ request.setEntity(entity);
+ }else{
+ request = new BasicHttpEntityEnclosingRequest(
+ "GET", requestParams.uriString);
+
+ }
- ByteArrayEntity entity = new
ByteArrayEntity(message.message.getBytes());
- entity.setContentType("text/xml");
- request.setEntity(entity);
-
-
-
- HttpHost host = new HttpHost(message.host, message.port);
+ HttpHost host = new HttpHost(requestParams.host, requestParams.port);
request.setParams(params);
try {
log("-------------------- Response
------------------------------");
Modified: trunk/org.vexi-tools.httptester/src/main/java/httptester/Main.java
===================================================================
--- trunk/org.vexi-tools.httptester/src/main/java/httptester/Main.java
2012-09-25 00:28:05 UTC (rev 4437)
+++ trunk/org.vexi-tools.httptester/src/main/java/httptester/Main.java
2012-10-01 08:12:24 UTC (rev 4438)
@@ -1,5 +1,8 @@
package httptester;
+import httptester.Configuration;
+import httptester.HttpTester;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
Deleted:
trunk/org.vexi-tools.httptester/src/main/java/httptester/MessageParams.java
===================================================================
--- trunk/org.vexi-tools.httptester/src/main/java/httptester/MessageParams.java
2012-09-25 00:28:05 UTC (rev 4437)
+++ trunk/org.vexi-tools.httptester/src/main/java/httptester/MessageParams.java
2012-10-01 08:12:24 UTC (rev 4438)
@@ -1,34 +0,0 @@
-package httptester;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-
-public class MessageParams {
- final String host;
- final Integer port;
- final String path;
- final String message;
-
- final String uriString;
- final URI uri;
- public MessageParams(
- String host,
- Integer port,
- String path,
- String message) throws ConfProblem {
- this.host = host;
- this.port = port;
- this.path = path;
- this.message = message;
-
- this.uriString = "http://"+host+":"+port+path;
- try {
- this.uri = new URI(uriString);
- } catch (URISyntaxException e) {
- throw new ConfProblem("Invalid uri: "+uriString);
- }
-
- }
-
-}
Copied:
trunk/org.vexi-tools.httptester/src/main/java/httptester/RequestParams.java
(from rev 4437,
trunk/org.vexi-tools.httptester/src/main/java/httptester/MessageParams.java)
===================================================================
--- trunk/org.vexi-tools.httptester/src/main/java/httptester/RequestParams.java
(rev 0)
+++ trunk/org.vexi-tools.httptester/src/main/java/httptester/RequestParams.java
2012-10-01 08:12:24 UTC (rev 4438)
@@ -0,0 +1,34 @@
+package httptester;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+
+public class RequestParams {
+ final String host;
+ final Integer port;
+ final String path;
+ final String post;
+
+ final String uriString;
+ final URI uri;
+ public RequestParams(
+ String host,
+ Integer port,
+ String path,
+ String message) throws ConfProblem {
+ this.host = host;
+ this.port = port;
+ this.path = path;
+ this.post = message;
+
+ this.uriString = "http://"+host+":"+port+path;
+ try {
+ this.uri = new URI(uriString);
+ } catch (URISyntaxException e) {
+ throw new ConfProblem("Invalid uri: "+uriString);
+ }
+
+ }
+
+}
Property changes on:
trunk/org.vexi-tools.httptester/src/main/java/httptester/RequestParams.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Got visibility?
Most devs has no idea what their production app looks like.
Find out how fast your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219671;13503038;y?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
