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 2014/06/10 08:59:08 UTC
svn commit: r1601557 - in /manifoldcf/branches/CONNECTORS-946/framework:
agents/src/main/java/org/apache/manifoldcf/agents/interfaces/
agents/src/main/java/org/apache/manifoldcf/agents/output/
agents/src/main/java/org/apache/manifoldcf/agents/transform...
Author: kwright
Date: Tue Jun 10 06:59:08 2014
New Revision: 1601557
URL: http://svn.apache.org/r1601557
Log:
Convert all interface specifications to just Specification.
Modified:
manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java
manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/transformation/BaseTransformationConnector.java
manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java
Modified: manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java?rev=1601557&r1=1601556&r2=1601557&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IPipelineConnector.java Tue Jun 10 06:59:08 2014
@@ -54,7 +54,7 @@ public interface IPipelineConnector exte
*@return a string, of unlimited length, which uniquely describes configuration and specification in such a way that
* if two such strings are equal, nothing that affects how or whether the document is indexed will be different.
*/
- public String getPipelineDescription(OutputSpecification spec)
+ public String getPipelineDescription(Specification spec)
throws ManifoldCFException, ServiceInterruption;
/** Detect if a mime type is acceptable or not. This method is used to determine whether it makes sense to fetch a document
@@ -146,7 +146,7 @@ public interface IPipelineConnector exte
*@param connectionSequenceNumber is the unique number of this connection within the job.
*@param tabsArray is an array of tab names. Add to this array any tab names that are specific to the connector.
*/
- public void outputSpecificationHeader(IHTTPOutput out, Locale locale, OutputSpecification os,
+ public void outputSpecificationHeader(IHTTPOutput out, Locale locale, Specification os,
int connectionSequenceNumber, List<String> tabsArray)
throws ManifoldCFException, IOException;
@@ -161,7 +161,7 @@ public interface IPipelineConnector exte
*@param actualSequenceNumber is the connection within the job that has currently been selected.
*@param tabName is the current tab name.
*/
- public void outputSpecificationBody(IHTTPOutput out, Locale locale, OutputSpecification os,
+ public void outputSpecificationBody(IHTTPOutput out, Locale locale, Specification os,
int connectionSequenceNumber, int actualSequenceNumber, String tabName)
throws ManifoldCFException, IOException;
@@ -175,7 +175,7 @@ public interface IPipelineConnector exte
*@param connectionSequenceNumber is the unique number of this connection within the job.
*@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
*/
- public String processSpecificationPost(IPostParameters variableContext, Locale locale, OutputSpecification os,
+ public String processSpecificationPost(IPostParameters variableContext, Locale locale, Specification os,
int connectionSequenceNumber)
throws ManifoldCFException;
@@ -187,7 +187,7 @@ public interface IPipelineConnector exte
*@param connectionSequenceNumber is the unique number of this connection within the job.
*@param os is the current pipeline specification for this job.
*/
- public void viewSpecification(IHTTPOutput out, Locale locale, OutputSpecification os,
+ public void viewSpecification(IHTTPOutput out, Locale locale, Specification os,
int connectionSequenceNumber)
throws ManifoldCFException, IOException;
Modified: manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java?rev=1601557&r1=1601556&r2=1601557&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java Tue Jun 10 06:59:08 2014
@@ -222,10 +222,10 @@ public abstract class BaseOutputConnecto
* if two such strings are equal, nothing that affects how or whether the document is indexed will be different.
*/
@Override
- public String getPipelineDescription(OutputSpecification spec)
+ public String getPipelineDescription(Specification spec)
throws ManifoldCFException, ServiceInterruption
{
- return getOutputDescription(spec);
+ return getOutputDescription((OutputSpecification)spec);
}
/** Get an output version string, given an output specification. The output version string is used to uniquely describe the pertinent details of
@@ -329,6 +329,13 @@ public abstract class BaseOutputConnecto
*@param tabsArray is an array of tab names. Add to this array any tab names that are specific to the connector.
*/
@Override
+ public void outputSpecificationHeader(IHTTPOutput out, Locale locale, Specification os,
+ int connectionSequenceNumber, List<String> tabsArray)
+ throws ManifoldCFException, IOException
+ {
+ outputSpecificationHeader(out,locale,(OutputSpecification)os,tabsArray);
+ }
+
public void outputSpecificationHeader(IHTTPOutput out, Locale locale, OutputSpecification os,
int connectionSequenceNumber, List<String> tabsArray)
throws ManifoldCFException, IOException
@@ -386,13 +393,13 @@ public abstract class BaseOutputConnecto
*@param tabName is the current tab name.
*/
@Override
- public void outputSpecificationBody(IHTTPOutput out, Locale locale, OutputSpecification os,
+ public void outputSpecificationBody(IHTTPOutput out, Locale locale, Specification os,
int connectionSequenceNumber, int actualSequenceNumber, String tabName)
throws ManifoldCFException, IOException
{
- outputSpecificationBody(out,locale,os,tabName);
+ outputSpecificationBody(out,locale,(OutputSpecification)os,tabName);
}
-
+
/** Output the specification body section.
* This method is called in the body section of a job page which has selected an output connection of the current type. Its purpose is to present the required form elements for editing.
* The coder can presume that the HTML that is output from this configuration will be within appropriate <html>, <body>, and <form> tags. The name of the
@@ -432,11 +439,11 @@ public abstract class BaseOutputConnecto
*@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
*/
@Override
- public String processSpecificationPost(IPostParameters variableContext, Locale locale, OutputSpecification os,
+ public String processSpecificationPost(IPostParameters variableContext, Locale locale, Specification os,
int connectionSequenceNumber)
throws ManifoldCFException
{
- return processSpecificationPost(variableContext,locale,os);
+ return processSpecificationPost(variableContext,locale,(OutputSpecification)os);
}
/** Process a specification post.
@@ -477,13 +484,13 @@ public abstract class BaseOutputConnecto
*@param os is the current output specification for this job.
*/
@Override
- public void viewSpecification(IHTTPOutput out, Locale locale, OutputSpecification os,
+ public void viewSpecification(IHTTPOutput out, Locale locale, Specification os,
int connectionSequenceNumber)
throws ManifoldCFException, IOException
{
- viewSpecification(out,locale,os);
+ viewSpecification(out,locale,(OutputSpecification)os);
}
-
+
/** View specification.
* This method is called in the body section of a job's view page. Its purpose is to present the output specification information to the user.
* The coder can presume that the HTML that is output from this configuration will be within appropriate <html> and <body> tags.
Modified: manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/transformation/BaseTransformationConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/transformation/BaseTransformationConnector.java?rev=1601557&r1=1601556&r2=1601557&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/transformation/BaseTransformationConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-946/framework/agents/src/main/java/org/apache/manifoldcf/agents/transformation/BaseTransformationConnector.java Tue Jun 10 06:59:08 2014
@@ -139,7 +139,7 @@ public abstract class BaseTransformation
* if two such strings are equal, nothing that affects how or whether the document is indexed will be different.
*/
@Override
- public String getPipelineDescription(OutputSpecification spec)
+ public String getPipelineDescription(Specification spec)
throws ManifoldCFException, ServiceInterruption
{
return "";
@@ -204,7 +204,7 @@ public abstract class BaseTransformation
*@param tabsArray is an array of tab names. Add to this array any tab names that are specific to the connector.
*/
@Override
- public void outputSpecificationHeader(IHTTPOutput out, Locale locale, OutputSpecification os,
+ public void outputSpecificationHeader(IHTTPOutput out, Locale locale, Specification os,
int connectionSequenceNumber, List<String> tabsArray)
throws ManifoldCFException, IOException
{
@@ -222,7 +222,7 @@ public abstract class BaseTransformation
*@param tabName is the current tab name.
*/
@Override
- public void outputSpecificationBody(IHTTPOutput out, Locale locale, OutputSpecification os,
+ public void outputSpecificationBody(IHTTPOutput out, Locale locale, Specification os,
int connectionSequenceNumber, int actualSequenceNumber, String tabName)
throws ManifoldCFException, IOException
{
@@ -239,7 +239,7 @@ public abstract class BaseTransformation
*@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
*/
@Override
- public String processSpecificationPost(IPostParameters variableContext, Locale locale, OutputSpecification os,
+ public String processSpecificationPost(IPostParameters variableContext, Locale locale, Specification os,
int connectionSequenceNumber)
throws ManifoldCFException
{
@@ -255,7 +255,7 @@ public abstract class BaseTransformation
*@param os is the current output specification for this job.
*/
@Override
- public void viewSpecification(IHTTPOutput out, Locale locale, OutputSpecification os,
+ public void viewSpecification(IHTTPOutput out, Locale locale, Specification os,
int connectionSequenceNumber)
throws ManifoldCFException, IOException
{
Modified: manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java?rev=1601557&r1=1601556&r2=1601557&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java Tue Jun 10 06:59:08 2014
@@ -149,6 +149,13 @@ public abstract class BaseRepositoryConn
*@param jobMode is an integer describing how the job is being run, whether continuous or once-only.
*/
@Override
+ public void addSeedDocuments(ISeedingActivity activities, Specification spec,
+ long startTime, long endTime, int jobMode)
+ throws ManifoldCFException, ServiceInterruption
+ {
+ addSeedDocuments(activities,(DocumentSpecification)spec,startTime,endTime,jobMode);
+ }
+
public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
long startTime, long endTime, int jobMode)
throws ManifoldCFException, ServiceInterruption
@@ -293,6 +300,13 @@ public abstract class BaseRepositoryConn
*/
@Override
public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
+ Specification spec, int jobMode, boolean usesDefaultAuthority)
+ throws ManifoldCFException, ServiceInterruption
+ {
+ return getDocumentVersions(documentIdentifiers,oldVersions,activities,(DocumentSpecification)spec,jobMode,usesDefaultAuthority);
+ }
+
+ public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
throws ManifoldCFException, ServiceInterruption
{
@@ -427,6 +441,13 @@ public abstract class BaseRepositoryConn
*/
@Override
public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities,
+ Specification spec, boolean[] scanOnly, int jobMode)
+ throws ManifoldCFException, ServiceInterruption
+ {
+ processDocuments(documentIdentifiers,versions,activities,(DocumentSpecification)spec,scanOnly,jobMode);
+ }
+
+ public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities,
DocumentSpecification spec, boolean[] scanOnly, int jobMode)
throws ManifoldCFException, ServiceInterruption
{
@@ -491,11 +512,11 @@ public abstract class BaseRepositoryConn
*@param tabsArray is an array of tab names. Add to this array any tab names that are specific to the connector.
*/
@Override
- public void outputSpecificationHeader(IHTTPOutput out, Locale locale, DocumentSpecification ds,
+ public void outputSpecificationHeader(IHTTPOutput out, Locale locale, Specification ds,
int connectionSequenceNumber, List<String> tabsArray)
throws ManifoldCFException, IOException
{
- outputSpecificationHeader(out,locale,ds,tabsArray);
+ outputSpecificationHeader(out,locale,(DocumentSpecification)ds,tabsArray);
}
/** Output the specification header section.
@@ -554,11 +575,11 @@ public abstract class BaseRepositoryConn
* the job.
*/
@Override
- public void outputSpecificationBody(IHTTPOutput out, Locale locale, DocumentSpecification ds,
+ public void outputSpecificationBody(IHTTPOutput out, Locale locale, Specification ds,
int connectionSequenceNumber, int actualSequenceNumber, String tabName)
throws ManifoldCFException, IOException
{
- outputSpecificationBody(out,locale,ds,tabName);
+ outputSpecificationBody(out,locale,(DocumentSpecification)ds,tabName);
}
/** Output the specification body section.
@@ -604,11 +625,11 @@ public abstract class BaseRepositoryConn
* the job (and cause a redirection to an error page).
*/
@Override
- public String processSpecificationPost(IPostParameters variableContext, Locale locale, DocumentSpecification ds,
+ public String processSpecificationPost(IPostParameters variableContext, Locale locale, Specification ds,
int connectionSequenceNumber)
throws ManifoldCFException
{
- return processSpecificationPost(variableContext,locale,ds);
+ return processSpecificationPost(variableContext,locale,(DocumentSpecification)ds);
}
/** Process a specification post.
@@ -653,11 +674,11 @@ public abstract class BaseRepositoryConn
*@param connectionSequenceNumber is the unique number of this connection within the job.
*/
@Override
- public void viewSpecification(IHTTPOutput out, Locale locale, DocumentSpecification ds,
+ public void viewSpecification(IHTTPOutput out, Locale locale, Specification ds,
int connectionSequenceNumber)
throws ManifoldCFException, IOException
{
- viewSpecification(out,locale,ds);
+ viewSpecification(out,locale,(DocumentSpecification)ds);
}
/** View specification.
Modified: manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java?rev=1601557&r1=1601556&r2=1601557&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java Tue Jun 10 06:59:08 2014
@@ -178,7 +178,7 @@ public interface IRepositoryConnector ex
*@param endTime is the end of the time range to consider, exclusive.
*@param jobMode is an integer describing how the job is being run, whether continuous or once-only.
*/
- public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
+ public void addSeedDocuments(ISeedingActivity activities, Specification spec,
long startTime, long endTime, int jobMode)
throws ManifoldCFException, ServiceInterruption;
@@ -201,7 +201,7 @@ public interface IRepositoryConnector ex
* will always be processed.
*/
public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activities,
- DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
+ Specification spec, int jobMode, boolean usesDefaultAuthority)
throws ManifoldCFException, ServiceInterruption;
/** Process a set of documents.
@@ -220,7 +220,7 @@ public interface IRepositoryConnector ex
*@param jobMode is an integer describing how the job is being run, whether continuous or once-only.
*/
public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities,
- DocumentSpecification spec, boolean[] scanOnly, int jobMode)
+ Specification spec, boolean[] scanOnly, int jobMode)
throws ManifoldCFException, ServiceInterruption;
/** Free a set of documents. This method is called for all documents whose versions have been fetched using
@@ -276,7 +276,7 @@ public interface IRepositoryConnector ex
*@param connectionSequenceNumber is the unique number of this connection within the job.
*@param tabsArray is an array of tab names. Add to this array any tab names that are specific to the connector.
*/
- public void outputSpecificationHeader(IHTTPOutput out, Locale locale, DocumentSpecification ds,
+ public void outputSpecificationHeader(IHTTPOutput out, Locale locale, Specification ds,
int connectionSequenceNumber, List<String> tabsArray)
throws ManifoldCFException, IOException;
@@ -294,7 +294,7 @@ public interface IRepositoryConnector ex
*@param tabName is the current tab name. (actualSequenceNumber, tabName) form a unique tuple within
* the job.
*/
- public void outputSpecificationBody(IHTTPOutput out, Locale locale, DocumentSpecification ds,
+ public void outputSpecificationBody(IHTTPOutput out, Locale locale, Specification ds,
int connectionSequenceNumber, int actualSequenceNumber, String tabName)
throws ManifoldCFException, IOException;
@@ -310,7 +310,7 @@ public interface IRepositoryConnector ex
*@return null if all is well, or a string error message if there is an error that should prevent saving of
* the job (and cause a redirection to an error page).
*/
- public String processSpecificationPost(IPostParameters variableContext, Locale locale, DocumentSpecification ds,
+ public String processSpecificationPost(IPostParameters variableContext, Locale locale, Specification ds,
int connectionSequenceNumber)
throws ManifoldCFException;
@@ -324,7 +324,7 @@ public interface IRepositoryConnector ex
*@param ds is the current document specification for this job.
*@param connectionSequenceNumber is the unique number of this connection within the job.
*/
- public void viewSpecification(IHTTPOutput out, Locale locale, DocumentSpecification ds,
+ public void viewSpecification(IHTTPOutput out, Locale locale, Specification ds,
int connectionSequenceNumber)
throws ManifoldCFException, IOException;