svn commit: r1411930 - in /manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss: DataCache.java RSSConnector.java

[kwright]

Author: kwright
Date: Tue Nov 20 23:48:23 2012
New Revision: 1411930

URL: http://svn.apache.org/viewvc?rev=1411930&view=rev
Log:
Missed more httpclient references

Modified:
    
manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
    
manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java

Modified: 
manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java?rev=1411930&r1=1411929&r2=1411930&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
 Tue Nov 20 23:48:23 2012
@@ -26,6 +26,12 @@ import org.apache.manifoldcf.crawler.sys
 import java.util.*;
 import java.io.*;
 
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.client.RedirectException;
+import org.apache.http.client.CircularRedirectException;
+import org.apache.http.NoHttpResponseException;
+import org.apache.http.HttpException;
+
 /** This class is a cache of a specific URL's data.  It's fetched early and 
kept,
 * so that (1) an accurate data length can be found, and (2) we can compute a 
version
 * checksum.
@@ -86,7 +92,7 @@ public class DataCache
               throw new ServiceInterruption("Read timeout: 
"+e.getMessage(),e,currentTime + 300000L,
                 currentTime + 12 * 60 * 60000L,-1,false);
             }
-            catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+            catch (ConnectTimeoutException e)
             {
               Logging.connectors.warn("RSS: Connect timeout exception reading 
socket stream: "+e.getMessage(),e);
               long currentTime = System.currentTimeMillis();
@@ -153,7 +159,7 @@ public class DataCache
     {
       throw new ManifoldCFException("Socket timeout exception creating 
temporary file: "+e.getMessage(),e);
     }
-    catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+    catch (ConnectTimeoutException e)
     {
       throw new ManifoldCFException("Socket connect timeout exception creating 
temporary file: "+e.getMessage(),e);
     }

Modified: 
manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java?rev=1411930&r1=1411929&r2=1411930&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-120/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
 Tue Nov 20 23:48:23 2012
@@ -32,15 +32,17 @@ import org.apache.manifoldcf.agents.comm
 import org.apache.manifoldcf.agents.common.XMLStringContext;
 import org.apache.manifoldcf.agents.common.XMLFileContext;
 
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.client.RedirectException;
+import org.apache.http.client.CircularRedirectException;
+import org.apache.http.NoHttpResponseException;
+import org.apache.http.HttpException;
+
 import java.io.*;
 import java.util.*;
 import java.net.*;
 import java.util.regex.*;
 
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.methods.*;
-import org.apache.commons.httpclient.params.*;
-
 /** This is the RSS implementation of the IRepositoryConnector interface.
 * This connector basically looks at an RSS document in order to seed the
 * document queue.  The document is always fetched from the same URL (it's
@@ -1147,7 +1149,7 @@ public class RSSConnector extends org.ap
                       Logging.connectors.warn("RSS: Socket timeout exception 
fetching document contents '"+urlValue+"' - skipping: "+e.getMessage(), e);
                       rval[i] = null;
                     }
-                    catch 
(org.apache.commons.httpclient.ConnectTimeoutException e)
+                    catch (ConnectTimeoutException e)
                     {
                       Logging.connectors.warn("RSS: Connecto timeout exception 
fetching document contents '"+urlValue+"' - skipping: "+e.getMessage(), e);
                       rval[i] = null;
@@ -3412,7 +3414,7 @@ public class RSSConnector extends org.ap
     {
       throw new ManifoldCFException("Socket timeout error: "+e.getMessage(),e);
     }
-    catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+    catch (ConnectTimeoutException e)
     {
       throw new ManifoldCFException("Socket connect timeout error: 
"+e.getMessage(),e);
     }