Author: mheath
Date: Tue Feb 5 12:51:49 2008
New Revision: 618773
URL: http://svn.apache.org/viewvc?rev=618773&view=rev
Log:
ASYNCWEB-2 - Merged Geronimo asyncweb into AsyncWeb client.
Added:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/
- copied from r618752,
geronimo/sandbox/async-http-client-mina2/src/main/java/org/apache/ahc/
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/AsyncHttpClient.java
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/main/java/org/apache/ahc/AsyncHttpClient.java
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/AsyncHttpClientCallback.java
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/main/java/org/apache/ahc/AsyncHttpClientCallback.java
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/auth/
- copied from r618771,
geronimo/sandbox/async-http-client-mina2/src/main/java/org/apache/ahc/auth/
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/
- copied from r618771,
geronimo/sandbox/async-http-client-mina2/src/main/java/org/apache/ahc/codec/
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/package.html
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/main/java/org/apache/ahc/package.html
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/proxy/
- copied from r618771,
geronimo/sandbox/async-http-client-mina2/src/main/java/org/apache/ahc/proxy/
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/ssl/
- copied from r618771,
geronimo/sandbox/async-http-client-mina2/src/main/java/org/apache/ahc/ssl/
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/util/
- copied from r618771,
geronimo/sandbox/async-http-client-mina2/src/main/java/org/apache/ahc/util/
mina/asyncweb/trunk/client/src/test/catalina/webapps/ROOT/redirect.jsp
mina/asyncweb/trunk/client/src/test/catalina/webapps/auth_basic/
- copied from r618758,
geronimo/sandbox/async-http-client-mina2/src/test/catalina/webapps/auth_basic/
mina/asyncweb/trunk/client/src/test/catalina/webapps/auth_basic/WEB-INF/
- copied from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/catalina/webapps/auth_basic/WEB-INF/
mina/asyncweb/trunk/client/src/test/catalina/webapps/auth_basic/secure.jsp
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/catalina/webapps/auth_basic/secure.jsp
mina/asyncweb/trunk/client/src/test/catalina/webapps/auth_digest/
- copied from r618758,
geronimo/sandbox/async-http-client-mina2/src/test/catalina/webapps/auth_digest/
mina/asyncweb/trunk/client/src/test/catalina/webapps/auth_digest/WEB-INF/
- copied from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/catalina/webapps/auth_digest/WEB-INF/
mina/asyncweb/trunk/client/src/test/catalina/webapps/auth_digest/secure.jsp
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/catalina/webapps/auth_digest/secure.jsp
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/
- copied from r618753,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AbstractTest.java
- copied, changed from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AbstractTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientTest.java
- copied, changed from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AsyncHttpClientTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientWithFutureTest.java
- copied, changed from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AsyncHttpClientWithFutureTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AuthTest.java
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AuthTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ChunkedTest.java
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/ChunkedTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ConnectionReuseTest.java
- copied, changed from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/ConnectionReuseTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/FakeIoSession.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/FakeProtocolDecoderOutput.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeRealm.java
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/FakeRealm.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/MonitoringTest.java
- copied, changed from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/MonitoringTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ProxyTest.java
- copied, changed from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/ProxyTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/RetryTest.java
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/RetryTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/TimeoutTest.java
- copied unchanged from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/TimeoutTest.java
Modified:
mina/asyncweb/trunk/client/pom.xml
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
mina/asyncweb/trunk/client/src/test/catalina/conf/web.xml
Modified: mina/asyncweb/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/pom.xml?rev=618773&r1=618772&r2=618773&view=diff
==============================================================================
--- mina/asyncweb/trunk/client/pom.xml (original)
+++ mina/asyncweb/trunk/client/pom.xml Tue Feb 5 12:51:49 2008
@@ -103,6 +103,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
+ <excludes>
+ <exclude>**/ProxyTest.java</exclude>
+ </excludes>
+
</configuration>
</plugin>
</plugins>
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java?rev=618773&r1=618772&r2=618773&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
(original)
+++
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
Tue Feb 5 12:51:49 2008
@@ -19,10 +19,9 @@
*/
package org.apache.asyncweb.client;
-import org.apache.mina.common.IoConnector;
+import org.apache.asyncweb.common.HttpResponse;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.asyncweb.common.HttpResponse;
public class HttpIoHandler extends IoHandlerAdapter {
private AsyncHttpClientCallback callback;
Modified: mina/asyncweb/trunk/client/src/test/catalina/conf/web.xml
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/catalina/conf/web.xml?rev=618773&r1=618772&r2=618773&view=diff
==============================================================================
--- mina/asyncweb/trunk/client/src/test/catalina/conf/web.xml (original)
+++ mina/asyncweb/trunk/client/src/test/catalina/conf/web.xml Tue Feb 5
12:51:49 2008
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
- version="2.4">
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; version="2.4">
<!-- ======================== Introduction ============================== -->
<!-- This document defines default values for *all* web applications -->
@@ -1161,5 +1158,4 @@
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
-</web-app>
-
+</web-app>
\ No newline at end of file
Added: mina/asyncweb/trunk/client/src/test/catalina/webapps/ROOT/redirect.jsp
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/catalina/webapps/ROOT/redirect.jsp?rev=618773&view=auto
==============================================================================
--- mina/asyncweb/trunk/client/src/test/catalina/webapps/ROOT/redirect.jsp
(added)
+++ mina/asyncweb/trunk/client/src/test/catalina/webapps/ROOT/redirect.jsp Tue
Feb 5 12:51:49 2008
@@ -0,0 +1,3 @@
+<%
+ response.sendRedirect("http://localhost:8282/index.jsp";);
+%>
Copied:
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AbstractTest.java (from
r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AbstractTest.java)
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AbstractTest.java?p2=mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AbstractTest.java&p1=geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AbstractTest.java&r1=618771&r2=618773&rev=618773&view=diff
==============================================================================
---
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AbstractTest.java
(original)
+++ mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AbstractTest.java
Tue Feb 5 12:51:49 2008
@@ -33,7 +33,7 @@
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.startup.Embedded;
-public class AbstractTest extends TestCase {
+public abstract class AbstractTest extends TestCase {
protected static final File BASEDIR = getBaseDir();
protected static final File CATALINAHOME = new File(BASEDIR,
"src/test/catalina");
Copied:
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientTest.java
(from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AsyncHttpClientTest.java)
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientTest.java?p2=mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientTest.java&p1=geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AsyncHttpClientTest.java&r1=618771&r2=618773&rev=618773&view=diff
==============================================================================
---
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AsyncHttpClientTest.java
(original)
+++
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientTest.java
Tue Feb 5 12:51:49 2008
@@ -36,7 +36,7 @@
doGetConnection(callback, "http://localhost:8282/";, false, true);
HttpResponseMessage msg = callback.getMessage();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
}
public void testSSLHtmlConnection() throws Exception {
@@ -44,7 +44,7 @@
doGetConnection(callback, "https://localhost:8383/";, false, true);
HttpResponseMessage msg = callback.getMessage();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
}
public void testRedirect() throws Exception {
@@ -54,7 +54,7 @@
doGetConnection(callback, "http://localhost:8282/redirect.jsp";, false,
true);
HttpResponseMessage msg = callback.getMessage();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
//Test that we are not following redirects
callback = new TestCallback();
Copied:
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientWithFutureTest.java
(from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AsyncHttpClientWithFutureTest.java)
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientWithFutureTest.java?p2=mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientWithFutureTest.java&p1=geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AsyncHttpClientWithFutureTest.java&r1=618771&r2=618773&rev=618773&view=diff
==============================================================================
---
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/AsyncHttpClientWithFutureTest.java
(original)
+++
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/AsyncHttpClientWithFutureTest.java
Tue Feb 5 12:51:49 2008
@@ -33,14 +33,14 @@
Future<HttpResponseMessage> future =
submitGetRequest("http://localhost:8282/";, true, null);
HttpResponseMessage msg = future.get();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
}
public void testSSLHtmlRequest() throws Exception {
Future<HttpResponseMessage> future =
submitGetRequest("https://localhost:8383/";, true, null);
HttpResponseMessage msg = future.get();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
}
public void testMultipleRequests() throws Exception {
@@ -55,7 +55,7 @@
for (int i = 0; i < 2; i++) {
// we don't know which one will complete first
ResponseFuture future = completionQueue.take(); // this blocks
- String content = future.get().getStringContent();
+ String content = future.get().getStringContent().trim();
String url = future.getRequest().getUrl().toString();
if (url.equals("http://localhost:8282/";)) {
assertEquals("Hello World!", content);
@@ -72,7 +72,7 @@
Future<HttpResponseMessage> future =
submitGetRequest("http://localhost:8282/redirect.jsp";, true, null);
HttpResponseMessage msg = future.get();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
//Test that we are not following redirects
future = submitGetRequest("http://localhost:8282/redirect.jsp";, false,
null);
Copied:
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ConnectionReuseTest.java
(from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/ConnectionReuseTest.java)
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ConnectionReuseTest.java?p2=mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ConnectionReuseTest.java&p1=geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/ConnectionReuseTest.java&r1=618771&r2=618773&rev=618773&view=diff
==============================================================================
---
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/ConnectionReuseTest.java
(original)
+++
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ConnectionReuseTest.java
Tue Feb 5 12:51:49 2008
@@ -44,7 +44,7 @@
submitRequest("http://localhost:8282/";, true, new
SessionCloseCounter());
HttpResponseMessage msg = future.get();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
// do another request for the same host
future = submitRequest("http://localhost:8282/params.jsp";, true,
@@ -65,13 +65,13 @@
submitRequest("https://localhost:8383/";, true, new
SessionCloseCounter());
HttpResponseMessage msg = future.get();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
// do another request for the same host
future = submitRequest("https://localhost:8383/";, true, new
SessionCloseCounter());
msg = future.get();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
// check that I got zero close at this point
assertEquals(0, closeCount.get());
@@ -85,7 +85,7 @@
submitRequest("http://localhost:8282/";, false, new
SessionCloseCounter());
HttpResponseMessage msg = future.get();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
// do another request for the same host
future = submitRequest("http://localhost:8282/params.jsp";, false,
Copied:
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/MonitoringTest.java
(from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/MonitoringTest.java)
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/MonitoringTest.java?p2=mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/MonitoringTest.java&p1=geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/MonitoringTest.java&r1=618771&r2=618773&rev=618773&view=diff
==============================================================================
---
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/MonitoringTest.java
(original)
+++ mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/MonitoringTest.java
Tue Feb 5 12:51:49 2008
@@ -36,7 +36,7 @@
doGetConnection(callback, "http://localhost:8282/";, false, true,
counter);
HttpResponseMessage msg = callback.getMessage();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
// the monitor events are dispatched asynchronously, so give a little
time
// for them all to be dispatched.
@@ -61,7 +61,7 @@
doGetConnection(callback, "https://localhost:8383/";, false, true,
counter);
HttpResponseMessage msg = callback.getMessage();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
// the monitor events are dispatched asynchronously, so give a little
time
// for them all to be dispatched.
Thread.sleep(500);
@@ -87,7 +87,7 @@
doGetConnection(callback, "http://localhost:8282/redirect.jsp";, false,
true, counter);
HttpResponseMessage msg = callback.getMessage();
- assertEquals("Hello World!", msg.getStringContent());
+ assertEquals("Hello World!", msg.getStringContent().trim());
// the monitor events are dispatched asynchronously, so give a little
time
// for them all to be dispatched.
Thread.sleep(500);
Copied: mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ProxyTest.java
(from r618771,
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/ProxyTest.java)
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ProxyTest.java?p2=mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ProxyTest.java&p1=geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/ProxyTest.java&r1=618771&r2=618773&rev=618773&view=diff
==============================================================================
---
geronimo/sandbox/async-http-client-mina2/src/test/java/org/apache/ahc/ProxyTest.java
(original)
+++ mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ProxyTest.java Tue
Feb 5 12:51:49 2008
@@ -80,7 +80,7 @@
Future<HttpResponseMessage> future = ahc.sendRequest(request);
HttpResponseMessage response = future.get();
- assertEquals("Hello World!", response.getStringContent());
+ assertEquals("Hello World!", response.getStringContent().trim());
}
public void testHttpExclusionIP() throws Exception {
@@ -97,7 +97,7 @@
Future<HttpResponseMessage> future = ahc.sendRequest(request);
HttpResponseMessage response = future.get();
- assertEquals("Hello World!", response.getStringContent());
+ assertEquals("Hello World!", response.getStringContent().trim());
}
public void testHttpsExclusion() throws Exception {
@@ -112,6 +112,6 @@
Future<HttpResponseMessage> future = ahc.sendRequest(request);
HttpResponseMessage response = future.get();
- assertEquals("Hello World!", response.getStringContent());
+ assertEquals("Hello World!", response.getStringContent().trim());
}
}
