Author: kwright
Date: Sun Sep 21 15:04:10 2014
New Revision: 1626589
URL: http://svn.apache.org/r1626589
Log:
Remove IVersionActivity. Part of CONNECTORS-977.
Removed:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IVersionActivity.java
Modified:
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/IThrottledConnection.java
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/IThrottledConnection.java
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java
Modified:
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
(original)
+++
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
Sun Sep 21 15:04:10 2014
@@ -63,7 +63,6 @@ import org.apache.manifoldcf.crawler.int
import org.apache.manifoldcf.crawler.interfaces.IExistingVersions;
import org.apache.manifoldcf.crawler.interfaces.IFingerprintActivity;
import org.apache.manifoldcf.core.interfaces.SpecificationNode;
-import org.apache.manifoldcf.crawler.interfaces.IVersionActivity;
import org.apache.manifoldcf.crawler.system.Logging;
import org.apache.manifoldcf.crawler.system.ManifoldCF;
import org.apache.manifoldcf.core.extmimemap.ExtensionMimeMap;
Modified:
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
(original)
+++
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/DataCache.java
Sun Sep 21 15:04:10 2014
@@ -56,7 +56,7 @@ public class DataCache
*@param dataStream is the data stream.
*@return the checksum value.
*/
- public long addData(IVersionActivity activities, String documentIdentifier,
String contentType, InputStream dataStream)
+ public long addData(IProcessActivity activities, String documentIdentifier,
String contentType, InputStream dataStream)
throws ManifoldCFException, ServiceInterruption
{
// Create a temporary file; that's what we will cache
Modified:
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/IThrottledConnection.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/IThrottledConnection.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/IThrottledConnection.java
(original)
+++
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/IThrottledConnection.java
Sun Sep 21 15:04:10 2014
@@ -92,7 +92,7 @@ public interface IThrottledConnection
/** Done with the fetch. Call this when the fetch has been completed. A
log entry will be generated
* describing what was done.
*/
- public void doneFetch(IVersionActivity activities)
+ public void doneFetch(IProcessActivity activities)
throws ManifoldCFException;
/** Close the connection. Call this to end this server connection.
Modified:
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java
(original)
+++
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java
Sun Sep 21 15:04:10 2014
@@ -115,7 +115,7 @@ public class Robots
String protocol, int port, String hostName, String pathString,
String userAgent, String from,
String proxyHost, int proxyPort, String proxyAuthDomain, String
proxyAuthUsername, String proxyAuthPassword,
- IVersionActivity activities, int connectionLimit)
+ IProcessActivity activities, int connectionLimit)
throws ManifoldCFException, ServiceInterruption
{
String identifyingString = protocol + "://" + hostName;
@@ -262,7 +262,7 @@ public class Robots
long currentTime, String pathString,
String userAgent, String from,
String proxyHost, int proxyPort, String proxyAuthDomain, String
proxyAuthUsername, String proxyAuthPassword,
- IVersionActivity activities, int connectionLimit)
+ IProcessActivity activities, int connectionLimit)
throws ServiceInterruption, ManifoldCFException
{
synchronized (this)
@@ -436,7 +436,7 @@ public class Robots
protected void makeValid(IThreadContext threadContext, String
throttleGroupName,
long currentTime, String userAgent, String from,
String proxyHost, int proxyPort, String proxyAuthDomain, String
proxyAuthUsername, String proxyAuthPassword,
- String hostName, IVersionActivity activities, int connectionLimit)
+ String hostName, IProcessActivity activities, int connectionLimit)
throws ServiceInterruption, ManifoldCFException
{
invalidTime = currentTime + 24L * 60L * 60L * 1000L;
@@ -520,7 +520,7 @@ public class Robots
/** Parse the robots.txt file using a reader.
* Is NOT expected to close the stream.
*/
- protected void parseRobotsTxt(BufferedReader r, String hostName,
IVersionActivity activities)
+ protected void parseRobotsTxt(BufferedReader r, String hostName,
IProcessActivity activities)
throws IOException, ManifoldCFException
{
boolean parseCompleted = false;
Modified:
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
(original)
+++
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
Sun Sep 21 15:04:10 2014
@@ -679,7 +679,7 @@ public class ThrottledFetcher
/** Done with the fetch. Call this when the fetch has been completed. A
log entry will be generated
* describing what was done.
*/
- public void doneFetch(IVersionActivity activities)
+ public void doneFetch(IProcessActivity activities)
throws ManifoldCFException
{
Modified:
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java
(original)
+++
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/DataCache.java
Sun Sep 21 15:04:10 2014
@@ -60,7 +60,7 @@ public class DataCache
* cached.
*@return a "checksum" value, to use as a version string.
*/
- public String addData(IVersionActivity activities, String
documentIdentifier, IThrottledConnection connection)
+ public String addData(IProcessActivity activities, String
documentIdentifier, IThrottledConnection connection)
throws ManifoldCFException, ServiceInterruption
{
// Grab the response code, and the content-type header
Modified:
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/IThrottledConnection.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/IThrottledConnection.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/IThrottledConnection.java
(original)
+++
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/IThrottledConnection.java
Sun Sep 21 15:04:10 2014
@@ -116,7 +116,7 @@ public interface IThrottledConnection
/** Done with the fetch. Call this when the fetch has been completed. A
log entry will be generated
* describing what was done.
*/
- public void doneFetch(IVersionActivity activities)
+ public void doneFetch(IProcessActivity activities)
throws ManifoldCFException;
/** Close the connection. Call this to return the connection to
Modified:
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java
(original)
+++
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java
Sun Sep 21 15:04:10 2014
@@ -116,7 +116,7 @@ public class RobotsManager extends org.a
*@return null if the record needs to be fetched, true if fetch is allowed.
*/
public Boolean checkFetchAllowed(String userAgent, String hostName, long
currentTime, String pathString,
- IVersionActivity activities)
+ IProcessActivity activities)
throws ManifoldCFException
{
// Build description objects
@@ -237,7 +237,7 @@ public class RobotsManager extends org.a
/** Read robots data, if it exists.
*@return null if the data doesn't exist at all. Return robots data if it
does.
*/
- protected RobotsData readRobotsData(String hostName, IVersionActivity
activities)
+ protected RobotsData readRobotsData(String hostName, IProcessActivity
activities)
throws ManifoldCFException
{
try
@@ -303,7 +303,7 @@ public class RobotsManager extends org.a
protected ArrayList records = null;
/** Constructor. */
- public RobotsData(InputStream is, long expiration, String hostName,
IVersionActivity activities)
+ public RobotsData(InputStream is, long expiration, String hostName,
IProcessActivity activities)
throws IOException, ManifoldCFException
{
this.expiration = expiration;
@@ -410,7 +410,7 @@ public class RobotsManager extends org.a
/** Parse the robots.txt file using a reader.
* Is NOT expected to close the stream.
*/
- protected void parseRobotsTxt(BufferedReader r, String hostName,
IVersionActivity activities)
+ protected void parseRobotsTxt(BufferedReader r, String hostName,
IProcessActivity activities)
throws IOException, ManifoldCFException
{
boolean parseCompleted = false;
@@ -764,13 +764,13 @@ public class RobotsManager extends org.a
protected RobotsManager thisManager;
protected RobotsData returnValue;
protected HostDescription thisHost;
- protected IVersionActivity activities;
+ protected IProcessActivity activities;
/** Constructor.
*@param manager is the RobotsManager class instance.
*@param objectDescription is the desired object description.
*/
- public HostExecutor(RobotsManager manager, IVersionActivity activities,
HostDescription objectDescription)
+ public HostExecutor(RobotsManager manager, IProcessActivity activities,
HostDescription objectDescription)
{
super();
thisManager = manager;
Modified:
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
(original)
+++
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
Sun Sep 21 15:04:10 2014
@@ -959,7 +959,7 @@ public class ThrottledFetcher
* describing what was done.
*/
@Override
- public void doneFetch(IVersionActivity activities)
+ public void doneFetch(IProcessActivity activities)
throws ManifoldCFException
{
if (fetchType != null)
Modified:
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
(original)
+++
manifoldcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
Sun Sep 21 15:04:10 2014
@@ -5135,7 +5135,7 @@ public class WebcrawlerConnector extends
/** Look up an ipaddress given a non-canonical host name.
*@return appropriate status.
*/
- protected int lookupIPAddress(String documentIdentifier, IVersionActivity
activities, String hostName, long currentTime, StringBuilder ipAddressBuffer)
+ protected int lookupIPAddress(String documentIdentifier, IProcessActivity
activities, String hostName, long currentTime, StringBuilder ipAddressBuffer)
throws ManifoldCFException, ServiceInterruption
{
String eventName = makeDNSEventName(activities,hostName);
@@ -5213,7 +5213,7 @@ public class WebcrawlerConnector extends
*@return appropriate resultstatus code.
*/
protected int checkFetchAllowed(String documentIdentifier, String protocol,
String hostIPAddress, int port, PageCredentials credential,
- IKeystoreManager trustStore, String hostName, String[] binNames, long
currentTime, String pathString, IVersionActivity versionActivities, int
connectionLimit,
+ IKeystoreManager trustStore, String hostName, String[] binNames, long
currentTime, String pathString, IProcessActivity versionActivities, int
connectionLimit,
String proxyHost, int proxyPort, String proxyAuthDomain, String
proxyAuthUsername, String proxyAuthPassword)
throws ManifoldCFException, ServiceInterruption
{
Modified:
manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
(original)
+++
manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
Sun Sep 21 15:04:10 2014
@@ -3099,7 +3099,7 @@ public class WikiConnector extends org.a
/** Obtain document versions for a set of documents.
*/
- protected void getTimestamps(String[] documentIdentifiers,
Map<String,String> versions, IVersionActivity activities)
+ protected void getTimestamps(String[] documentIdentifiers,
Map<String,String> versions, IProcessActivity activities)
throws ManifoldCFException, ServiceInterruption
{
getSession();
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java?rev=1626589&r1=1626588&r2=1626589&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java
Sun Sep 21 15:04:10 2014
@@ -41,7 +41,7 @@ import org.apache.manifoldcf.agents.inte
* (4) In order to determine whether a document needs to be reindexed, the
method checkDocumentNeedsReindexing()
* is available to return an opinion on that matter.
*/
-public interface IProcessActivity extends IVersionActivity
+public interface IProcessActivity extends IHistoryActivity, IEventActivity,
IAbortActivity, IFingerprintActivity, ICarrydownActivity
{
public static final String _rcsid = "@(#)$Id: IProcessActivity.java 988245
2010-08-23 18:39:35Z kwright $";
