From 10f6da691eda115aa8dc96d8516b4a742a694899 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Thu, 2 Feb 2012 20:17:10 +0000 Subject: [PATCH] Moved Memcached specific interfaces from the public API space to the impl package (will also make maintenace of OSGi metadata easier) git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1239803 13f79535-47bb-0310-9956-ffa450edef68 --- .../{ => impl}/client/cache/memcached/KeyHashingScheme.java | 2 +- .../{ => impl}/client/cache/memcached/MemcachedCacheEntry.java | 2 +- .../client/cache/memcached/MemcachedCacheEntryFactory.java | 2 +- .../client/cache/memcached/MemcachedCacheEntryFactoryImpl.java | 2 -- .../impl/client/cache/memcached/MemcachedCacheEntryImpl.java | 1 - .../impl/client/cache/memcached/MemcachedHttpCacheStorage.java | 3 --- .../impl/client/cache/memcached/PrefixKeyHashingScheme.java | 1 - .../impl/client/cache/memcached/SHA256KeyHashingScheme.java | 1 - .../cache/memcached/TestMemcachedCacheEntryFactoryImpl.java | 1 - .../client/cache/memcached/TestMemcachedHttpCacheStorage.java | 3 --- .../client/cache/memcached/TestPrefixKeyHashingScheme.java | 1 - 11 files changed, 3 insertions(+), 16 deletions(-) rename httpclient-cache/src/main/java/org/apache/http/{ => impl}/client/cache/memcached/KeyHashingScheme.java (97%) rename httpclient-cache/src/main/java/org/apache/http/{ => impl}/client/cache/memcached/MemcachedCacheEntry.java (98%) rename httpclient-cache/src/main/java/org/apache/http/{ => impl}/client/cache/memcached/MemcachedCacheEntryFactory.java (97%) diff --git a/httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/KeyHashingScheme.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.java similarity index 97% rename from httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/KeyHashingScheme.java rename to httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.java index db0b42362..06d521274 100644 --- a/httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/KeyHashingScheme.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.java @@ -23,7 +23,7 @@ * information on the Apache Software Foundation, please see * . * - */package org.apache.http.client.cache.memcached; + */package org.apache.http.impl.client.cache.memcached; import org.apache.http.client.cache.HttpCacheStorage; diff --git a/httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/MemcachedCacheEntry.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.java similarity index 98% rename from httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/MemcachedCacheEntry.java rename to httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.java index 4ba345a2b..bf2217ab9 100644 --- a/httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/MemcachedCacheEntry.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.http.client.cache.memcached; +package org.apache.http.impl.client.cache.memcached; import org.apache.http.client.cache.HttpCacheEntry; diff --git a/httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/MemcachedCacheEntryFactory.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java similarity index 97% rename from httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/MemcachedCacheEntryFactory.java rename to httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java index 853874e04..9cc4d52be 100644 --- a/httpclient-cache/src/main/java/org/apache/http/client/cache/memcached/MemcachedCacheEntryFactory.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java @@ -24,7 +24,7 @@ * . * */ -package org.apache.http.client.cache.memcached; +package org.apache.http.impl.client.cache.memcached; import org.apache.http.client.cache.HttpCacheEntry; diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java index 9d0306237..03c939c8e 100644 --- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java @@ -27,8 +27,6 @@ package org.apache.http.impl.client.cache.memcached; import org.apache.http.client.cache.HttpCacheEntry; -import org.apache.http.client.cache.memcached.MemcachedCacheEntry; -import org.apache.http.client.cache.memcached.MemcachedCacheEntryFactory; /** * Default implementation of {@link MemcachedCacheEntryFactory}. diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java index 782511385..4ddb471a0 100644 --- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java @@ -32,7 +32,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import org.apache.http.client.cache.HttpCacheEntry; -import org.apache.http.client.cache.memcached.MemcachedCacheEntry; /** * Default implementation of {@link MemcachedCacheEntry}. This implementation diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java index d8cffc801..d1c62b7bc 100644 --- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java @@ -42,9 +42,6 @@ import org.apache.http.client.cache.HttpCacheEntrySerializer; import org.apache.http.client.cache.HttpCacheUpdateException; import org.apache.http.client.cache.HttpCacheStorage; import org.apache.http.client.cache.HttpCacheUpdateCallback; -import org.apache.http.client.cache.memcached.KeyHashingScheme; -import org.apache.http.client.cache.memcached.MemcachedCacheEntry; -import org.apache.http.client.cache.memcached.MemcachedCacheEntryFactory; import org.apache.http.impl.client.cache.CacheConfig; import org.apache.http.impl.client.cache.CachingHttpClient; diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.java index e3a841fb9..1eb7c5f67 100644 --- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.java @@ -1,6 +1,5 @@ package org.apache.http.impl.client.cache.memcached; -import org.apache.http.client.cache.memcached.KeyHashingScheme; /** * This is a {@link KeyHashingScheme} decorator that simply adds diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java index 272d1ab15..0de84abed 100644 --- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java @@ -32,7 +32,6 @@ import java.security.NoSuchAlgorithmException; import org.apache.commons.codec.binary.Hex; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.client.cache.memcached.KeyHashingScheme; /** * This is a {@link KeyHashingScheme} based on the diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java index 94d340bf5..81a1075d6 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryFactoryImpl.java @@ -3,7 +3,6 @@ package org.apache.http.impl.client.cache.memcached; import static org.junit.Assert.*; import org.apache.http.client.cache.HttpCacheEntry; -import org.apache.http.client.cache.memcached.MemcachedCacheEntry; import org.apache.http.impl.client.cache.HttpTestUtils; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java index b283cd3f5..e6821abe4 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java @@ -38,9 +38,6 @@ import net.spy.memcached.OperationTimeoutException; 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.client.cache.memcached.KeyHashingScheme; -import org.apache.http.client.cache.memcached.MemcachedCacheEntry; -import org.apache.http.client.cache.memcached.MemcachedCacheEntryFactory; import org.apache.http.impl.client.cache.CacheConfig; import org.apache.http.impl.client.cache.HttpTestUtils; import org.easymock.EasyMock; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java index 997e61585..7212b9737 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java @@ -2,7 +2,6 @@ package org.apache.http.impl.client.cache.memcached; import static org.junit.Assert.*; -import org.apache.http.client.cache.memcached.KeyHashingScheme; import org.junit.Before; import org.junit.Test;