incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1130033 - in /incubator/lcf/branches/CONNECTORS-203: connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ connectors/documentum/connector/src/main/java/org/apache/manifoldcf/craw...
Date Wed, 01 Jun 2011 07:41:51 GMT
Author: kwright
Date: Wed Jun  1 07:41:50 2011
New Revision: 1130033

URL: http://svn.apache.org/viewvc?rev=1130033&view=rev
Log:
Change the main interfaces to proper use of generics, and include backwards-compatibility
stubs in base classes.

Modified:
    incubator/lcf/branches/CONNECTORS-203/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
    incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
    incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
    incubator/lcf/branches/CONNECTORS-203/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
    incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java
    incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
    incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java
    incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java
    incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
    incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java

Modified: incubator/lcf/branches/CONNECTORS-203/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
Wed Jun  1 07:41:50 2011
@@ -74,6 +74,7 @@ public class ActiveDirectoryAuthority ex
 
   /** Set thread context.
   */
+  @Override
   public void setThreadContext(IThreadContext tc)
     throws ManifoldCFException
   {
@@ -83,6 +84,7 @@ public class ActiveDirectoryAuthority ex
   
   /** Clear thread context.
   */
+  @Override
   public void clearThreadContext()
   {
     super.clearThreadContext();
@@ -92,6 +94,7 @@ public class ActiveDirectoryAuthority ex
   /** Connect.  The configuration parameters are included.
   *@param configParams are the configuration parameters for this connection.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -111,6 +114,7 @@ public class ActiveDirectoryAuthority ex
 
   /** Check connection for sanity.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -120,6 +124,7 @@ public class ActiveDirectoryAuthority ex
 
   /** Poll.  The connection should be closed if it has been idle for too long.
   */
+  @Override
   public void poll()
     throws ManifoldCFException
   {
@@ -148,6 +153,7 @@ public class ActiveDirectoryAuthority ex
   
   /** Close the connection.  Call this before discarding the repository connector.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -165,6 +171,7 @@ public class ActiveDirectoryAuthority ex
   *@return the response tokens (according to the current authority).
   * (Should throws an exception only when a condition cannot be properly described within
the authorization response object.)
   */
+  @Override
   public AuthorizationResponse getAuthorizationResponse(String userName)
     throws ManifoldCFException
   {
@@ -297,6 +304,7 @@ public class ActiveDirectoryAuthority ex
   *@param userName is the user name or identifier.
   *@return the default response tokens, presuming that the connect method fails.
   */
+  @Override
   public AuthorizationResponse getDefaultAuthorizationResponse(String userName)
   {
     // The default response if the getConnection method fails
@@ -316,7 +324,8 @@ public class ActiveDirectoryAuthority ex
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific
to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, ArrayList tabsArray)
+  @Override
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Domain Controller");
@@ -368,6 +377,7 @@ public class ActiveDirectoryAuthority ex
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -442,6 +452,7 @@ public class ActiveDirectoryAuthority ex
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@return null if all is well, or a string error message if there is an error that should
prevent saving of the connection (and cause a redirection to an error page).
   */
+  @Override
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext,
ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -470,6 +481,7 @@ public class ActiveDirectoryAuthority ex
   *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   */
+  @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters)
     throws ManifoldCFException, IOException
   {

Modified: incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
Wed Jun  1 07:41:50 2011
@@ -73,6 +73,7 @@ public class AuthorityConnector extends 
 
   /** Set thread context.
   */
+  @Override
   public void setThreadContext(IThreadContext tc)
     throws ManifoldCFException
   {
@@ -82,6 +83,7 @@ public class AuthorityConnector extends 
   
   /** Clear thread context.
   */
+  @Override
   public void clearThreadContext()
   {
     super.clearThreadContext();
@@ -596,6 +598,7 @@ public class AuthorityConnector extends 
   *@return the response tokens (according to the current authority).
   * (Should throws an exception only when a condition cannot be properly described within
the authorization response object.)
   */
+  @Override
   public AuthorizationResponse getAuthorizationResponse(String strUserNamePassedIn)
     throws ManifoldCFException
   {
@@ -799,6 +802,7 @@ public class AuthorityConnector extends 
   *@param userName is the user name or identifier.
   *@return the default response tokens, presuming that the connect method fails.
   */
+  @Override
   public AuthorizationResponse getDefaultAuthorizationResponse(String userName)
   {
     return unreachableResponse;
@@ -837,6 +841,7 @@ public class AuthorityConnector extends 
   /** Test the connection.  Returns a string describing the connection integrity.
   *@return the connection's status as a displayable string.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -864,6 +869,7 @@ public class AuthorityConnector extends 
   }
 
 
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -898,6 +904,7 @@ public class AuthorityConnector extends 
 
   /** Disconnect from Documentum.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -955,14 +962,10 @@ public class AuthorityConnector extends 
     domain = null;
   }
 
-  public String getJSPFolder()
-  {
-    return "DCTM";
-  }
-
   /** This method is periodically called for all connectors that are connected but not
   * in active use.
   */
+  @Override
   public void poll()
     throws ManifoldCFException
   {
@@ -982,7 +985,8 @@ public class AuthorityConnector extends 
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific
to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, ArrayList tabsArray)
+  @Override
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Docbase");
@@ -1031,6 +1035,7 @@ public class AuthorityConnector extends 
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -1168,6 +1173,7 @@ public class AuthorityConnector extends 
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@return null if all is well, or a string error message if there is an error that should
prevent saving of the connection (and cause a redirection to an error page).
   */
+  @Override
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext,
ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -1205,6 +1211,7 @@ public class AuthorityConnector extends 
   *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   */
+  @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters)
     throws ManifoldCFException, IOException
   {

Modified: incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
Wed Jun  1 07:41:50 2011
@@ -550,6 +550,7 @@ public class DCTM extends org.apache.man
 
   /** Let the crawler know the completeness of the information we are giving it.
   */
+  @Override
   public int getConnectorModel()
   {
     // For documentum, originally we thought it would return the deleted objects when we
@@ -563,21 +564,16 @@ public class DCTM extends org.apache.man
   /** Return the list of activities that this connector supports (i.e. writes into the log).
   *@return the list.
   */
+  @Override
   public String[] getActivitiesList()
   {
     return new String[]{ACTIVITY_FETCH};
   }
 
-  /** Get the folder for the jsps.
-  */
-  public String getJSPFolder()
-  {
-    return "DCTM";
-  }
-
   /** Test the connection.  Returns a string describing the connection integrity.
   *@return the connection's status as a displayable string.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -611,6 +607,7 @@ public class DCTM extends org.apache.man
   *@param configParams are the configuration parameters for this connection.
   * Note well: There are no exceptions allowed from this call, since it is expected to mainly
establish connection parameters.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -628,6 +625,7 @@ public class DCTM extends org.apache.man
   /** This method is periodically called for all connectors that are connected but not
   * in active use.
   */
+  @Override
   public void poll()
     throws ManifoldCFException
   {
@@ -636,6 +634,7 @@ public class DCTM extends org.apache.man
 
   /** Disconnect from Documentum.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -713,6 +712,7 @@ public class DCTM extends org.apache.man
 
   /** Get the bin (so throttling makes sense).  We will bin by docbase.
   */
+  @Override
   public String[] getBinNames(String documentIdentifier)
   {
     // Previously, this actually established a session and went back-and-forth with
@@ -851,6 +851,7 @@ public class DCTM extends org.apache.man
   *@param command is the command, which is taken directly from the API request.
   *@return true if the resource is found, false if not.  In either case, output may be filled
in.
   */
+  @Override
   public boolean requestInfo(Configuration output, String command)
     throws ManifoldCFException
   {
@@ -962,6 +963,7 @@ public class DCTM extends org.apache.man
   *@param startTime is the beginning of the time range to consider, inclusive.
   *@param endTime is the end of the time range to consider, exclusive.
   */
+  @Override
   public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
     long startTime, long endTime)
     throws ManifoldCFException, ServiceInterruption
@@ -1327,6 +1329,7 @@ public class DCTM extends org.apache.man
   * Empty version strings indicate that there is no versioning ability for the corresponding
document, and the document
   * will always be processed.
   */
+  @Override
   public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions,
IVersionActivity activity,
     DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
     throws ManifoldCFException, ServiceInterruption
@@ -1708,6 +1711,7 @@ public class DCTM extends org.apache.man
 
   /** Process documents whose versions indicate they need processing.
   */
+  @Override
   public void processDocuments(String[] documentIdentifiers, String[] documentVersions,
     IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly)
     throws ManifoldCFException, ServiceInterruption
@@ -1847,12 +1851,14 @@ public class DCTM extends org.apache.man
   *@param documentIdentifiers is the set of document identifiers.
   *@param versions is the corresponding set of version identifiers (individual identifiers
may be null).
   */
+  @Override
   public void releaseDocumentVersions(String[] documentIdentifiers, String[] versions)
     throws ManifoldCFException
   {
     // Nothing to do
   }
 
+  @Override
   public int getMaxDocumentRequest()
   {
     // 1 at a time, since this connector does not deal with documents en masse, but one at
a time.
@@ -1875,7 +1881,8 @@ public class DCTM extends org.apache.man
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific
to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, ArrayList tabsArray)
+  @Override
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Docbase");
@@ -1931,6 +1938,7 @@ public class DCTM extends org.apache.man
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -2012,6 +2020,7 @@ public class DCTM extends org.apache.man
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@return null if all is well, or a string error message if there is an error that should
prevent saving of the connection (and cause a redirection to an error page).
   */
+  @Override
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext,
ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -2045,6 +2054,7 @@ public class DCTM extends org.apache.man
   *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   */
+  @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters)
     throws ManifoldCFException, IOException
   {
@@ -2093,6 +2103,7 @@ public class DCTM extends org.apache.man
   *@param ds is the current document specification for this job.
   *@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, DocumentSpecification ds, ArrayList
tabsArray)
     throws ManifoldCFException, IOException
   {
@@ -2177,6 +2188,7 @@ public class DCTM extends org.apache.man
   *@param ds is the current document specification for this job.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputSpecificationBody(IHTTPOutput out, DocumentSpecification ds, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -2864,6 +2876,7 @@ public class DCTM extends org.apache.man
   *@param ds is the current document specification for this 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).
   */
+  @Override
   public String processSpecificationPost(IPostParameters variableContext, DocumentSpecification
ds)
     throws ManifoldCFException
   {
@@ -3172,6 +3185,7 @@ public class DCTM extends org.apache.man
   *@param out is the output to which any HTML should be sent.
   *@param ds is the current document specification for this job.
   */
+  @Override
   public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
     throws ManifoldCFException, IOException
   {

Modified: incubator/lcf/branches/CONNECTORS-203/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
Wed Jun  1 07:41:50 2011
@@ -75,26 +75,18 @@ public class GTSConnector extends org.ap
   /** Return the list of activities that this connector supports (i.e. writes into the log).
   *@return the list.
   */
+  @Override
   public String[] getActivitiesList()
   {
     return new String[]{INGEST_ACTIVITY,REMOVE_ACTIVITY};
   }
 
-  /** Return the path for the UI interface JSP elements.
-  * This method should return the name of the folder, under the <webapp>/output/
-  * area, where the appropriate JSP's can be found.  The name should NOT have a slash in
it.
-  *@return the folder part
-  */
-  public String getJSPFolder()
-  {
-    return "gts";
-  }
-
   /** Connect.
   *@param configParameters is the set of configuration parameters, which
   * in this case describe the target appliance, basic auth configuration, etc.  (This formerly
came
   * out of the ini file.)
   */
+  @Override
   public void connect(ConfigParams configParameters)
   {
     super.connect(configParameters);
@@ -102,6 +94,7 @@ public class GTSConnector extends org.ap
 
   /** Close the connection.  Call this before discarding the connection.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -128,6 +121,7 @@ public class GTSConnector extends org.ap
   /** Test the connection.  Returns a string describing the connection integrity.
   *@return the connection's status as a displayable string.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -205,6 +199,7 @@ public class GTSConnector extends org.ap
   *@param mimeType is the mime type of the document.
   *@return true if the mime type is indexable by this connector.
   */
+  @Override
   public boolean checkMimeTypeIndexable(String mimeType)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -217,6 +212,7 @@ public class GTSConnector extends org.ap
   *@param localFile is the local file to check.
   *@return true if the file is indexable.
   */
+  @Override
   public boolean checkDocumentIndexable(File localFile)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -241,6 +237,7 @@ public class GTSConnector extends org.ap
   *@return a string, of unlimited length, which uniquely describes output configuration and
specification in such a way that if two such strings are equal,
   * the document will not need to be sent again to the output data store.
   */
+  @Override
   public String getOutputDescription(OutputSpecification spec)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -302,6 +299,7 @@ public class GTSConnector extends org.ap
   *@param activities is the handle to an object that the implementer of an output connector
may use to perform operations, such as logging processing activity.
   *@return the document status (accepted or permanently rejected).
   */
+  @Override
   public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument
document, String authorityNameString, IOutputAddActivity activities)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -335,6 +333,7 @@ public class GTSConnector extends org.ap
   *@param outputDescription is the last description string that was constructed for this
document by the getOutputDescription() method above.
   *@param activities is the handle to an object that the implementer of an output connector
may use to perform operations, such as logging processing activity.
   */
+  @Override
   public void removeDocument(String documentURI, String outputDescription, IOutputRemoveActivity
activities)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -361,7 +360,8 @@ public class GTSConnector extends org.ap
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific
to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, ArrayList tabsArray)
+  @Override
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Appliance");
@@ -407,6 +407,7 @@ public class GTSConnector extends org.ap
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -479,6 +480,7 @@ public class GTSConnector extends org.ap
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@return null if all is well, or a string error message if there is an error that should
prevent saving of the connection (and cause a redirection to an error page).
   */
+  @Override
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext,
ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -508,6 +510,7 @@ public class GTSConnector extends org.ap
   *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   */
+  @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters)
     throws ManifoldCFException, IOException
   {
@@ -558,6 +561,7 @@ public class GTSConnector extends org.ap
   *@param os is the current output specification for this job.
   *@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, OutputSpecification os, ArrayList
tabsArray)
     throws ManifoldCFException, IOException
   {
@@ -592,6 +596,7 @@ public class GTSConnector extends org.ap
   *@param os is the current output specification for this job.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputSpecificationBody(IHTTPOutput out, OutputSpecification os, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -670,6 +675,7 @@ public class GTSConnector extends org.ap
   *@param os is the current output specification for this 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).
   */
+  @Override
   public String processSpecificationPost(IPostParameters variableContext, OutputSpecification
os)
     throws ManifoldCFException
   {
@@ -721,6 +727,7 @@ public class GTSConnector extends org.ap
   *@param out is the output to which any HTML should be sent.
   *@param os is the current output specification for this job.
   */
+  @Override
   public void viewSpecification(IHTTPOutput out, OutputSpecification os)
     throws ManifoldCFException, IOException
   {

Modified: incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java
Wed Jun  1 07:41:50 2011
@@ -155,7 +155,7 @@ public interface IOutputConnector extend
   *@param os is the current output specification for this 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, OutputSpecification os, ArrayList
tabsArray)
+  public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification os, List<String>
tabsArray)
     throws ManifoldCFException, IOException;
   
   /** Output the specification body section.

Modified: incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
Wed Jun  1 07:41:50 2011
@@ -101,6 +101,57 @@ public abstract class BaseOutputConnecto
     return true;
   }
 
+  /** Get an output version string, given an output specification.  The output version string
is used to uniquely describe the pertinent details of
+  * the output specification and the configuration, to allow the Connector Framework to determine
whether a document will need to be output again.
+  * Note that the contents of the document cannot be considered by this method, and that
a different version string (defined in IRepositoryConnector)
+  * is used to describe the version of the actual document.
+  *
+  * This method presumes that the connector object has been configured, and it is thus able
to communicate with the output data store should that be
+  * necessary.
+  *@param spec is the current output specification for the job that is doing the crawling.
+  *@return a string, of unlimited length, which uniquely describes output configuration and
specification in such a way that if two such strings are equal,
+  * the document will not need to be sent again to the output data store.
+  */
+  public String getOutputDescription(OutputSpecification spec)
+    throws ManifoldCFException, ServiceInterruption
+  {
+    // Empty string from the base class.
+    return "";
+  }
+
+  /** Add (or replace) a document in the output data store using the connector.
+  * This method presumes that the connector object has been configured, and it is thus able
to communicate with the output data store should that be
+  * necessary.
+  * The OutputSpecification is *not* provided to this method, because the goal is consistency,
and if output is done it must be consistent with the
+  * output description, since that was what was partly used to determine if output should
be taking place.  So it may be necessary for this method to decode
+  * an output description string in order to determine what should be done.
+  *@param documentURI is the URI of the document.  The URI is presumed to be the unique identifier
which the output data store will use to process
+  * and serve the document.  This URI is constructed by the repository connector which fetches
the document, and is thus universal across all output connectors.
+  *@param outputDescription is the description string that was constructed for this document
by the getOutputDescription() method.
+  *@param document is the document data to be processed (handed to the output data store).
+  *@param authorityNameString is the name of the authority responsible for authorizing any
access tokens passed in with the repository document.  May be null.
+  *@param activities is the handle to an object that the implementer of an output connector
may use to perform operations, such as logging processing activity.
+  *@return the document status (accepted or permanently rejected).
+  */
+  public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument
document, String authorityNameString, IOutputAddActivity activities)
+    throws ManifoldCFException, ServiceInterruption
+  {
+    return DOCUMENTSTATUS_REJECTED;
+  }
+
+  /** Remove a document using the connector.
+  * Note that the last outputDescription is included, since it may be necessary for the connector
to use such information to know how to properly remove the document.
+  *@param documentURI is the URI of the document.  The URI is presumed to be the unique identifier
which the output data store will use to process
+  * and serve the document.  This URI is constructed by the repository connector which fetches
the document, and is thus universal across all output connectors.
+  *@param outputDescription is the last description string that was constructed for this
document by the getOutputDescription() method above.
+  *@param activities is the handle to an object that the implementer of an output connector
may use to perform operations, such as logging processing activity.
+  */
+  public void removeDocument(String documentURI, String outputDescription, IOutputRemoveActivity
activities)
+    throws ManifoldCFException, ServiceInterruption
+  {
+    // Does nothing in the base class
+  }
+  
   // UI support methods.
   //
   // These support methods come in two varieties.  The first bunch is involved in setting
up connection configuration information.  The second bunch
@@ -117,7 +168,19 @@ public abstract class BaseOutputConnecto
   *@param os is the current output specification for this 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, OutputSpecification os, ArrayList
tabsArray)
+  public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification os, List<String>
tabsArray)
+    throws ManifoldCFException, IOException
+  {
+    // Call the old method signature, for backwards compatibility
+    ArrayList<Object> localTabsArray = new ArrayList<Object>();
+    outputSpecificationHeader(out,os,localTabsArray);
+    for (Object o : localTabsArray)
+    {
+      tabsArray.add((String)o);
+    }
+  }
+  
+  public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification os, ArrayList<Object>
tabsArray)
     throws ManifoldCFException, IOException
   {
   }

Modified: incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java
Wed Jun  1 07:41:50 2011
@@ -127,7 +127,19 @@ public abstract class BaseConnector impl
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific
to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, ArrayList tabsArray)
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, List<String> tabsArray)
+    throws ManifoldCFException, IOException
+  {
+    // Call the old method signature, for backwards compatibility
+    ArrayList<Object> localTabsArray = new ArrayList<Object>();
+    outputConfigurationHeader(threadContext,out,parameters,localTabsArray);
+    for (Object o : localTabsArray)
+    {
+      tabsArray.add((String)o);
+    }
+  }
+  
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, ArrayList<Object> tabsArray)
     throws ManifoldCFException, IOException
   {
   }

Modified: incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java
Wed Jun  1 07:41:50 2011
@@ -99,7 +99,7 @@ public interface IConnector
   *@param parameters are the configuration parameters, as they currently exist, for this
connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific
to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, ArrayList tabsArray)
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException;
   
   /** Output the configuration body section.

Modified: incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
Wed Jun  1 07:41:50 2011
@@ -458,7 +458,19 @@ public abstract class BaseRepositoryConn
   *@param ds is the current document specification for this 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, DocumentSpecification ds, ArrayList
tabsArray)
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
+    throws ManifoldCFException, IOException
+  {
+    // Call the old method signature, for backwards compatibility
+    ArrayList<Object> localTabsArray = new ArrayList<Object>();
+    outputSpecificationHeader(out,ds,localTabsArray);
+    for (Object o : localTabsArray)
+    {
+      tabsArray.add((String)o);
+    }
+  }
+  
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, ArrayList<Object>
tabsArray)
     throws ManifoldCFException, IOException
   {
   }

Modified: incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java?rev=1130033&r1=1130032&r2=1130033&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java
Wed Jun  1 07:41:50 2011
@@ -243,7 +243,7 @@ public interface IRepositoryConnector ex
   *@param ds is the current document specification for this 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, DocumentSpecification ds, ArrayList
tabsArray)
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException;
   
   /** Output the specification body section.



Mime
View raw message