You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2015/08/07 09:33:12 UTC

svn commit: r1694618 - in /httpcomponents/httpclient/branches/4.5.x/httpclient/src: examples/org/apache/http/examples/client/ test/resources/

Author: olegk
Date: Fri Aug  7 07:33:11 2015
New Revision: 1694618

URL: http://svn.apache.org/r1694618
Log:
Use httpbin.org in examples

Modified:
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConfiguration.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConnectionRelease.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomPublicSuffixList.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithRequestFuture.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/QuickStart.java
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/test/resources/commons-logging.properties

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAbortMethod.java Fri Aug  7 07:33:11 2015
@@ -40,7 +40,7 @@ public class ClientAbortMethod {
     public final static void main(String[] args) throws Exception {
         CloseableHttpClient httpclient = HttpClients.createDefault();
         try {
-            HttpGet httpget = new HttpGet("http://www.apache.org/");
+            HttpGet httpget = new HttpGet("http://httpbin.org/get");
 
             System.out.println("Executing request " + httpget.getURI());
             CloseableHttpResponse response = httpclient.execute(httpget);

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientAuthentication.java Fri Aug  7 07:33:11 2015
@@ -45,20 +45,20 @@ public class ClientAuthentication {
     public static void main(String[] args) throws Exception {
         CredentialsProvider credsProvider = new BasicCredentialsProvider();
         credsProvider.setCredentials(
-                new AuthScope("localhost", 443),
-                new UsernamePasswordCredentials("username", "password"));
+                new AuthScope("httpbin.org", 80),
+                new UsernamePasswordCredentials("user", "passwd"));
         CloseableHttpClient httpclient = HttpClients.custom()
                 .setDefaultCredentialsProvider(credsProvider)
                 .build();
         try {
-            HttpGet httpget = new HttpGet("http://localhost/");
+            HttpGet httpget = new HttpGet("http://httpbin.org/basic-auth/user/passwd");
 
             System.out.println("Executing request " + httpget.getRequestLine());
             CloseableHttpResponse response = httpclient.execute(httpget);
             try {
                 System.out.println("----------------------------------------");
                 System.out.println(response.getStatusLine());
-                EntityUtils.consume(response.getEntity());
+                System.out.println(EntityUtils.toString(response.getEntity()));
             } finally {
                 response.close();
             }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java Fri Aug  7 07:33:11 2015
@@ -49,7 +49,7 @@ public class ClientChunkEncodedPost {
         }
         CloseableHttpClient httpclient = HttpClients.createDefault();
         try {
-            HttpPost httppost = new HttpPost("http://localhost/");
+            HttpPost httppost = new HttpPost("http://httpbin.org/post");
 
             File file = new File(args[0]);
 
@@ -69,7 +69,7 @@ public class ClientChunkEncodedPost {
             try {
                 System.out.println("----------------------------------------");
                 System.out.println(response.getStatusLine());
-                EntityUtils.consume(response.getEntity());
+                System.out.println(EntityUtils.toString(response.getEntity()));
             } finally {
                 response.close();
             }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConfiguration.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConfiguration.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConfiguration.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConfiguration.java Fri Aug  7 07:33:11 2015
@@ -81,6 +81,7 @@ import org.apache.http.message.BasicLine
 import org.apache.http.message.LineParser;
 import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.CharArrayBuffer;
+import org.apache.http.util.EntityUtils;
 
 /**
  * This example demonstrates how to customize and configure the most common aspects
@@ -221,7 +222,7 @@ public class ClientConfiguration {
             .build();
 
         try {
-            HttpGet httpget = new HttpGet("http://www.apache.org/");
+            HttpGet httpget = new HttpGet("http://httpbin.org/get");
             // Request configuration can be overridden at the request level.
             // They will take precedence over the one set at the client level.
             RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig)
@@ -242,13 +243,9 @@ public class ClientConfiguration {
             System.out.println("executing request " + httpget.getURI());
             CloseableHttpResponse response = httpclient.execute(httpget, context);
             try {
-                HttpEntity entity = response.getEntity();
-
                 System.out.println("----------------------------------------");
                 System.out.println(response.getStatusLine());
-                if (entity != null) {
-                    System.out.println("Response content length: " + entity.getContentLength());
-                }
+                System.out.println(EntityUtils.toString(response.getEntity()));
                 System.out.println("----------------------------------------");
 
                 // Once the request has been executed the local context can

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConnectionRelease.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConnectionRelease.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConnectionRelease.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientConnectionRelease.java Fri Aug  7 07:33:11 2015
@@ -45,7 +45,7 @@ public class ClientConnectionRelease {
     public final static void main(String[] args) throws Exception {
         CloseableHttpClient httpclient = HttpClients.createDefault();
         try {
-            HttpGet httpget = new HttpGet("http://localhost/");
+            HttpGet httpget = new HttpGet("http://httpbin.org/get");
 
             System.out.println("Executing request " + httpget.getRequestLine());
             CloseableHttpResponse response = httpclient.execute(httpget);

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomContext.java Fri Aug  7 07:33:11 2015
@@ -56,7 +56,7 @@ public class ClientCustomContext {
             // Bind custom cookie store to the local context
             localContext.setCookieStore(cookieStore);
 
-            HttpGet httpget = new HttpGet("http://localhost/");
+            HttpGet httpget = new HttpGet("http://httpbin.org/cookies");
             System.out.println("Executing request " + httpget.getRequestLine());
 
             // Pass local context as a parameter

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomPublicSuffixList.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomPublicSuffixList.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomPublicSuffixList.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomPublicSuffixList.java Fri Aug  7 07:33:11 2015
@@ -73,7 +73,7 @@ public class ClientCustomPublicSuffixLis
                 .build();
         try {
 
-            HttpGet httpget = new HttpGet("https://remotehost/");
+            HttpGet httpget = new HttpGet("https://httpbin.org/");
 
             System.out.println("executing request " + httpget.getRequestLine());
 

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientCustomSSL.java Fri Aug  7 07:33:11 2015
@@ -63,9 +63,9 @@ public class ClientCustomSSL {
                 .build();
         try {
 
-            HttpGet httpget = new HttpGet("https://localhost/");
+            HttpGet httpget = new HttpGet("https://httpbin.org/");
 
-            System.out.println("executing request " + httpget.getRequestLine());
+            System.out.println("Executing request " + httpget.getRequestLine());
 
             CloseableHttpResponse response = httpclient.execute(httpget);
             try {

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java Fri Aug  7 07:33:11 2015
@@ -68,7 +68,7 @@ public class ClientEvictExpiredConnectio
                 try {
                     System.out.println("----------------------------------------");
                     System.out.println(response.getStatusLine());
-                    EntityUtils.consume(response.getEntity());
+                    System.out.println(EntityUtils.toString(response.getEntity()));
                 } finally {
                     response.close();
                 }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java Fri Aug  7 07:33:11 2015
@@ -45,7 +45,7 @@ public class ClientExecuteProxy {
     public static void main(String[] args)throws Exception {
         CloseableHttpClient httpclient = HttpClients.createDefault();
         try {
-            HttpHost target = new HttpHost("localhost", 443, "https");
+            HttpHost target = new HttpHost("httpbin.org", 443, "https");
             HttpHost proxy = new HttpHost("127.0.0.1", 8080, "http");
 
             RequestConfig config = RequestConfig.custom()
@@ -60,7 +60,7 @@ public class ClientExecuteProxy {
             try {
                 System.out.println("----------------------------------------");
                 System.out.println(response.getStatusLine());
-                EntityUtils.consume(response.getEntity());
+                System.out.println(EntityUtils.toString(response.getEntity()));
             } finally {
                 response.close();
             }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java Fri Aug  7 07:33:11 2015
@@ -67,7 +67,7 @@ public class ClientExecuteSOCKS {
             HttpClientContext context = HttpClientContext.create();
             context.setAttribute("socks.address", socksaddr);
 
-            HttpHost target = new HttpHost("localhost", 80, "http");
+            HttpHost target = new HttpHost("httpbin.org", 80, "http");
             HttpGet request = new HttpGet("/");
 
             System.out.println("Executing request " + request + " to " + target + " via SOCKS proxy " + socksaddr);

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java Fri Aug  7 07:33:11 2015
@@ -52,11 +52,11 @@ import org.apache.http.util.EntityUtils;
 public class ClientPreemptiveBasicAuthentication {
 
     public static void main(String[] args) throws Exception {
-        HttpHost target = new HttpHost("localhost", 80, "http");
+        HttpHost target = new HttpHost("httpbin.org", 80, "http");
         CredentialsProvider credsProvider = new BasicCredentialsProvider();
         credsProvider.setCredentials(
                 new AuthScope(target.getHostName(), target.getPort()),
-                new UsernamePasswordCredentials("username", "password"));
+                new UsernamePasswordCredentials("user", "passwd"));
         CloseableHttpClient httpclient = HttpClients.custom()
                 .setDefaultCredentialsProvider(credsProvider).build();
         try {
@@ -72,7 +72,7 @@ public class ClientPreemptiveBasicAuthen
             HttpClientContext localContext = HttpClientContext.create();
             localContext.setAuthCache(authCache);
 
-            HttpGet httpget = new HttpGet("/");
+            HttpGet httpget = new HttpGet("http://httpbin.org/hidden-basic-auth/user/passwd");
 
             System.out.println("Executing request " + httpget.getRequestLine() + " to target " + target);
             for (int i = 0; i < 3; i++) {
@@ -80,7 +80,7 @@ public class ClientPreemptiveBasicAuthen
                 try {
                     System.out.println("----------------------------------------");
                     System.out.println(response.getStatusLine());
-                    EntityUtils.consume(response.getEntity());
+                    System.out.println(EntityUtils.toString(response.getEntity()));
                 } finally {
                     response.close();
                 }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java Fri Aug  7 07:33:11 2015
@@ -53,11 +53,11 @@ import org.apache.http.util.EntityUtils;
 public class ClientPreemptiveDigestAuthentication {
 
     public static void main(String[] args) throws Exception {
-        HttpHost target = new HttpHost("localhost", 80, "http");
+        HttpHost target = new HttpHost("httpbin.org", 80, "http");
         CredentialsProvider credsProvider = new BasicCredentialsProvider();
         credsProvider.setCredentials(
                 new AuthScope(target.getHostName(), target.getPort()),
-                new UsernamePasswordCredentials("username", "password"));
+                new UsernamePasswordCredentials("user", "passwd"));
         CloseableHttpClient httpclient = HttpClients.custom()
                 .setDefaultCredentialsProvider(credsProvider)
                 .build();
@@ -78,7 +78,7 @@ public class ClientPreemptiveDigestAuthe
             HttpClientContext localContext = HttpClientContext.create();
             localContext.setAuthCache(authCache);
 
-            HttpGet httpget = new HttpGet("/");
+            HttpGet httpget = new HttpGet("http://httpbin.org/digest-auth/auth/user/passwd");
 
             System.out.println("Executing request " + httpget.getRequestLine() + " to target " + target);
             for (int i = 0; i < 3; i++) {
@@ -86,7 +86,7 @@ public class ClientPreemptiveDigestAuthe
                 try {
                     System.out.println("----------------------------------------");
                     System.out.println(response.getStatusLine());
-                    EntityUtils.consume(response.getEntity());
+                    System.out.println(EntityUtils.toString(response.getEntity()));
                 } finally {
                     response.close();
                 }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientProxyAuthentication.java Fri Aug  7 07:33:11 2015
@@ -47,18 +47,21 @@ public class ClientProxyAuthentication {
     public static void main(String[] args) throws Exception {
         CredentialsProvider credsProvider = new BasicCredentialsProvider();
         credsProvider.setCredentials(
-                new AuthScope("localhost", 8080),
-                new UsernamePasswordCredentials("username", "password"));
+                new AuthScope("localhost", 8888),
+                new UsernamePasswordCredentials("squid", "squid"));
+        credsProvider.setCredentials(
+                new AuthScope("httpbin.org", 80),
+                new UsernamePasswordCredentials("user", "passwd"));
         CloseableHttpClient httpclient = HttpClients.custom()
                 .setDefaultCredentialsProvider(credsProvider).build();
         try {
-            HttpHost target = new HttpHost("www.verisign.com", 443, "https");
-            HttpHost proxy = new HttpHost("localhost", 8080);
+            HttpHost target = new HttpHost("httpbin.org", 80, "http");
+            HttpHost proxy = new HttpHost("localhost", 8888);
 
             RequestConfig config = RequestConfig.custom()
                 .setProxy(proxy)
                 .build();
-            HttpGet httpget = new HttpGet("/");
+            HttpGet httpget = new HttpGet("/basic-auth/user/passwd");
             httpget.setConfig(config);
 
             System.out.println("Executing request " + httpget.getRequestLine() + " to " + target + " via " + proxy);
@@ -67,7 +70,7 @@ public class ClientProxyAuthentication {
             try {
                 System.out.println("----------------------------------------");
                 System.out.println(response.getStatusLine());
-                EntityUtils.consume(response.getEntity());
+                System.out.println(EntityUtils.toString(response.getEntity()));
             } finally {
                 response.close();
             }

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithRequestFuture.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithRequestFuture.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithRequestFuture.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithRequestFuture.java Fri Aug  7 07:33:11 2015
@@ -64,7 +64,7 @@ public class ClientWithRequestFuture {
             };
 
             // Simple request ...
-            HttpGet request1 = new HttpGet("http://google.com");
+            HttpGet request1 = new HttpGet("http://httpbin.org/get");
             HttpRequestFutureTask<Boolean> futureTask1 = requestExecService.execute(request1,
                     HttpClientContext.create(), handler);
             Boolean wasItOk1 = futureTask1.get();
@@ -72,7 +72,7 @@ public class ClientWithRequestFuture {
 
             // Cancel a request
             try {
-                HttpGet request2 = new HttpGet("http://google.com");
+                HttpGet request2 = new HttpGet("http://httpbin.org/get");
                 HttpRequestFutureTask<Boolean> futureTask2 = requestExecService.execute(request2,
                         HttpClientContext.create(), handler);
                 futureTask2.cancel(true);
@@ -83,7 +83,7 @@ public class ClientWithRequestFuture {
             }
 
             // Request with a timeout
-            HttpGet request3 = new HttpGet("http://google.com");
+            HttpGet request3 = new HttpGet("http://httpbin.org/get");
             HttpRequestFutureTask<Boolean> futureTask3 = requestExecService.execute(request3,
                     HttpClientContext.create(), handler);
             Boolean wasItOk3 = futureTask3.get(10, TimeUnit.SECONDS);
@@ -107,7 +107,7 @@ public class ClientWithRequestFuture {
             };
 
             // Simple request with a callback
-            HttpGet request4 = new HttpGet("http://google.com");
+            HttpGet request4 = new HttpGet("http://httpbin.org/get");
             // using a null HttpContext here since it is optional
             // the callback will be called when the task completes, fails, or is cancelled
             HttpRequestFutureTask<Boolean> futureTask4 = requestExecService.execute(request4,

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java Fri Aug  7 07:33:11 2015
@@ -47,7 +47,7 @@ public class ClientWithResponseHandler {
     public final static void main(String[] args) throws Exception {
         CloseableHttpClient httpclient = HttpClients.createDefault();
         try {
-            HttpGet httpget = new HttpGet("http://localhost/");
+            HttpGet httpget = new HttpGet("http://httpbin.org/");
 
             System.out.println("Executing request " + httpget.getRequestLine());
 

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/QuickStart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/QuickStart.java?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/QuickStart.java (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/examples/org/apache/http/examples/client/QuickStart.java Fri Aug  7 07:33:11 2015
@@ -45,7 +45,7 @@ public class QuickStart {
     public static void main(String[] args) throws Exception {
         CloseableHttpClient httpclient = HttpClients.createDefault();
         try {
-            HttpGet httpGet = new HttpGet("http://targethost/homepage");
+            HttpGet httpGet = new HttpGet("http://httpbin.org/get");
             CloseableHttpResponse response1 = httpclient.execute(httpGet);
             // The underlying HTTP connection is still held by the response object
             // to allow the response content to be streamed directly from the network socket.
@@ -64,7 +64,7 @@ public class QuickStart {
                 response1.close();
             }
 
-            HttpPost httpPost = new HttpPost("http://targethost/login");
+            HttpPost httpPost = new HttpPost("http://httpbin.org/post");
             List <NameValuePair> nvps = new ArrayList <NameValuePair>();
             nvps.add(new BasicNameValuePair("username", "vip"));
             nvps.add(new BasicNameValuePair("password", "secret"));

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/test/resources/commons-logging.properties
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/test/resources/commons-logging.properties?rev=1694618&r1=1694617&r2=1694618&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/test/resources/commons-logging.properties (original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/test/resources/commons-logging.properties Fri Aug  7 07:33:11 2015
@@ -23,4 +23,4 @@
 # <http://www.apache.org/>.
 
 # Disable logging for unit tests
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
+# org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog