From 71761a72a7ce477840233b3069a2e3c40bd1fdab Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Sat, 8 Sep 2012 00:28:06 -0700
Subject: [PATCH] rename FetchHTTP2 to FetchHTTP

---
 .../org/archive/modules/fetcher/FetchHTTP2Test.java    |  2 +-
 .../fetcher/{FetchHTTP2.java => FetchHTTP.java}        |  6 +++---
 .../archive/modules/fetcher/RecordingHttpClient.java   | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename modules/src/main/java/org/archive/modules/fetcher/{FetchHTTP2.java => FetchHTTP.java} (99%)

diff --git a/engine/src/test/java/org/archive/modules/fetcher/FetchHTTP2Test.java b/engine/src/test/java/org/archive/modules/fetcher/FetchHTTP2Test.java
index 3a8e1a67..2efae118 100644
--- a/engine/src/test/java/org/archive/modules/fetcher/FetchHTTP2Test.java
+++ b/engine/src/test/java/org/archive/modules/fetcher/FetchHTTP2Test.java
@@ -95,7 +95,7 @@ public class FetchHTTP2Test extends FetchHTTPTestBase {
 
     @Override
     protected AbstractFetchHTTP makeModule() throws IOException {
-        FetchHTTP2 fetchHttp2 = new FetchHTTP2();
+        FetchHTTP fetchHttp2 = new FetchHTTP();
         fetchHttp2.setCookieStore(new SimpleCookieStore());
         fetchHttp2.setServerCache(new DefaultServerCache());
         CrawlMetadata uap = new CrawlMetadata();
diff --git a/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP2.java b/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP.java
similarity index 99%
rename from modules/src/main/java/org/archive/modules/fetcher/FetchHTTP2.java
rename to modules/src/main/java/org/archive/modules/fetcher/FetchHTTP.java
index 0bad2999..4c3f9eee 100644
--- a/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP2.java
+++ b/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP.java
@@ -108,9 +108,9 @@ import org.springframework.context.Lifecycle;
  * HTTP fetcher that uses <a href="http://hc.apache.org/">Apache HttpComponents</a>.
  * @contributor nlevitt
  */
-public class FetchHTTP2 extends AbstractFetchHTTP implements Lifecycle {
+public class FetchHTTP extends AbstractFetchHTTP implements Lifecycle {
 
-    private static Logger logger = Logger.getLogger(FetchHTTP2.class.getName());
+    private static Logger logger = Logger.getLogger(FetchHTTP.class.getName());
 
     public static final String REFERER = "Referer";
     public static final String RANGE = "Range";
@@ -1259,7 +1259,7 @@ public class FetchHTTP2 extends AbstractFetchHTTP implements Lifecycle {
             threadHttpClient = new ThreadLocal<RecordingHttpClient>() {
                 protected RecordingHttpClient initialValue() {
                     RecordingHttpClient httpClient = new RecordingHttpClient(
-                            FetchHTTP2.this, sslContext(), getServerCache());
+                            FetchHTTP.this, sslContext(), getServerCache());
                     
                     // some http client config
                     HttpClientParams.setRedirecting(httpClient.getParams(), false);
diff --git a/modules/src/main/java/org/archive/modules/fetcher/RecordingHttpClient.java b/modules/src/main/java/org/archive/modules/fetcher/RecordingHttpClient.java
index c8f8f86a..635d98cd 100644
--- a/modules/src/main/java/org/archive/modules/fetcher/RecordingHttpClient.java
+++ b/modules/src/main/java/org/archive/modules/fetcher/RecordingHttpClient.java
@@ -58,7 +58,7 @@ import org.archive.util.Recorder;
  */
 public class RecordingHttpClient extends DefaultHttpClient {
     protected ServerCache serverCache;
-    protected FetchHTTP2 fetcher;
+    protected FetchHTTP fetcher;
     protected SSLContext sslContext;
 
     /**
@@ -67,7 +67,7 @@ public class RecordingHttpClient extends DefaultHttpClient {
      * @param sslContext 
      * @param serverCache
      */
-    public RecordingHttpClient(FetchHTTP2 fetchHTTP2, SSLContext sslContext, ServerCache serverCache) {
+    public RecordingHttpClient(FetchHTTP fetchHTTP2, SSLContext sslContext, ServerCache serverCache) {
         super();
         
         this.fetcher = fetchHTTP2;
@@ -96,7 +96,7 @@ public class RecordingHttpClient extends DefaultHttpClient {
      * Custom scheme registry that uses our special {@link SSLContext} which uses our
      * special trust rules.
      * 
-     * @see FetchHTTP2#getSslTrustLevel()
+     * @see FetchHTTP#getSslTrustLevel()
      * @see SchemeRegistryFactory#createDefault()
      */
     protected SchemeRegistry createSchemeRegistry() {
@@ -164,10 +164,10 @@ public class RecordingHttpClient extends DefaultHttpClient {
      * @contributor nlevitt
      */
     protected static class RecordingClientConnectionOperator extends DefaultClientConnectionOperator {
-        private FetchHTTP2 fetcher;
+        private FetchHTTP fetcher;
 
         public RecordingClientConnectionOperator(SchemeRegistry schemes,
-                DnsResolver dnsResolver, FetchHTTP2 fetcher) {
+                DnsResolver dnsResolver, FetchHTTP fetcher) {
             super(schemes, dnsResolver);
             this.fetcher = fetcher;
         }