svn commit: r633433 - in /mina/asyncweb/trunk/client/src: main/java/org/apache/asyncweb/client/AsyncHttpClient.java test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java

[rickmcguire]

Author: rickmcguire
Date: Tue Mar  4 03:38:14 2008
New Revision: 633433

URL: http://svn.apache.org/viewvc?rev=633433&view=rev
Log:
ASYNCWEB-5 asyncweb build is broken

Patch provided by Sangjin Lee


Modified:
    
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
    
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java

Modified: 
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
URL: 
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java?rev=633433&r1=633432&r2=633433&view=diff
==============================================================================
--- 
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
 (original)
+++ 
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
 Tue Mar  4 03:38:14 2008
@@ -34,7 +34,6 @@
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.filter.ssl.SslFilter;
 import org.apache.mina.transport.socket.SocketConnector;
-import org.apache.mina.transport.socket.nio.NioSocketConnector;
 
 public class AsyncHttpClient {
 
@@ -81,7 +80,7 @@
         if (scheme.toLowerCase().equals("https")) {
             SslFilter filter = new SslFilter(createClientSSLContext());
             filter.setUseClientMode(true);
-            session.getFilterChain().addLast("SSL", filter);
+            session.getFilterChain().addBefore("protocolFilter", "SSL", 
filter);
         }
     }
     

Modified: 
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
URL: 
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java?rev=633433&r1=633432&r2=633433&view=diff
==============================================================================
--- 
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
 (original)
+++ 
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
 Tue Mar  4 03:38:14 2008
@@ -24,14 +24,13 @@
 import java.net.URI;
 import java.nio.charset.Charset;
 
-import org.apache.mina.common.IoBuffer;
+import org.apache.asyncweb.common.DefaultHttpRequest;
+import org.apache.asyncweb.common.HttpMethod;
 import org.apache.asyncweb.common.HttpRequest;
 import org.apache.asyncweb.common.HttpResponse;
 import org.apache.asyncweb.common.MutableHttpRequest;
-import org.apache.asyncweb.common.DefaultHttpRequest;
-import org.apache.asyncweb.common.HttpMethod;
-import org.apache.asyncweb.client.AsyncHttpClient;
-import org.apache.asyncweb.client.AsyncHttpClientCallback;
+import org.apache.mina.common.IoBuffer;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
 
 public class AsyncHttpClientTest extends AbstractTest {
 
@@ -128,8 +127,8 @@
             throws Exception {
         URI url_connect = new URI(url);
 
-        AsyncHttpClient ahc = new AsyncHttpClient(url_connect, callback);
-        ahc.connect();
+        AsyncHttpClient ahc = new AsyncHttpClient(new NioSocketConnector());
+        ahc.connect(url_connect, callback);
 
         ahc.sendRequest(request);