You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/11/21 00:43:28 UTC
svn commit: r1411928 - in
/manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler:
DataCache.java ThrottledFetcher.java TrustsDescription.java
WebcrawlerConnector.java
Author: kwright
Date: Tue Nov 20 23:43:26 2012
New Revision: 1411928
URL: http://svn.apache.org/viewvc?rev=1411928&view=rev
Log:
Get rid of imports of httpclient classes.
Modified:
manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java
manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/TrustsDescription.java
manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
Modified: manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java?rev=1411928&r1=1411927&r2=1411928&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java (original)
+++ manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java Tue Nov 20 23:43:26 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.
@@ -101,7 +107,7 @@ public class DataCache
throw new ServiceInterruption("Socket 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("Socket connect timeout exception reading socket stream: "+e.getMessage(),e);
long currentTime = System.currentTimeMillis();
@@ -179,7 +185,7 @@ public class DataCache
{
Logging.connectors.warn("WEB: Socket timeout exception closing data stream, ignoring: "+e.getMessage(),e);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
Logging.connectors.warn("WEB: Socket connect timeout exception closing data stream, ignoring: "+e.getMessage(),e);
}
@@ -199,7 +205,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/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java?rev=1411928&r1=1411927&r2=1411928&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java (original)
+++ manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java Tue Nov 20 23:43:26 2012
@@ -2158,7 +2158,7 @@ public class ThrottledFetcher
{
Logging.connectors.debug("Socket timeout exception trying to close connection: "+e.getMessage(),e);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
Logging.connectors.debug("Socket connection timeout exception trying to close connection: "+e.getMessage(),e);
}
Modified: manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/TrustsDescription.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/TrustsDescription.java?rev=1411928&r1=1411927&r2=1411928&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/TrustsDescription.java (original)
+++ manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/TrustsDescription.java Tue Nov 20 23:43:26 2012
@@ -23,10 +23,6 @@ import org.apache.manifoldcf.crawler.sys
import java.util.*;
import java.util.regex.*;
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.methods.*;
-import org.apache.commons.httpclient.params.*;
-
/** This class describes trust information pulled from a configuration.
* The data contained is organized by regular expression performed on a url. What we store
* for each regular expression is a Pattern, for efficiency.
Modified: manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=1411928&r1=1411927&r2=1411928&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-120/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java Tue Nov 20 23:43:26 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 Web Crawler implementation of the IRepositoryConnector interface.
* This connector may be superceded by one that calls out to python, or by a entirely
* python Connector Framework, depending on how the winds blow.
@@ -1375,7 +1377,7 @@ public class WebcrawlerConnector extends
{
throw new ManifoldCFException("Socket timeout error closing stream: "+e.getMessage(),e);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
throw new ManifoldCFException("Socket connect timeout error closing stream: "+e.getMessage(),e);
}
@@ -5113,7 +5115,7 @@ public class WebcrawlerConnector extends
{
Logging.connectors.warn("Web: Couldn't clear robots cache: "+e2.getMessage(),e2);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e2)
+ catch (ConnectTimeoutException e2)
{
Logging.connectors.warn("Web: Couldn't clear robots cache: "+e2.getMessage(),e2);
}
@@ -5127,7 +5129,7 @@ public class WebcrawlerConnector extends
Logging.connectors.warn("Web: Couldn't clear robots cache: "+e2.getMessage(),e2);
}
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Web: Fetch of robots.txt from "+protocol+"://"+hostIPAddressAndPort+"(host='"+hostName+"') generated Socket Connect Timeout Exception: "+e.getMessage(),e);
@@ -5141,7 +5143,7 @@ public class WebcrawlerConnector extends
{
Logging.connectors.warn("Web: Couldn't clear robots cache: "+e2.getMessage(),e2);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e2)
+ catch (ConnectTimeoutException e2)
{
Logging.connectors.warn("Web: Couldn't clear robots cache: "+e2.getMessage(),e2);
}
@@ -5174,7 +5176,7 @@ public class WebcrawlerConnector extends
{
Logging.connectors.warn("Web: Couldn't clear robots cache: "+e2.getMessage(),e2);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e2)
+ catch (ConnectTimeoutException e2)
{
Logging.connectors.warn("Web: Couldn't clear robots cache: "+e2.getMessage(),e2);
}
@@ -6330,7 +6332,7 @@ public class WebcrawlerConnector extends
{
throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
throw new ManifoldCFException("Socket connect timeout exception: "+e.getMessage(),e);
}
@@ -7069,7 +7071,7 @@ public class WebcrawlerConnector extends
{
throw new ManifoldCFException("Socket timeout exception: "+e.getMessage(),e);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
throw new ManifoldCFException("Socket connect timeout exception: "+e.getMessage(),e);
}
@@ -7124,7 +7126,7 @@ public class WebcrawlerConnector extends
{
throw new ManifoldCFException("Socket timeout exception accessing cached document: "+e.getMessage(),e);
}
- catch (org.apache.commons.httpclient.ConnectTimeoutException e)
+ catch (ConnectTimeoutException e)
{
throw new ManifoldCFException("Socket timeout exception accessing cached document: "+e.getMessage(),e);
}