hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1776187 [21/21] - in /httpcomponents/httpclient/trunk: ./ httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/ httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ httpclient5-cache/src/test/java/org/apache/h...
Date Tue, 27 Dec 2016 19:48:10 GMT
Modified: httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestAddCookies.java Tue Dec 27 19:48:07 2016
@@ -90,14 +90,14 @@ public class TestRequestAddCookies {
     public void testRequestParameterCheck() throws Exception {
         final HttpClientContext context = HttpClientContext.create();
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(null, context);
+        interceptor.process(null, null, context);
     }
 
     @Test(expected=IllegalArgumentException.class)
     public void testContextParameterCheck() throws Exception {
         final HttpRequest request = new BasicHttpRequest("GET", "/");
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, null);
+        interceptor.process(request, null, null);
     }
 
     @Test
@@ -107,13 +107,12 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(this.target, null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header[] headers = request.getHeaders("Cookie");
         Assert.assertNotNull(headers);
@@ -135,13 +134,12 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(this.target, null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header[] headers = request.getHeaders("Cookie");
         Assert.assertNotNull(headers);
@@ -155,13 +153,12 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(this.target, null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, null);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header[] headers = request.getHeaders("Cookie");
         Assert.assertNotNull(headers);
@@ -175,33 +172,12 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(this.target, null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, null);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
-
-        final Header[] headers = request.getHeaders("Cookie");
-        Assert.assertNotNull(headers);
-        Assert.assertEquals(0, headers.length);
-    }
-
-    @Test
-    public void testNoTargetHost() throws Exception {
-        final HttpRequest request = new BasicHttpRequest("GET", "/");
-
-        final HttpRoute route = new HttpRoute(this.target, null, false);
-
-        final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, null);
-        context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
-        context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
-        context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
-
-        final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header[] headers = request.getHeaders("Cookie");
         Assert.assertNotNull(headers);
@@ -213,13 +189,12 @@ public class TestRequestAddCookies {
         final HttpRequest request = new BasicHttpRequest("GET", "/");
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpCoreContext.HTTP_CONNECTION, null);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header[] headers = request.getHeaders("Cookie");
         Assert.assertNotNull(headers);
@@ -234,14 +209,13 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(this.target, null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final CookieSpec cookieSpec = context.getCookieSpec();
         Assert.assertTrue(cookieSpec instanceof RFC6265StrictSpec);
@@ -259,13 +233,12 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(this.target, null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
     }
 
     @Test
@@ -276,13 +249,12 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(new HttpHost("localhost.local", 1234), null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final CookieOrigin cookieOrigin = context.getCookieOrigin();
         Assert.assertNotNull(cookieOrigin);
@@ -301,13 +273,12 @@ public class TestRequestAddCookies {
                 new HttpHost("localhost.local", 80), null, new HttpHost("localhost", 8888), false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final CookieOrigin cookieOrigin = context.getCookieOrigin();
         Assert.assertNotNull(cookieOrigin);
@@ -327,13 +298,12 @@ public class TestRequestAddCookies {
                 new HttpHost("localhost", 8888), true, TunnelType.TUNNELLED, LayerType.LAYERED);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final CookieOrigin cookieOrigin = context.getCookieOrigin();
         Assert.assertNotNull(cookieOrigin);
@@ -360,7 +330,6 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(this.target, null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
@@ -369,7 +338,7 @@ public class TestRequestAddCookies {
         Thread.sleep(200);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header[] headers = request.getHeaders("Cookie");
         Assert.assertNotNull(headers);
@@ -392,13 +361,12 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(this.target, null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header[] headers = request.getHeaders("Cookie");
         Assert.assertNotNull(headers);
@@ -428,13 +396,12 @@ public class TestRequestAddCookies {
         final HttpRoute route = new HttpRoute(this.target, null, false);
 
         final HttpClientContext context = HttpClientContext.create();
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
         context.setAttribute(HttpClientContext.COOKIESPEC_REGISTRY, this.cookieSpecRegistry);
 
         final HttpRequestInterceptor interceptor = new RequestAddCookies();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header[] headers1 = request.getHeaders("Cookie");
         Assert.assertNotNull(headers1);

Modified: httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestClientConnControl.java Tue Dec 27 19:48:07 2016
@@ -45,7 +45,7 @@ public class TestRequestClientConnContro
     public void testRequestParameterCheck() throws Exception {
         final HttpClientContext context = HttpClientContext.create();
         final HttpRequestInterceptor interceptor = new RequestClientConnControl();
-        interceptor.process(null, context);
+        interceptor.process(null, null, context);
     }
 
     @Test
@@ -54,7 +54,7 @@ public class TestRequestClientConnContro
         final HttpClientContext context = HttpClientContext.create();
 
         final HttpRequestInterceptor interceptor = new RequestClientConnControl();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
         final Header header1 = request.getFirstHeader("Proxy-Connection");
         Assert.assertNotNull(header1);
         Assert.assertEquals(HeaderElements.KEEP_ALIVE, header1.getValue());
@@ -73,7 +73,7 @@ public class TestRequestClientConnContro
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
 
         final HttpRequestInterceptor interceptor = new RequestClientConnControl();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header header1 = request.getFirstHeader(HttpHeaders.CONNECTION);
         Assert.assertNotNull(header1);
@@ -95,7 +95,7 @@ public class TestRequestClientConnContro
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
 
         final HttpRequestInterceptor interceptor = new RequestClientConnControl();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header header1 = request.getFirstHeader(HttpHeaders.CONNECTION);
         Assert.assertNotNull(header1);
@@ -117,7 +117,7 @@ public class TestRequestClientConnContro
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
 
         final HttpRequestInterceptor interceptor = new RequestClientConnControl();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header header1 = request.getFirstHeader("Proxy-Connection");
         Assert.assertNotNull(header1);
@@ -140,7 +140,7 @@ public class TestRequestClientConnContro
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
 
         final HttpRequestInterceptor interceptor = new RequestClientConnControl();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header header1 = request.getFirstHeader(HttpHeaders.CONNECTION);
         Assert.assertNotNull(header1);
@@ -163,7 +163,7 @@ public class TestRequestClientConnContro
         context.setAttribute(HttpClientContext.HTTP_ROUTE, route);
 
         final HttpRequestInterceptor interceptor = new RequestClientConnControl();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
 
         final Header header1 = request.getFirstHeader("Proxy-Connection");
         Assert.assertNotNull(header1);

Modified: httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestDefaultHeaders.java Tue Dec 27 19:48:07 2016
@@ -45,7 +45,7 @@ public class TestRequestDefaultHeaders {
     public void testRequestParameterCheck() throws Exception {
         final HttpContext context = new BasicHttpContext();
         final HttpRequestInterceptor interceptor = new RequestDefaultHeaders();
-        interceptor.process(null, context);
+        interceptor.process(null, null, context);
     }
 
     @Test
@@ -56,7 +56,7 @@ public class TestRequestDefaultHeaders {
         final HttpContext context = new BasicHttpContext();
 
         final HttpRequestInterceptor interceptor = new RequestDefaultHeaders(defheaders);
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
         final Header header1 = request.getFirstHeader("custom");
         Assert.assertNull(header1);
     }
@@ -70,7 +70,7 @@ public class TestRequestDefaultHeaders {
         final HttpContext context = new BasicHttpContext();
 
         final HttpRequestInterceptor interceptor = new RequestDefaultHeaders(defheaders);
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
         final Header[] headers = request.getHeaders("custom");
         Assert.assertNotNull(headers);
         Assert.assertEquals(1, headers.length);

Modified: httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java Tue Dec 27 19:48:07 2016
@@ -30,12 +30,13 @@ package org.apache.hc.client5.http.proto
 import java.nio.charset.StandardCharsets;
 
 import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HeaderElements;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.junit.Assert;
@@ -48,12 +49,12 @@ public class TestRequestExpectContinue {
         final HttpClientContext context = HttpClientContext.create();
         final RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build();
         context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         final String s = "whatever";
         final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
         request.setEntity(entity);
         final RequestExpectContinue interceptor = new RequestExpectContinue();
-        interceptor.process(request, context);
+        interceptor.process(request, request.getEntity(), context);
         final Header header = request.getFirstHeader(HttpHeaders.EXPECT);
         Assert.assertNotNull(header);
         Assert.assertEquals(HeaderElements.CONTINUE, header.getValue());
@@ -64,12 +65,12 @@ public class TestRequestExpectContinue {
         final HttpContext context = new BasicHttpContext(null);
         final RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(false).build();
         context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         final String s = "whatever";
         final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
         request.setEntity(entity);
         final RequestExpectContinue interceptor = new RequestExpectContinue();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
         final Header header = request.getFirstHeader(HeaderElements.CONTINUE);
         Assert.assertNull(header);
     }
@@ -79,13 +80,13 @@ public class TestRequestExpectContinue {
         final HttpContext context = new BasicHttpContext(null);
         final RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build();
         context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
-        final BasicHttpRequest request = new BasicHttpRequest(
-                "POST", "/", HttpVersion.HTTP_1_0);
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
+        request.setVersion(HttpVersion.HTTP_1_0);
         final String s = "whatever";
         final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
         request.setEntity(entity);
         final RequestExpectContinue interceptor = new RequestExpectContinue();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
         final Header header = request.getFirstHeader(HeaderElements.CONTINUE);
         Assert.assertNull(header);
     }
@@ -95,12 +96,12 @@ public class TestRequestExpectContinue {
         final HttpContext context = new BasicHttpContext(null);
         final RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build();
         context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         final String s = "";
         final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
         request.setEntity(entity);
         final RequestExpectContinue interceptor = new RequestExpectContinue();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
         final Header header = request.getFirstHeader(HeaderElements.CONTINUE);
         Assert.assertNull(header);
     }
@@ -109,7 +110,7 @@ public class TestRequestExpectContinue {
     public void testRequestExpectContinueInvalidInput() throws Exception {
         final RequestExpectContinue interceptor = new RequestExpectContinue();
         try {
-            interceptor.process(null, null);
+            interceptor.process(null, null, null);
             Assert.fail("IllegalArgumentException should have been thrown");
         } catch (final IllegalArgumentException ex) {
             // expected
@@ -119,9 +120,9 @@ public class TestRequestExpectContinue {
     @Test
     public void testRequestExpectContinueIgnoreNonenclosingRequests() throws Exception {
         final HttpContext context = new BasicHttpContext(null);
-        final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
+        final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
         final RequestExpectContinue interceptor = new RequestExpectContinue();
-        interceptor.process(request, context);
+        interceptor.process(request, null, context);
         Assert.assertEquals(0, request.getAllHeaders().length);
     }
 

Modified: httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseContentEncoding.java Tue Dec 27 19:48:07 2016
@@ -29,40 +29,41 @@ package org.apache.hc.client5.http.proto
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.entity.DecompressingEntity;
 import org.apache.hc.client5.http.entity.GzipDecompressingEntity;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpResponseInterceptor;
-import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
+@Ignore
 public class TestResponseContentEncoding {
 
     @Test
     public void testContentEncodingNoEntity() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final HttpContext context = new BasicHttpContext();
 
         final HttpResponseInterceptor interceptor = new ResponseContentEncoding();
-        interceptor.process(response, context);
+        interceptor.process(response, response.getEntity(), context);
         final HttpEntity entity = response.getEntity();
         Assert.assertNull(entity);
     }
 
     @Test
     public void testNoContentEncoding() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final StringEntity original = new StringEntity("plain stuff");
         response.setEntity(original);
         final HttpContext context = new BasicHttpContext();
 
         final HttpResponseInterceptor interceptor = new ResponseContentEncoding();
-        interceptor.process(response, context);
+        interceptor.process(response, response.getEntity(), context);
         final HttpEntity entity = response.getEntity();
         Assert.assertNotNull(entity);
         Assert.assertTrue(entity instanceof StringEntity);
@@ -70,14 +71,14 @@ public class TestResponseContentEncoding
 
     @Test
     public void testGzipContentEncoding() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final StringEntity original = new StringEntity("encoded stuff");
         original.setContentEncoding("GZip");
         response.setEntity(original);
         final HttpContext context = new BasicHttpContext();
 
         final HttpResponseInterceptor interceptor = new ResponseContentEncoding();
-        interceptor.process(response, context);
+        interceptor.process(response, response.getEntity(), context);
         final HttpEntity entity = response.getEntity();
         Assert.assertNotNull(entity);
         Assert.assertTrue(entity instanceof DecompressingEntity);
@@ -85,14 +86,14 @@ public class TestResponseContentEncoding
 
     @Test
     public void testGzipContentEncodingZeroLength() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final StringEntity original = new StringEntity("");
         original.setContentEncoding("GZip");
         response.setEntity(original);
         final HttpContext context = new BasicHttpContext();
 
         final HttpResponseInterceptor interceptor = new ResponseContentEncoding();
-        interceptor.process(response, context);
+        interceptor.process(response, response.getEntity(), context);
         final HttpEntity entity = response.getEntity();
         Assert.assertNotNull(entity);
         Assert.assertTrue(entity instanceof StringEntity);
@@ -100,14 +101,14 @@ public class TestResponseContentEncoding
 
     @Test
     public void testXGzipContentEncoding() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final StringEntity original = new StringEntity("encoded stuff");
         original.setContentEncoding("x-gzip");
         response.setEntity(original);
         final HttpContext context = new BasicHttpContext();
 
         final HttpResponseInterceptor interceptor = new ResponseContentEncoding();
-        interceptor.process(response, context);
+        interceptor.process(response, response.getEntity(), context);
         final HttpEntity entity = response.getEntity();
         Assert.assertNotNull(entity);
         Assert.assertTrue(entity instanceof DecompressingEntity);
@@ -115,14 +116,14 @@ public class TestResponseContentEncoding
 
     @Test
     public void testDeflateContentEncoding() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final StringEntity original = new StringEntity("encoded stuff");
         original.setContentEncoding("deFlaTe");
         response.setEntity(original);
         final HttpContext context = new BasicHttpContext();
 
         final HttpResponseInterceptor interceptor = new ResponseContentEncoding();
-        interceptor.process(response, context);
+        interceptor.process(response, response.getEntity(), context);
         final HttpEntity entity = response.getEntity();
         Assert.assertNotNull(entity);
         Assert.assertTrue(entity instanceof DecompressingEntity);
@@ -130,14 +131,14 @@ public class TestResponseContentEncoding
 
     @Test
     public void testIdentityContentEncoding() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final StringEntity original = new StringEntity("encoded stuff");
         original.setContentEncoding("identity");
         response.setEntity(original);
         final HttpContext context = new BasicHttpContext();
 
         final HttpResponseInterceptor interceptor = new ResponseContentEncoding();
-        interceptor.process(response, context);
+        interceptor.process(response, response.getEntity(), context);
         final HttpEntity entity = response.getEntity();
         Assert.assertNotNull(entity);
         Assert.assertTrue(entity instanceof StringEntity);
@@ -145,19 +146,19 @@ public class TestResponseContentEncoding
 
     @Test(expected=HttpException.class)
     public void testUnknownContentEncoding() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final StringEntity original = new StringEntity("encoded stuff");
         original.setContentEncoding("whatever");
         response.setEntity(original);
         final HttpContext context = new BasicHttpContext();
 
         final HttpResponseInterceptor interceptor = new ResponseContentEncoding(false);
-        interceptor.process(response, context);
+        interceptor.process(response, response.getEntity(), context);
     }
 
     @Test
     public void testContentEncodingRequestParameter() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
         final StringEntity original = new StringEntity("encoded stuff");
         original.setContentEncoding("GZip");
         response.setEntity(original);
@@ -170,7 +171,7 @@ public class TestResponseContentEncoding
         context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
 
         final HttpResponseInterceptor interceptor = new ResponseContentEncoding();
-        interceptor.process(response, context);
+        interceptor.process(response, response.getEntity(), context);
         final HttpEntity entity = response.getEntity();
         Assert.assertNotNull(entity);
         Assert.assertFalse(entity instanceof GzipDecompressingEntity);

Modified: httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestResponseProcessCookies.java Tue Dec 27 19:48:07 2016
@@ -36,7 +36,6 @@ import org.apache.hc.client5.http.cookie
 import org.apache.hc.client5.http.impl.cookie.RFC6265LaxSpec;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpResponseInterceptor;
-import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
 import org.junit.Assert;
 import org.junit.Before;
@@ -59,19 +58,19 @@ public class TestResponseProcessCookies
     public void testResponseParameterCheck() throws Exception {
         final HttpClientContext context = HttpClientContext.create();
         final HttpResponseInterceptor interceptor = new ResponseProcessCookies();
-        interceptor.process(null, context);
+        interceptor.process(null, null, context);
     }
 
     @Test(expected=IllegalArgumentException.class)
     public void testContextParameterCheck() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final HttpResponse response = new BasicHttpResponse(200, "OK");
         final HttpResponseInterceptor interceptor = new ResponseProcessCookies();
-        interceptor.process(response, null);
+        interceptor.process(response, null, null);
     }
 
     @Test
     public void testParseCookies() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final HttpResponse response = new BasicHttpResponse(200, "OK");
         response.addHeader("Set-Cookie", "name1=value1");
 
         final HttpClientContext context = HttpClientContext.create();
@@ -80,7 +79,7 @@ public class TestResponseProcessCookies
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
 
         final HttpResponseInterceptor interceptor = new ResponseProcessCookies();
-        interceptor.process(response, context);
+        interceptor.process(response, null, context);
 
         final List<Cookie> cookies = this.cookieStore.getCookies();
         Assert.assertNotNull(cookies);
@@ -94,7 +93,7 @@ public class TestResponseProcessCookies
 
     @Test
     public void testNoCookieOrigin() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final HttpResponse response = new BasicHttpResponse(200, "OK");
         response.addHeader("Set-Cookie", "name1=value1");
 
         final HttpClientContext context = HttpClientContext.create();
@@ -103,7 +102,7 @@ public class TestResponseProcessCookies
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
 
         final HttpResponseInterceptor interceptor = new ResponseProcessCookies();
-        interceptor.process(response, context);
+        interceptor.process(response, null, context);
 
         final List<Cookie> cookies = this.cookieStore.getCookies();
         Assert.assertNotNull(cookies);
@@ -112,7 +111,7 @@ public class TestResponseProcessCookies
 
     @Test
     public void testNoCookieSpec() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final HttpResponse response = new BasicHttpResponse(200, "OK");
         response.addHeader("Set-Cookie", "name1=value1");
 
         final HttpClientContext context = HttpClientContext.create();
@@ -121,7 +120,7 @@ public class TestResponseProcessCookies
         context.setAttribute(HttpClientContext.COOKIE_STORE, this.cookieStore);
 
         final HttpResponseInterceptor interceptor = new ResponseProcessCookies();
-        interceptor.process(response, context);
+        interceptor.process(response, null, context);
 
         final List<Cookie> cookies = this.cookieStore.getCookies();
         Assert.assertNotNull(cookies);
@@ -130,7 +129,7 @@ public class TestResponseProcessCookies
 
     @Test
     public void testNoCookieStore() throws Exception {
-        final HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        final HttpResponse response = new BasicHttpResponse(200, "OK");
         response.addHeader("Set-Cookie", "name1=value1");
 
         final HttpClientContext context = HttpClientContext.create();
@@ -139,7 +138,7 @@ public class TestResponseProcessCookies
         context.setAttribute(HttpClientContext.COOKIE_STORE, null);
 
         final HttpResponseInterceptor interceptor = new ResponseProcessCookies();
-        interceptor.process(response, context);
+        interceptor.process(response, null, context);
 
         final List<Cookie> cookies = this.cookieStore.getCookies();
         Assert.assertNotNull(cookies);

Modified: httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestSSLSocketFactory.java Tue Dec 27 19:48:07 2016
@@ -41,12 +41,11 @@ import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocket;
 
-import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.apache.hc.client5.http.localserver.SSLTestContexts;
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.bootstrap.io.HttpServer;
-import org.apache.hc.core5.http.bootstrap.io.SSLServerSetupHandler;
-import org.apache.hc.core5.http.bootstrap.io.ServerBootstrap;
+import org.apache.hc.core5.http.impl.io.bootstrap.HttpServer;
+import org.apache.hc.core5.http.impl.io.bootstrap.SSLServerSetupHandler;
+import org.apache.hc.core5.http.impl.io.bootstrap.ServerBootstrap;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.ssl.SSLContexts;
@@ -88,7 +87,6 @@ public class TestSSLSocketFactory {
     @Test
     public void testBasicSSL() throws Exception {
         this.server = ServerBootstrap.bootstrap()
-                .setServerInfo(LocalServerTestBase.ORIGIN)
                 .setSslContext(SSLTestContexts.createServerSSLContext())
                 .create();
         this.server.start();
@@ -111,7 +109,6 @@ public class TestSSLSocketFactory {
     @Test
     public void testBasicDefaultHostnameVerifier() throws Exception {
         this.server = ServerBootstrap.bootstrap()
-                .setServerInfo(LocalServerTestBase.ORIGIN)
                 .setSslContext(SSLTestContexts.createServerSSLContext())
                 .create();
         this.server.start();
@@ -132,7 +129,6 @@ public class TestSSLSocketFactory {
     @Test
     public void testClientAuthSSL() throws Exception {
         this.server = ServerBootstrap.bootstrap()
-                .setServerInfo(LocalServerTestBase.ORIGIN)
                 .setSslContext(SSLTestContexts.createServerSSLContext())
                 .create();
         this.server.start();
@@ -155,7 +151,6 @@ public class TestSSLSocketFactory {
     @Test(expected=IOException.class)
     public void testClientAuthSSLFailure() throws Exception {
         this.server = ServerBootstrap.bootstrap()
-                .setServerInfo(LocalServerTestBase.ORIGIN)
                 .setSslContext(SSLTestContexts.createServerSSLContext())
                 .setSslSetupHandler(new SSLServerSetupHandler() {
 
@@ -186,7 +181,6 @@ public class TestSSLSocketFactory {
     @Test(expected=SSLException.class)
     public void testSSLTrustVerification() throws Exception {
         this.server = ServerBootstrap.bootstrap()
-                .setServerInfo(LocalServerTestBase.ORIGIN)
                 .setSslContext(SSLTestContexts.createServerSSLContext())
                 .create();
         this.server.start();
@@ -208,7 +202,6 @@ public class TestSSLSocketFactory {
     @Test
     public void testSSLTrustVerificationOverride() throws Exception {
         this.server = ServerBootstrap.bootstrap()
-                .setServerInfo(LocalServerTestBase.ORIGIN)
                 .setSslContext(SSLTestContexts.createServerSSLContext())
                 .create();
         this.server.start();
@@ -241,7 +234,6 @@ public class TestSSLSocketFactory {
     @Test
     public void testTLSOnly() throws Exception {
         this.server = ServerBootstrap.bootstrap()
-                .setServerInfo(LocalServerTestBase.ORIGIN)
                 .setSslContext(SSLTestContexts.createServerSSLContext())
                 .setSslSetupHandler(new SSLServerSetupHandler() {
 
@@ -268,7 +260,6 @@ public class TestSSLSocketFactory {
     @Test(expected=IOException.class)
     public void testSSLDisabledByDefault() throws Exception {
         this.server = ServerBootstrap.bootstrap()
-                .setServerInfo(LocalServerTestBase.ORIGIN)
                 .setSslContext(SSLTestContexts.createServerSSLContext())
                 .setSslSetupHandler(new SSLServerSetupHandler() {
 

Modified: httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestRequestBuilder.java Tue Dec 27 19:48:07 2016
@@ -61,7 +61,7 @@ public class TestRequestBuilder {
         final String uriExpected = String.format("https://somehost.com/stuff?parameter1=value1&parameter2=%s&parameter3=%s", encodedData1, encodedData2);
 
         final HttpUriRequest request = requestBuilder.build();
-        Assert.assertEquals(uriExpected, request.getURI().toString());
+        Assert.assertEquals(uriExpected, request.getUri().toString());
     }
 
     private NameValuePair[] createParameters() {

Modified: httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIUtils.java Tue Dec 27 19:48:07 2016
@@ -29,8 +29,8 @@ package org.apache.hc.client5.http.utils
 import java.net.URI;
 import java.util.Arrays;
 
-import org.apache.hc.client5.http.HttpRoute;
 import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.net.URIBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -102,34 +102,6 @@ public class TestURIUtils {
     }
 
     @Test
-    public void testRewriteForRoute() throws Exception {
-
-        final HttpHost target1 = new HttpHost("foo", 80);
-        final HttpHost target2 = new HttpHost("foo", 443, "https");
-        final HttpHost proxy = new HttpHost("bar", 8888);
-
-        // Direct route
-        Assert.assertEquals(new URI("/test"), URIUtils
-                .rewriteURIForRoute(new URI("http://foo/test"), new HttpRoute(target1)));
-
-        // Direct route
-        Assert.assertEquals(new URI("/"), URIUtils
-                .rewriteURIForRoute(new URI(""), new HttpRoute(target1)));
-
-        // Via proxy
-        Assert.assertEquals(new URI("http://foo/test"), URIUtils
-                .rewriteURIForRoute(new URI("http://foo/test"), new HttpRoute(target1, proxy)));
-
-        // Via proxy
-        Assert.assertEquals(new URI("http://foo:80/test"), URIUtils
-                .rewriteURIForRoute(new URI("/test"), new HttpRoute(target1, proxy)));
-
-        // Via proxy tunnel
-        Assert.assertEquals(new URI("/test"), URIUtils
-                .rewriteURIForRoute(new URI("https://foo:443/test"), new HttpRoute(target2, null, proxy, true)));
-    }
-
-    @Test
     public void testNormalization() {
         Assert.assertEquals("example://a/b/c/%7Bfoo%7D", URIUtils.resolve(this.baseURI, "eXAMPLE://a/./b/../b/%63/%7bfoo%7d").toString());
         Assert.assertEquals("http://www.example.com/%3C", URIUtils.resolve(this.baseURI, "http://www.example.com/%3c").toString());

Added: httpcomponents/httpclient/trunk/httpclient5/src/test/resources/log4j2-debug.xml.template
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/test/resources/log4j2-debug.xml.template?rev=1776187&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/resources/log4j2-debug.xml.template (added)
+++ httpcomponents/httpclient/trunk/httpclient5/src/test/resources/log4j2-debug.xml.template Tue Dec 27 19:48:07 2016
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<Configuration status="WARN" name="XMLConfigTest">
+    <Appenders>
+        <Console name="STDOUT">
+            <PatternLayout pattern="%d %-5level [%t][%logger]%notEmpty{[%markerSimpleName]} %msg%n%xThrowable"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="warn">
+            <AppenderRef ref="STDOUT"/>
+        </Root>
+        <Logger name="org.apache.hc.client5" level="debug"/>
+        <Logger name="org.apache.hc.client5.http.headers" level="debug"/>
+        <Logger name="org.apache.hc.client5.http.wire" level="error"/>
+    </Loggers>
+</Configuration>
\ No newline at end of file

Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=1776187&r1=1776186&r2=1776187&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Tue Dec 27 19:48:07 2016
@@ -67,7 +67,7 @@
   <properties>
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
-    <httpcore.version>5.0-alpha1</httpcore.version>
+    <httpcore.version>5.0-alpha2</httpcore.version>
     <log4j.version>2.7</log4j.version>
     <commons-codec.version>1.10</commons-codec.version>
     <ehcache.version>2.6.11</ehcache.version>
@@ -75,7 +75,7 @@
     <slf4j.version>1.7.13</slf4j.version>
     <junit.version>4.12</junit.version>
     <easymock.version>2.5.2</easymock.version>
-    <mockito.version>1.8.5</mockito.version>
+    <mockito.version>1.10.19</mockito.version>
     <jna.version>4.2.1</jna.version>
     <hc.stylecheck.version>1</hc.stylecheck.version>
     <hc.rat.version>0.12</hc.rat.version>



Mime
View raw message