svn commit: r930351 - in /httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http: conn/ssl/TestSSLSocketFactory.java localserver/LocalTestServer.java

[ol...@apache.org]

Author: olegk
Date: Fri Apr  2 18:39:50 2010
New Revision: 930351

URL: http://svn.apache.org/viewvc?rev=930351&view=rev
Log:
Removed calls to deprecated methods

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java?rev=930351&r1=930350&r2=930351&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java Fri Apr  2 18:39:50 2010
@@ -161,7 +161,7 @@ public class TestSSLSocketFactory extend
         SSLContext sslcontext = SSLContext.getInstance("TLSv1");
         sslcontext.init(keymanagers, trustmanagers, null);
         
-        LocalTestServer server = new LocalTestServer(null, null, null, sslcontext);
+        LocalTestServer server = new LocalTestServer(null, null, null, null, sslcontext);
         server.registerDefaultHandlers();
         server.start();
         try {

Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java?rev=930351&r1=930350&r2=930351&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java Fri Apr  2 18:39:50 2010
@@ -42,6 +42,7 @@ import javax.net.ssl.SSLServerSocketFact
 
 import org.apache.http.ConnectionReuseStrategy;
 import org.apache.http.HttpException;
+import org.apache.http.HttpResponseFactory;
 import org.apache.http.HttpServerConnection;
 import org.apache.http.impl.DefaultConnectionReuseStrategy;
 import org.apache.http.impl.DefaultHttpResponseFactory;
@@ -82,6 +83,9 @@ public class LocalTestServer {
     /** The server-side connection re-use strategy. */
     private final ConnectionReuseStrategy reuseStrategy;
 
+    /** The response factory */
+    private final HttpResponseFactory responseFactory;
+    
     /**
      * The HTTP processor.
      * If the interceptors are thread safe and the list is not
@@ -124,11 +128,13 @@ public class LocalTestServer {
     public LocalTestServer(
             BasicHttpProcessor proc, 
             ConnectionReuseStrategy reuseStrat,
+            HttpResponseFactory responseFactory,
             HttpParams params, 
             SSLContext sslcontext) {
         super();
         this.handlerRegistry = new HttpRequestHandlerRegistry();
         this.reuseStrategy = (reuseStrat != null) ? reuseStrat: newConnectionReuseStrategy();
+        this.responseFactory = (responseFactory != null) ? responseFactory: newHttpResponseFactory();
         this.httpProcessor = (proc != null) ? proc : newProcessor();
         this.serverParams = (params != null) ? params : newDefaultParams();
         this.sslcontext = sslcontext;
@@ -148,7 +154,7 @@ public class LocalTestServer {
     public LocalTestServer(
             BasicHttpProcessor proc, 
             HttpParams params) {
-        this(proc, null, params, null);
+        this(proc, null, null, params, null);
     }
 
     /**
@@ -193,6 +199,9 @@ public class LocalTestServer {
         return new DefaultConnectionReuseStrategy();
     }
     
+    protected HttpResponseFactory newHttpResponseFactory() {
+        return new DefaultHttpResponseFactory();
+    }
     
     /**
      * Returns the number of connections this test server has accepted.
@@ -394,9 +403,10 @@ public class LocalTestServer {
             HttpService httpService = new HttpService(
                 httpProcessor, 
                 reuseStrategy, 
-                new DefaultHttpResponseFactory());
-            httpService.setParams(serverParams);
-            httpService.setHandlerResolver(handlerRegistry);
+                responseFactory, 
+                handlerRegistry, 
+                null, 
+                serverParams);
 
             // Start worker thread
             Thread t = new Thread(new Worker(httpService, conn));