hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1724949 [4/10] - in /httpcomponents/httpclient/trunk: fluent-hc/src/examples/org/apache/hc/ fluent-hc/src/examples/org/apache/hc/client5/ fluent-hc/src/examples/org/apache/hc/client5/http/ fluent-hc/src/examples/org/apache/hc/client5/http/...
Date Sat, 16 Jan 2016 10:33:34 GMT
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRecommendations.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRecommendations.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRecommendations.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRecommendations.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -45,12 +45,12 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.client.methods.HttpPost;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Before;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRequirements.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRequirements.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRequirements.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestProtocolRequirements.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -49,14 +49,14 @@ import org.apache.hc.core5.http.entity.B
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.DateUtils;
-import org.apache.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.client.ClientProtocolException;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpExecutionAware;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Assert;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRFC5861Compliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRFC5861Compliance.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRFC5861Compliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRFC5861Compliance.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -40,8 +40,8 @@ import org.apache.hc.core5.http.HttpStat
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.entity.InputStreamEntity;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Test;
 
 /**

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRequestProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRequestProtocolCompliance.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRequestProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestRequestProtocolCompliance.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -37,8 +37,8 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolVersion;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.methods.HttpPut;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseCachingPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseCachingPolicy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseCachingPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseCachingPolicy.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.Date;
 import java.util.Random;
@@ -37,8 +37,8 @@ import org.apache.hc.core5.http.Protocol
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
 import org.apache.hc.core5.http.message.BasicStatusLine;
-import org.apache.http.client.methods.HttpOptions;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.methods.HttpOptions;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseProtocolCompliance.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestResponseProtocolCompliance.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertTrue;
@@ -42,11 +42,11 @@ import org.apache.hc.core5.http.entity.B
 import org.apache.hc.core5.http.entity.InputStreamEntity;
 import org.apache.hc.core5.http.message.BasicHttpRequest;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.ClientProtocolException;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.client.methods.HttpHead;
+import org.apache.hc.client5.http.client.methods.HttpRequestWrapper;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestSizeLimitedResponseReader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestSizeLimitedResponseReader.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestSizeLimitedResponseReader.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestSizeLimitedResponseReader.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.io.IOException;
 import java.lang.reflect.Proxy;
@@ -39,8 +39,8 @@ import org.apache.hc.core5.http.entity.B
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.StringEntity;
 import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -46,14 +46,14 @@ import org.apache.hc.core5.http.entity.B
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.cache.CacheResponseStatus;
-import org.apache.http.client.cache.HttpCacheContext;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.client.ClientProtocolException;
+import org.apache.hc.client5.http.client.HttpClient;
+import org.apache.hc.client5.http.client.cache.CacheResponseStatus;
+import org.apache.hc.client5.http.client.cache.HttpCacheContext;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestWarningValue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestWarningValue.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestWarningValue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/TestWarningValue.java Sat Jan 16 10:33:24 2016
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache;
+package org.apache.hc.client5.http.impl.client.cache;
 
 import java.util.Date;
 
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.apache.http.client.utils.DateUtils;
+import org.apache.hc.client5.http.client.utils.DateUtils;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.ehcache;
+package org.apache.hc.client5.http.impl.client.cache.ehcache;
 
 import static org.mockito.Matchers.isA;
 import static org.mockito.Matchers.same;
@@ -37,12 +37,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheEntrySerializer;
-import org.apache.http.client.cache.HttpCacheUpdateCallback;
-import org.apache.http.client.cache.HttpCacheUpdateException;
-import org.apache.http.impl.client.cache.CacheConfig;
-import org.apache.http.impl.client.cache.HttpTestUtils;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntrySerializer;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateCallback;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateException;
+import org.apache.hc.client5.http.impl.client.cache.CacheConfig;
+import org.apache.hc.client5.http.impl.client.cache.HttpTestUtils;
 import org.junit.Test;
 
 import junit.framework.TestCase;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java Sat Jan 16 10:33:24 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.ehcache;
+package org.apache.hc.client5.http.impl.client.cache.ehcache;
 
-import org.apache.http.client.cache.HttpCacheStorage;
-import org.apache.http.impl.client.cache.CacheConfig;
-import org.apache.http.impl.client.cache.CachingExec;
-import org.apache.http.impl.client.cache.HeapResourceFactory;
-import org.apache.http.impl.client.cache.TestProtocolRequirements;
-import org.apache.http.impl.execchain.ClientExecChain;
+import org.apache.hc.client5.http.client.cache.HttpCacheStorage;
+import org.apache.hc.client5.http.impl.client.cache.CacheConfig;
+import org.apache.hc.client5.http.impl.client.cache.CachingExec;
+import org.apache.hc.client5.http.impl.client.cache.HeapResourceFactory;
+import org.apache.hc.client5.http.impl.client.cache.TestProtocolRequirements;
+import org.apache.hc.client5.http.impl.execchain.ClientExecChain;
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.AfterClass;

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java Sat Jan 16 10:33:24 2016
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.impl.client.cache.HttpTestUtils;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.impl.client.cache.HttpTestUtils;
 import org.junit.Test;
 
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -34,9 +34,9 @@ import static org.junit.Assert.assertTru
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.impl.client.cache.DefaultHttpCacheEntrySerializer;
-import org.apache.http.impl.client.cache.HttpTestUtils;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.impl.client.cache.DefaultHttpCacheEntrySerializer;
+import org.apache.hc.client5.http.impl.client.cache.HttpTestUtils;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -35,11 +35,11 @@ import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 
-import org.apache.http.client.cache.HttpCacheEntry;
-import org.apache.http.client.cache.HttpCacheUpdateCallback;
-import org.apache.http.client.cache.HttpCacheUpdateException;
-import org.apache.http.impl.client.cache.CacheConfig;
-import org.apache.http.impl.client.cache.HttpTestUtils;
+import org.apache.hc.client5.http.client.cache.HttpCacheEntry;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateCallback;
+import org.apache.hc.client5.http.client.cache.HttpCacheUpdateException;
+import org.apache.hc.client5.http.impl.client.cache.CacheConfig;
+import org.apache.hc.client5.http.impl.client.cache.HttpTestUtils;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 import static org.junit.Assert.assertEquals;
 

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestSHA256HashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestSHA256HashingScheme.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestSHA256HashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/hc/client5/http/impl/client/cache/memcached/TestSHA256HashingScheme.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client.cache.memcached;
+package org.apache.hc.client5.http.impl.client.cache.memcached;
 
 import static org.junit.Assert.assertTrue;
 

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml?rev=1724949&r1=1724948&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml Sat Jan 16 10:33:24 2016
@@ -185,51 +185,51 @@
             <Bundle-Name>Apache ${project.name}</Bundle-Name>
             <Bundle-SymbolicName>${project.groupId}.httpclient</Bundle-SymbolicName>
             <_exportcontents>
-            org.apache.http.auth.*;version=${project.version},
-            org.apache.http.cookie.*;version=${project.version},
-            org.apache.http.conn.*;version=${project.version},
-            org.apache.http.client.*;version=${project.version},
-            org.apache.http.entity.mime.*;version=${project.version},
-            org.apache.http.impl.auth.*;version=${project.version},
-            org.apache.http.impl.cookie.*;version=${project.version},
-            org.apache.http.impl.conn.*;version=${project.version},
-            org.apache.http.impl.execchain.*;version=${project.version},
-            org.apache.http.impl.client.*;version=${project.version},
-            org.apache.http.osgi.services.*;version=${project.version}
+                org.apache.hc.client5.http.auth.*;version=${project.version},
+                org.apache.hc.client5.http.cookie.*;version=${project.version},
+                org.apache.hc.client5.http.conn.*;version=${project.version},
+                org.apache.hc.client5.http.client.*;version=${project.version},
+                org.apache.hc.client5.http.entity.mime.*;version=${project.version},
+                org.apache.hc.client5.http.impl.auth.*;version=${project.version},
+                org.apache.hc.client5.http.impl.cookie.*;version=${project.version},
+                org.apache.hc.client5.http.impl.conn.*;version=${project.version},
+                org.apache.hc.client5.http.impl.execchain.*;version=${project.version},
+                org.apache.hc.client5.http.impl.client.*;version=${project.version},
+                org.apache.hc.client5.http.osgi.services.*;version=${project.version}
             </_exportcontents>
             <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
             <Import-Package>
-            javax.crypto,
-            javax.crypto.spec,
-            javax.naming,
-            javax.naming.directory,
-            javax.naming.ldap,
-            javax.net,
-            javax.net.ssl,
-            javax.security.auth.x500,
-            org.ietf.jgss,,
-            org.osgi.framework,
-            org.osgi.service.cm,
-            org.apache.commons.logging;version=${commons-logging.osgi.import.version},
-            org.apache.http;version=${httpcore.osgi.import.version},
-            org.apache.http.config;version=${httpcore.osgi.import.version},
-            org.apache.http.concurrent;version=${httpcore.osgi.import.version},
-            org.apache.http.entity;version=${httpcore.osgi.import.version},
-            org.apache.http.io;version=${httpcore.osgi.import.version},
-            org.apache.http.message;version=${httpcore.osgi.import.version},
-            org.apache.http.params;version=${httpcore.osgi.import.version},
-            org.apache.http.pool;version=${httpcore.osgi.import.version},
-            org.apache.http.protocol;version=${httpcore.osgi.import.version},
-            org.apache.http.ssl;version=${httpcore.osgi.import.version},
-            org.apache.http.util;version=${httpcore.osgi.import.version},
-            org.apache.http.impl;version=${httpcore.osgi.import.version},
-            org.apache.http.impl.entity;version=${httpcore.osgi.import.version},
-            org.apache.http.impl.io;version=${httpcore.osgi.import.version},
-            org.apache.http.impl.pool;version=${httpcore.osgi.import.version},
-            net.sf.ehcache.*;resolution:=optional,
-            net.spy.memcached.*;resolution:=optional
+                javax.crypto,
+                javax.crypto.spec,
+                javax.naming,
+                javax.naming.directory,
+                javax.naming.ldap,
+                javax.net,
+                javax.net.ssl,
+                javax.security.auth.x500,
+                org.ietf.jgss,,
+                org.osgi.framework,
+                org.osgi.service.cm,
+                org.apache.commons.logging;version=${commons-logging.osgi.import.version},
+                org.apache.http;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.config;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.concurrent;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.entity;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.io;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.message;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.params;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.pool;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.protocol;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.ssl;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.util;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.impl;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.impl.entity;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.impl.io;version=${httpcore.osgi.import.version},
+                org.apache.hc.client5.http.impl.pool;version=${httpcore.osgi.import.version},
+                net.sf.ehcache.*;resolution:=optional,
+                net.spy.memcached.*;resolution:=optional
             </Import-Package>
-            <Bundle-Activator>org.apache.http.osgi.impl.HttpProxyConfigurationActivator</Bundle-Activator>
+            <Bundle-Activator>org.apache.hc.client5.http.osgi.impl.HttpProxyConfigurationActivator</Bundle-Activator>
             <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd -->
             <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME</_removeheaders>
           </instructions>

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpProxyConfigurationActivator.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -35,9 +35,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.osgi.services.HttpClientBuilderFactory;
-import org.apache.http.osgi.services.ProxyConfiguration;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.osgi.services.HttpClientBuilderFactory;
+import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiClientBuilderFactory.java Sat Jan 16 10:33:24 2016
@@ -24,14 +24,14 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.osgi.services.HttpClientBuilderFactory;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.osgi.services.HttpClientBuilderFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java Sat Jan 16 10:33:24 2016
@@ -24,15 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import java.util.Map;
 
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsStore;
-import org.apache.http.osgi.services.ProxyConfiguration;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.client.CredentialsStore;
+import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpClientBuilder.java Sat Jan 16 10:33:24 2016
@@ -24,13 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiHttpRoutePlanner.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import java.util.Locale;
 import java.util.Map;
@@ -35,8 +35,8 @@ import org.apache.hc.core5.http.HttpExce
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.impl.conn.DefaultRoutePlanner;
-import org.apache.http.osgi.services.ProxyConfiguration;
+import org.apache.hc.client5.http.impl.conn.DefaultRoutePlanner;
+import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfiguration.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfiguration.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfiguration.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfiguration.java Sat Jan 16 10:33:24 2016
@@ -24,15 +24,15 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
-import static org.apache.http.osgi.impl.PropertiesUtils.to;
+import static org.apache.hc.client5.http.osgi.impl.PropertiesUtils.to;
 
 import java.util.Dictionary;
 
-import org.apache.http.osgi.services.ProxyConfiguration;
+import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
 
 /**
  * @since 4.3

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/PropertiesUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/PropertiesUtils.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/PropertiesUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/PropertiesUtils.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/package-info.java Sat Jan 16 10:33:24 2016
@@ -24,4 +24,4 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/package-info.java Sat Jan 16 10:33:24 2016
@@ -28,4 +28,4 @@
 /**
  * @since 4.3
  */
-package org.apache.http.osgi;
+package org.apache.hc.client5.http.osgi;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/HttpClientBuilderFactory.java Sat Jan 16 10:33:24 2016
@@ -24,9 +24,9 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.services;
+package org.apache.hc.client5.http.osgi.services;
 
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
 
 /**
  * @since 4.3

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/ProxyConfiguration.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/ProxyConfiguration.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/ProxyConfiguration.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/ProxyConfiguration.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.services;
+package org.apache.hc.client5.http.osgi.services;
 
 /**
  * @since 4.3

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/java/org/apache/hc/client5/http/osgi/services/package-info.java Sat Jan 16 10:33:24 2016
@@ -28,4 +28,4 @@
 /**
  * @since 4.3
  */
-package org.apache.http.osgi.services;
+package org.apache.hc.client5.http.osgi.services;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1724949&r1=1724948&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/main/resources/OSGI-INF/metatype/metatype.xml Sat Jan 16 10:33:24 2016
@@ -26,7 +26,7 @@
  -->
 <metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="metatype">
 
-  <OCD id="org.apache.http.proxyconfigurator"
+  <OCD id="org.apache.hc.client5.http.proxyconfigurator"
      name="%proxyconfig.name"
      description="%proxyconfig.description">
 
@@ -69,8 +69,8 @@
 
   </OCD>
 
