Author: kwright
Date: Tue Jul 1 18:23:07 2014
New Revision: 1607157
URL: http://svn.apache.org/r1607157
Log:
Minor cleanup. Deprecate direct references to OutputSpecification in
IIncrementalIngester
Modified:
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Modified:
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1607157&r1=1607156&r2=1607157&view=diff
==============================================================================
---
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
(original)
+++
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Tue Jul 1 18:23:07 2014
@@ -517,10 +517,23 @@ public class IncrementalIngester extends
*@param spec is the output specification.
*@return the description string.
*/
+ @Deprecated
@Override
public String getOutputDescription(String outputConnectionName,
OutputSpecification spec)
throws ManifoldCFException, ServiceInterruption
{
+ return getOutputDescription(outputConnectionName,(Specification)spec);
+ }
+
+ /** Get an output version string for a document.
+ *@param outputConnectionName is the name of the output connection associated
with this action.
+ *@param spec is the output specification.
+ *@return the description string.
+ */
+ @Override
+ public String getOutputDescription(String outputConnectionName,
Specification spec)
+ throws ManifoldCFException, ServiceInterruption
+ {
IOutputConnection connection =
connectionManager.load(outputConnectionName);
IOutputConnector connector = outputConnectorPool.grab(connection);
if (connector == null)
@@ -542,7 +555,7 @@ public class IncrementalIngester extends
*@param spec is the transformation specification.
*@return the description string.
*/
- public String getTransformationDescription(String
transformationConnectionName, OutputSpecification spec)
+ public String getTransformationDescription(String
transformationConnectionName, Specification spec)
throws ManifoldCFException, ServiceInterruption
{
ITransformationConnection connection =
transformationConnectionManager.load(transformationConnectionName);
Modified:
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java?rev=1607157&r1=1607156&r2=1607157&view=diff
==============================================================================
---
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java
(original)
+++
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IIncrementalIngester.java
Tue Jul 1 18:23:07 2014
@@ -72,15 +72,24 @@ public interface IIncrementalIngester
*@param spec is the output specification.
*@return the description string.
*/
+ @Deprecated
public String getOutputDescription(String outputConnectionName,
OutputSpecification spec)
throws ManifoldCFException, ServiceInterruption;
+ /** Get an output version string for a document.
+ *@param outputConnectionName is the name of the output connection associated
with this action.
+ *@param spec is the output specification.
+ *@return the description string.
+ */
+ public String getOutputDescription(String outputConnectionName,
Specification spec)
+ throws ManifoldCFException, ServiceInterruption;
+
/** Get transformation version string for a document.
*@param transformationConnectionName is the names of the transformation
connection associated with this action.
*@param spec is the transformation specification.
*@return the description string.
*/
- public String getTransformationDescription(String
transformationConnectionName, OutputSpecification spec)
+ public String getTransformationDescription(String
transformationConnectionName, Specification spec)
throws ManifoldCFException, ServiceInterruption;
/** Check if a mime type is indexable.
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1607157&r1=1607156&r2=1607157&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Tue Jul 1 18:23:07 2014
@@ -76,7 +76,6 @@ public class WorkerThread extends Thread
IJobManager jobManager = JobManagerFactory.make(threadContext);
IBinManager binManager = BinManagerFactory.make(threadContext);
IRepositoryConnectionManager connMgr =
RepositoryConnectionManagerFactory.make(threadContext);
- IOutputConnectionManager outputMgr =
OutputConnectionManagerFactory.make(threadContext);
IReprioritizationTracker rt =
ReprioritizationTrackerFactory.make(threadContext);
IRepositoryConnectorPool repositoryConnectorPool =
RepositoryConnectorPoolFactory.make(threadContext);
