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 2011/05/23 12:55:24 UTC
svn commit: r1126427 - in /incubator/lcf/trunk: ./
framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/
Author: kwright
Date: Mon May 23 10:55:24 2011
New Revision: 1126427
URL: http://svn.apache.org/viewvc?rev=1126427&view=rev
Log:
Fix for CONNECTORS-201.
Added:
incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ICarrydownActivity.java (with props)
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java
incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IVersionActivity.java
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1126427&r1=1126426&r2=1126427&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Mon May 23 10:55:24 2011
@@ -3,6 +3,10 @@ $Id$
======================= 0.3-dev =========================
+CONNECTORS-201: Add activity interface ICarrydownActivity to allow
+sharing of functionality across IVersionActivity and IProcessActivity.
+(Karl Wright)
+
CONNECTORS-200: Interpret TikaExceptions as being permanent failures.
(Erlend Garåsen, Shinichiro Abe, Karl Wright)
Added: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ICarrydownActivity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ICarrydownActivity.java?rev=1126427&view=auto
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ICarrydownActivity.java (added)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ICarrydownActivity.java Mon May 23 10:55:24 2011
@@ -0,0 +1,44 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.crawler.interfaces;
+
+import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.agents.interfaces.*;
+
+/** This interface describes activities related to carry-down information.
+*/
+public interface ICarrydownActivity
+{
+ /** Retrieve data passed from parents to a specified child document.
+ *@param localIdentifier is the document identifier of the document we want the recorded data for.
+ *@param dataName is the name of the data items to retrieve.
+ *@return an array containing the unique data values passed from ALL parents. Note that these are in no particular order, and there will not be any duplicates.
+ */
+ public String[] retrieveParentData(String localIdentifier, String dataName)
+ throws ManifoldCFException;
+
+ /** Retrieve data passed from parents to a specified child document.
+ *@param localIdentifier is the document identifier of the document we want the recorded data for.
+ *@param dataName is the name of the data items to retrieve.
+ *@return an array containing the unique data values passed from ALL parents. Note that these are in no particular order, and there will not be any duplicates.
+ */
+ public CharacterInput[] retrieveParentDataAsFiles(String localIdentifier, String dataName)
+ throws ManifoldCFException;
+
+}
Propchange: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ICarrydownActivity.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/ICarrydownActivity.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java?rev=1126427&r1=1126426&r2=1126427&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IProcessActivity.java Mon May 23 10:55:24 2011
@@ -24,7 +24,8 @@ import java.util.*;
/** This interface abstracts from the activities that a fetched document processor can do.
*/
-public interface IProcessActivity extends IHistoryActivity, IEventActivity, IAbortActivity, IFingerprintActivity
+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 $";
@@ -100,21 +101,6 @@ public interface IProcessActivity extend
public void addDocumentReference(String localIdentifier)
throws ManifoldCFException;
- /** Retrieve data passed from parents to a specified child document.
- *@param localIdentifier is the document identifier of the document we want the recorded data for.
- *@param dataName is the name of the data items to retrieve.
- *@return an array containing the unique data values passed from ALL parents. Note that these are in no particular order, and there will not be any duplicates.
- */
- public String[] retrieveParentData(String localIdentifier, String dataName)
- throws ManifoldCFException;
-
- /** Retrieve data passed from parents to a specified child document.
- *@param localIdentifier is the document identifier of the document we want the recorded data for.
- *@param dataName is the name of the data items to retrieve.
- *@return an array containing the unique data values passed from ALL parents. Note that these are in no particular order, and there will not be any duplicates.
- */
- public CharacterInput[] retrieveParentDataAsFiles(String localIdentifier, String dataName)
- throws ManifoldCFException;
/** Record a document version, but don't ingest it.
*@param localIdentifier is the document identifier.
Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IVersionActivity.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IVersionActivity.java?rev=1126427&r1=1126426&r2=1126427&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IVersionActivity.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IVersionActivity.java Mon May 23 10:55:24 2011
@@ -25,24 +25,9 @@ import java.util.*;
/** This interface abstracts from the activities that a versioning operation can do.
* See IProcessActivity for a description of the event model.
*/
-public interface IVersionActivity extends IHistoryActivity, IEventActivity, IAbortActivity, IFingerprintActivity
+public interface IVersionActivity extends IHistoryActivity, IEventActivity, IAbortActivity, IFingerprintActivity,
+ ICarrydownActivity
{
public static final String _rcsid = "@(#)$Id: IVersionActivity.java 988245 2010-08-23 18:39:35Z kwright $";
- /** Retrieve data passed from parents to a specified child document.
- *@param localIdentifier is the document identifier of the document we want the recorded data for.
- *@param dataName is the name of the data items to retrieve.
- *@return an array containing the unique data values passed from ALL parents. Note that these are in no particular order, and there will not be any duplicates.
- */
- public String[] retrieveParentData(String localIdentifier, String dataName)
- throws ManifoldCFException;
-
- /** Retrieve data passed from parents to a specified child document.
- *@param localIdentifier is the document identifier of the document we want the recorded data for.
- *@param dataName is the name of the data items to retrieve.
- *@return an array containing the unique data values passed from ALL parents. Note that these are in no particular order, and there will not be any duplicates.
- */
- public CharacterInput[] retrieveParentDataAsFiles(String localIdentifier, String dataName)
- throws ManifoldCFException;
-
}