-  <Designate pid="org.apache.http.proxyconfigurator">
-    <Object ocdref="org.apache.http.proxyconfigurator" />
+  <Designate pid="org.apache.hc.client5.http.proxyconfigurator">
+    <Object ocdref="org.apache.hc.client5.http.proxyconfigurator" />
   </Designate>
 
 </metatype:MetaData>

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
@@ -40,10 +40,10 @@ import java.util.List;
 
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.entity.ContentType;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.entity.mime.content.ByteArrayBody;
-import org.apache.http.entity.mime.content.StringBody;
+import org.apache.hc.client5.http.client.methods.HttpPost;
+import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
+import org.apache.hc.client5.http.entity.mime.content.ByteArrayBody;
+import org.apache.hc.client5.http.entity.mime.content.StringBody;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfigurationTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfigurationTest.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfigurationTest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiProxyConfigurationTest.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestOSGiHttpRoutePlanner.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -37,7 +37,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.http.osgi.services.ProxyConfiguration;
+import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
 import org.junit.Test;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;

Modified: httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestPropertiesUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestPropertiesUtils.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestPropertiesUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/TestPropertiesUtils.java Sat Jan 16 10:33:24 2016
@@ -24,9 +24,9 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.osgi.impl;
+package org.apache.hc.client5.http.osgi.impl;
 
-import static org.apache.http.osgi.impl.PropertiesUtils.to;
+import static org.apache.hc.client5.http.osgi.impl.PropertiesUtils.to;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 

Copied: httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java (from r1724852, httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/http/examples/client/win/ClientWinAuth.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java?p2=httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java&p1=httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/http/examples/client/win/ClientWinAuth.java&r1=1724852&r2=1724949&rev=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/http/examples/client/win/ClientWinAuth.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/examples/org/apache/hc/client5/http/examples/client/win/ClientWinAuth.java Sat Jan 16 10:33:24 2016
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.examples.client.win;
+package org.apache.hc.client5.http.examples.client.win;
 
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.WinHttpClients;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.WinHttpClients;
 
 /**
  * This example demonstrates how to create HttpClient pre-configured

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNTLMSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNTLMSchemeFactory.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNTLMSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNTLMSchemeFactory.java Sat Jan 16 10:33:24 2016
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.impl.auth.win;
+package org.apache.hc.client5.http.impl.auth.win;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.client5.http.client.config.AuthSchemes;
 
 /**
  * {@link AuthSchemeProvider} implementation that creates and initializes

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateScheme.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateScheme.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.auth.win;
+package org.apache.hc.client5.http.impl.auth.win;
 
 import java.security.Principal;
 
@@ -36,15 +36,15 @@ import org.apache.hc.core5.http.HttpHost
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.util.Args;
-import org.apache.http.auth.AuthChallenge;
-import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthenticationException;
-import org.apache.http.auth.BasicUserPrincipal;
-import org.apache.http.auth.CredentialsProvider;
-import org.apache.http.auth.MalformedChallengeException;
-import org.apache.http.client.config.AuthSchemes;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.RouteInfo;
+import org.apache.hc.client5.http.auth.AuthChallenge;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthenticationException;
+import org.apache.hc.client5.http.auth.BasicUserPrincipal;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.auth.MalformedChallengeException;
+import org.apache.hc.client5.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.conn.routing.RouteInfo;
 
 import com.sun.jna.platform.win32.Secur32;
 import com.sun.jna.platform.win32.Secur32Util;

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateSchemeFactory.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/WindowsNegotiateSchemeFactory.java Sat Jan 16 10:33:24 2016
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.impl.auth.win;
+package org.apache.hc.client5.http.impl.auth.win;
 
 import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.client5.http.client.config.AuthSchemes;
 
 /**
  * {@link AuthSchemeProvider} implementation that creates and initializes

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/package-info.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/package-info.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/auth/win/package-info.java Sat Jan 16 10:33:24 2016
@@ -32,4 +32,4 @@
  * in the future.
  * </p>
  */
-package org.apache.http.impl.auth.win;
+package org.apache.hc.client5.http.impl.auth.win;

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/client/WinHttpClients.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/client/WinHttpClients.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/client/WinHttpClients.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/hc/client5/http/impl/client/WinHttpClients.java Sat Jan 16 10:33:24 2016
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.client;
+package org.apache.hc.client5.http.impl.client;
 
 import java.util.Locale;
 
 import org.apache.hc.core5.http.config.Registry;
 import org.apache.hc.core5.http.config.RegistryBuilder;
-import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.client.config.AuthSchemes;
-import org.apache.http.impl.auth.BasicSchemeFactory;
-import org.apache.http.impl.auth.DigestSchemeFactory;
-import org.apache.http.impl.auth.win.WindowsNTLMSchemeFactory;
-import org.apache.http.impl.auth.win.WindowsNegotiateSchemeFactory;
+import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.client5.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory;
+import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory;
+import org.apache.hc.client5.http.impl.auth.win.WindowsNTLMSchemeFactory;
+import org.apache.hc.client5.http.impl.auth.win.WindowsNegotiateSchemeFactory;
 
 import com.sun.jna.platform.win32.Sspi;
 

Modified: httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/auth/win/TestWindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/auth/win/TestWindowsNegotiateScheme.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/auth/win/TestWindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/hc/client5/http/impl/auth/win/TestWindowsNegotiateScheme.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.impl.auth.win;
+package org.apache.hc.client5.http.impl.auth.win;
 
 import java.io.IOException;
 
@@ -39,15 +39,15 @@ import org.apache.hc.core5.http.config.R
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.io.HttpRequestHandler;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.client.config.AuthSchemes;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.WinHttpClients;
-import org.apache.http.localserver.LocalServerTestBase;
+import org.apache.hc.client5.http.auth.AuthScheme;
+import org.apache.hc.client5.http.auth.AuthSchemeProvider;
+import org.apache.hc.client5.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.client.WinHttpClients;
+import org.apache.hc.client5.http.localserver.LocalServerTestBase;
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAbortMethod.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAbortMethod.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAbortMethod.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAbortMethod.java Sat Jan 16 10:33:24 2016
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * This example demonstrates how to abort an HTTP method before its normal completion.

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAuthentication.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientAuthentication.java Sat Jan 16 10:33:24 2016
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * A simple example that uses HttpClient to execute an HTTP request against

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientChunkEncodedPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientChunkEncodedPost.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientChunkEncodedPost.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientChunkEncodedPost.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,10 +32,10 @@ import java.io.FileInputStream;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.entity.InputStreamEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpPost;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * Example how to use unbuffered chunk-encoded POST request.

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConfiguration.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConfiguration.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConfiguration.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConfiguration.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -57,30 +57,30 @@ import org.apache.hc.core5.http.message.
 import org.apache.hc.core5.http.message.LineParser;
 import org.apache.hc.core5.ssl.SSLContexts;
 import org.apache.hc.core5.util.CharArrayBuffer;
-import org.apache.http.auth.CredentialsProvider;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.config.AuthSchemes;
-import org.apache.http.client.config.CookieSpecs;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.DnsResolver;
-import org.apache.http.conn.HttpConnectionFactory;
-import org.apache.http.conn.ManagedHttpClientConnection;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.DefaultHttpResponseParserFactory;
-import org.apache.http.impl.conn.LenientHttpResponseParser;
-import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.impl.conn.SystemDefaultDnsResolver;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.client.CookieStore;
+import org.apache.hc.client5.http.client.config.AuthSchemes;
+import org.apache.hc.client5.http.client.config.CookieSpecs;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.conn.DnsResolver;
+import org.apache.hc.client5.http.conn.HttpConnectionFactory;
+import org.apache.hc.client5.http.conn.ManagedHttpClientConnection;
+import org.apache.hc.client5.http.conn.routing.HttpRoute;
+import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.impl.client.BasicCookieStore;
+import org.apache.hc.client5.http.impl.client.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.impl.conn.DefaultHttpResponseParserFactory;
+import org.apache.hc.client5.http.impl.conn.LenientHttpResponseParser;
+import org.apache.hc.client5.http.impl.conn.ManagedHttpClientConnectionFactory;
+import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.conn.SystemDefaultDnsResolver;
 
 /**
  * This example demonstrates how to customize and configure the most common aspects

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConnectionRelease.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConnectionRelease.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConnectionRelease.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientConnectionRelease.java Sat Jan 16 10:33:24 2016
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.hc.core5.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * This example demonstrates the recommended way of using API to make sure

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomContext.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomContext.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomContext.java Sat Jan 16 10:33:24 2016
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import java.util.List;
 
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.client.CookieStore;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.impl.client.BasicCookieStore;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * This example demonstrates the use of a local HTTP context populated with

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomPublicSuffixList.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomPublicSuffixList.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomPublicSuffixList.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomPublicSuffixList.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import java.net.URL;
 
@@ -32,16 +32,16 @@ import org.apache.hc.core5.http.HttpEnti
 import org.apache.hc.core5.http.config.Lookup;
 import org.apache.hc.core5.http.config.RegistryBuilder;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.client.config.CookieSpecs;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ssl.DefaultHostnameVerifier;
-import org.apache.http.conn.util.PublicSuffixMatcher;
-import org.apache.http.conn.util.PublicSuffixMatcherLoader;
-import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.cookie.RFC6265CookieSpecProvider;
+import org.apache.hc.client5.http.client.config.CookieSpecs;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.conn.ssl.DefaultHostnameVerifier;
+import org.apache.hc.client5.http.conn.util.PublicSuffixMatcher;
+import org.apache.hc.client5.http.conn.util.PublicSuffixMatcherLoader;
+import org.apache.hc.client5.http.cookie.CookieSpecProvider;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.impl.cookie.RFC6265CookieSpecProvider;
 
 /**
  * This example demonstrates how to use a custom public suffix list.

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomSSL.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomSSL.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientCustomSSL.java Sat Jan 16 10:33:24 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import java.io.File;
 
@@ -33,12 +33,12 @@ import javax.net.ssl.SSLContext;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.ssl.SSLContexts;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * This example demonstrates how to create secure connections with a custom SSL

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientEvictExpiredConnections.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientEvictExpiredConnections.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientEvictExpiredConnections.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientEvictExpiredConnections.java Sat Jan 16 10:33:24 2016
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import java.util.concurrent.TimeUnit;
 
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.pool.PoolStats;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
 
 /**
  * Example demonstrating how to evict expired and idle connections

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteProxy.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteProxy.java Sat Jan 16 10:33:24 2016
@@ -25,15 +25,15 @@
  *
  */
 
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.client.config.RequestConfig;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * How to send a request via proxy.

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteSOCKS.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteSOCKS.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteSOCKS.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientExecuteSOCKS.java Sat Jan 16 10:33:24 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -38,14 +38,14 @@ import org.apache.hc.core5.http.config.R
 import org.apache.hc.core5.http.config.RegistryBuilder;
 import org.apache.hc.core5.http.entity.EntityUtils;
 import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.client.protocol.HttpClientContext;
+import org.apache.hc.client5.http.conn.ConnectTimeoutException;
+import org.apache.hc.client5.http.conn.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.impl.conn.PoolingHttpClientConnectionManager;
 
 /**
  * How to send a request via SOCKS proxy.

Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientFormLogin.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientFormLogin.java?rev=1724949&r1=1724852&r2=1724949&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientFormLogin.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/hc/client5/http/examples/client/ClientFormLogin.java Sat Jan 16 10:33:24 2016
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.examples.client;
+package org.apache.hc.client5.http.examples.client;
 
 import java.net.URI;
 import java.util.List;
 
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.entity.EntityUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.hc.client5.http.client.methods.CloseableHttpResponse;
+import org.apache.hc.client5.http.client.methods.HttpGet;
+import org.apache.hc.client5.http.client.methods.HttpUriRequest;
+import org.apache.hc.client5.http.client.methods.RequestBuilder;
+import org.apache.hc.client5.http.cookie.Cookie;
+import org.apache.hc.client5.http.impl.client.BasicCookieStore;
+import org.apache.hc.client5.http.impl.client.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.client.HttpClients;
 
 /**
  * A example that demonstrates how HttpClient APIs can be used to perform




Mime
View raw message