incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1130363 - in /incubator/lcf/branches/CONNECTORS-203/connectors: documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/ filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/ filesystem/...
Date Thu, 02 Jun 2011 00:28:47 GMT
Author: kwright
Date: Thu Jun  2 00:28:46 2011
New Revision: 1130363

URL: http://svn.apache.org/viewvc?rev=1130363&view=rev
Log:
Add more @Overrides to various connectors, etc.

Modified:
    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/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
    incubator/lcf/branches/CONNECTORS-203/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.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/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
    incubator/lcf/branches/CONNECTORS-203/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    incubator/lcf/branches/CONNECTORS-203/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
    incubator/lcf/branches/CONNECTORS-203/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java

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=1130363&r1=1130362&r2=1130363&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
Thu Jun  2 00:28:46 2011
@@ -2104,7 +2104,7 @@ public class DCTM extends org.apache.man
   *@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)
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Paths");

Modified: incubator/lcf/branches/CONNECTORS-203/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1130363&r1=1130362&r2=1130363&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
Thu Jun  2 00:28:46 2011
@@ -345,6 +345,7 @@ public class FilenetConnector extends or
 
   /** Let the crawler know the completeness of the information we are giving it.
   */
+  @Override
   public int getConnectorModel()
   {
     return MODEL_ADD;
@@ -359,6 +360,7 @@ public class FilenetConnector extends or
   *@param documentIdentifier is the document identifier.
   *@return the bin name.
   */
+  @Override
   public String[] getBinNames(String documentIdentifier)
   {
     return new String[]{serverHostname};
@@ -367,20 +369,15 @@ public class FilenetConnector extends or
   /** 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 "filenet";
-  }
-
   /** Connect to filenet.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -432,6 +429,7 @@ public class FilenetConnector extends or
   /** 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
   {
@@ -464,6 +462,7 @@ public class FilenetConnector extends or
   /** This method is periodically called for all connectors that are connected but not
   * in active use.
   */
+  @Override
   public void poll()
     throws ManifoldCFException
   {
@@ -472,6 +471,7 @@ public class FilenetConnector extends or
 
   /** Disconnect from Filenet.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -540,6 +540,7 @@ public class FilenetConnector extends or
   *@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
   {
@@ -671,6 +672,7 @@ public class FilenetConnector extends or
   *@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
@@ -890,6 +892,7 @@ public class FilenetConnector extends or
   * 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
@@ -1410,12 +1413,14 @@ public class FilenetConnector extends or
   *@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.
@@ -1438,7 +1443,8 @@ public class FilenetConnector extends or
   *@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("Server");
@@ -1542,6 +1548,7 @@ public class FilenetConnector extends or
   *@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
   {
@@ -1722,6 +1729,7 @@ public class FilenetConnector extends or
   *@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
   {
@@ -1782,6 +1790,7 @@ public class FilenetConnector extends or
   *@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
   {
@@ -1830,7 +1839,8 @@ public class FilenetConnector extends or
   *@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)
+  @Override
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Document Classes");
@@ -1906,6 +1916,7 @@ public class FilenetConnector extends or
   *@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
   {
@@ -2551,6 +2562,7 @@ public class FilenetConnector extends or
   *@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
   {
@@ -2814,6 +2826,7 @@ public class FilenetConnector extends or
   *@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/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java?rev=1130363&r1=1130362&r2=1130363&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
Thu Jun  2 00:28:46 2011
@@ -53,22 +53,10 @@ public class FileConnector extends org.a
   {
   }
 
-
-  /** Return the path for the UI interface JSP elements.
-  * These JSP's must be provided to allow the connector to be configured, and to
-  * permit it to present document filtering specification information in the UI.
-  * This method should return the name of the folder, under the <webapp>/connectors/
-  * 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 "filesystem";
-  }
-
   /** Return the list of relationship types that this connector recognizes.
   *@return the list.
   */
+  @Override
   public String[] getRelationshipTypes()
   {
     return new String[]{RELATIONSHIP_CHILD};
@@ -76,6 +64,7 @@ public class FileConnector extends org.a
 
   /** List the activities we might report on.
   */
+  @Override
   public String[] getActivitiesList()
   {
     return activitiesList;
@@ -85,6 +74,7 @@ public class FileConnector extends org.a
   * For the file system, this would be typically just a blank value, but since we use this
connector for testing, I have
   * it returning TWO values for each document, so I can set up tests to see how the scheduler
behaves under those conditions.
   */
+  @Override
   public String[] getBinNames(String documentIdentifier)
   {
     // Note: This code is for testing, so we can see how documents behave when they are in
various kinds of bin situations.
@@ -133,6 +123,7 @@ public class FileConnector extends org.a
   *@param endTime is the end of the time range to consider, exclusive.
   *@return the stream of local document identifiers that should be added to the queue.
   */
+  @Override
   public IDocumentIdentifierStream getDocumentIdentifiers(DocumentSpecification spec, long
startTime, long endTime)
     throws ManifoldCFException
   {
@@ -148,6 +139,7 @@ public class FileConnector extends org.a
   * 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, DocumentSpecification
spec)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -198,6 +190,7 @@ public class FileConnector extends org.a
   *@param scanOnly is an array corresponding to the document identifiers.  It is set to true
to indicate when the processing
   * should only find other references, and should not actually call the ingestion methods.
   */
+  @Override
   public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity
activities, DocumentSpecification spec, boolean[] scanOnly)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -315,7 +308,8 @@ public class FileConnector extends org.a
   *@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
   {
     out.print(
@@ -354,6 +348,7 @@ public class FileConnector extends org.a
   *@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
   {
@@ -367,6 +362,7 @@ public class FileConnector extends org.a
   *@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
   {
@@ -379,7 +375,8 @@ public class FileConnector extends org.a
   *@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)
+  @Override
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Paths");
@@ -411,6 +408,7 @@ public class FileConnector extends org.a
   *@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
   {
@@ -664,6 +662,7 @@ public class FileConnector extends org.a
   *@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
   {
@@ -777,6 +776,7 @@ public class FileConnector extends org.a
   *@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=1130363&r1=1130362&r2=1130363&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
Thu Jun  2 00:28:46 2011
@@ -562,7 +562,7 @@ public class GTSConnector extends org.ap
   *@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)
+  public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification os, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Collections");

Modified: incubator/lcf/branches/CONNECTORS-203/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1130363&r1=1130362&r2=1130363&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
Thu Jun  2 00:28:46 2011
@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.ArrayList;
+import java.util.List;
 
 import jcifs.smb.ACE;
 import jcifs.smb.NtlmPasswordAuthentication;
@@ -172,25 +173,15 @@ public class SharedDriveConnector extend
   /** 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_ACCESS};
   }
 
-  /** Return the path for the UI interface JSP elements.
-  * These JSP's must be provided to allow the connector to be configured, and to
-  * permit it to present document filtering specification information in the UI.
-  * This method should return the name of the folder, under the <webapp>/connectors/
-  * 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 "sharedrive";
-  }
-
   /** Close the connection.  Call this before discarding the repository connector.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -207,6 +198,7 @@ public class SharedDriveConnector extend
   *@param configParameters is the set of configuration parameters, which
   * in this case describe the root directory.
   */
+  @Override
   public void connect(ConfigParams configParameters)
   {
     super.connect(configParameters);
@@ -251,6 +243,7 @@ public class SharedDriveConnector extend
   *@param documentIdentifier is the document identifier.
   *@return the bin name.
   */
+  @Override
   public String[] getBinNames(String documentIdentifier)
   {
     return new String[]{server};
@@ -377,6 +370,7 @@ public class SharedDriveConnector extend
   *@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
   {
@@ -436,6 +430,7 @@ public class SharedDriveConnector extend
   *@param endTime is the end of the time range to consider, exclusive.
   *@return the stream of local document identifiers that should be added to the queue.
   */
+  @Override
   public IDocumentIdentifierStream getDocumentIdentifiers(DocumentSpecification spec, long
startTime, long endTime)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -461,6 +456,7 @@ public class SharedDriveConnector extend
   * 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 activities,
     DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
     throws ManifoldCFException, ServiceInterruption
@@ -661,6 +657,7 @@ public class SharedDriveConnector extend
   *            other references, and should not actually call the ingestion
   *            methods.
   */
+  @Override
   public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity
activities,
     DocumentSpecification spec, boolean[] scanOnly) throws ManifoldCFException, ServiceInterruption
   {
@@ -1296,6 +1293,7 @@ public class SharedDriveConnector extend
 
   /** Check status of connection.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -2630,7 +2628,8 @@ public class SharedDriveConnector extend
   *@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("Server");
@@ -2680,6 +2679,7 @@ public class SharedDriveConnector extend
   *@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
   {
@@ -2737,6 +2737,7 @@ public class SharedDriveConnector extend
   *@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
   {
@@ -2765,6 +2766,7 @@ public class SharedDriveConnector extend
   *@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
   {
@@ -2813,7 +2815,8 @@ public class SharedDriveConnector extend
   *@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)
+  @Override
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Paths");
@@ -2957,6 +2960,7 @@ public class SharedDriveConnector extend
   *@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
   {
@@ -3686,6 +3690,7 @@ public class SharedDriveConnector extend
   *@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
   {
@@ -4181,6 +4186,7 @@ public class SharedDriveConnector extend
   *@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/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1130363&r1=1130362&r2=1130363&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
Thu Jun  2 00:28:46 2011
@@ -106,27 +106,17 @@ public class JDBCConnector extends org.a
   /** Return the list of activities that this connector supports (i.e. writes into the log).
   *@return the list.
   */
+  @Override
   public String[] getActivitiesList()
   {
     return activitiesList;
   }
 
-  /** Return the path for the UI interface JSP elements.
-  * These JSP's must be provided to allow the connector to be configured, and to
-  * permit it to present document filtering specification information in the UI.
-  * This method should return the name of the folder, under the <webapp>/connectors/
-  * 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 "jdbc";
-  }
-
   /** Model.  Depending on what people enter for the seeding query, this could be either
ALL or
   * could be less than that.  So, I've decided it will be at least the adds and changes,
and
   * won't include the deletes.
   */
+  @Override
   public int getConnectorModel()
   {
     return MODEL_ADD_CHANGE;
@@ -135,6 +125,7 @@ public class JDBCConnector extends org.a
   /** Connect.  The configuration parameters are included.
   *@param configParams are the configuration parameters for this connection.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -148,6 +139,7 @@ public class JDBCConnector extends org.a
 
   /** Check status of connection.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -168,6 +160,7 @@ public class JDBCConnector extends org.a
 
   /** Close the connection.  Call this before discarding the repository connector.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -190,6 +183,7 @@ public class JDBCConnector extends org.a
   *@param documentIdentifier is the document identifier.
   *@return the bin name.
   */
+  @Override
   public String[] getBinNames(String documentIdentifier)
   {
     return new String[]{host};
@@ -221,6 +215,7 @@ public class JDBCConnector extends org.a
   *@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.
   */
+  @Override
   public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
     long startTime, long endTime, int jobMode)
     throws ManifoldCFException, ServiceInterruption
@@ -304,6 +299,7 @@ public class JDBCConnector extends org.a
   * 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 activities,
     DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
     throws ManifoldCFException, ServiceInterruption
@@ -431,6 +427,7 @@ public class JDBCConnector extends org.a
   *@param scanOnly is an array corresponding to the document identifiers.  It is set to true
to indicate when the processing
   * should only find other references, and should not actually call the ingestion methods.
   */
+  @Override
   public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity
activities, DocumentSpecification spec, boolean[] scanOnly)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -653,7 +650,8 @@ public class JDBCConnector extends org.a
   *@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("Database Type");
@@ -703,6 +701,7 @@ public class JDBCConnector extends org.a
   *@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
   {
@@ -804,6 +803,7 @@ public class JDBCConnector extends org.a
   *@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
   {
@@ -837,6 +837,7 @@ public class JDBCConnector extends org.a
   *@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
   {
@@ -885,7 +886,8 @@ public class JDBCConnector extends org.a
   *@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)
+  @Override
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Queries");
@@ -994,6 +996,7 @@ public class JDBCConnector extends org.a
   *@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
   {
@@ -1151,6 +1154,7 @@ public class JDBCConnector extends org.a
   *@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
   {
@@ -1255,6 +1259,7 @@ public class JDBCConnector extends org.a
   *@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
   {
@@ -1436,6 +1441,7 @@ public class JDBCConnector extends org.a
   /** Get the maximum number of documents to amalgamate together into one batch, for this
connector.
   *@return the maximum number. 0 indicates "unlimited".
   */
+  @Override
   public int getMaxDocumentRequest()
   {
     // This is a number that is comfortably processed by the query processor as part of an
IN clause.

Modified: incubator/lcf/branches/CONNECTORS-203/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1130363&r1=1130362&r2=1130363&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
Thu Jun  2 00:28:46 2011
@@ -88,6 +88,7 @@ public class LivelinkAuthority extends o
 
   /** Set thread context.
   */
+  @Override
   public void setThreadContext(IThreadContext tc)
     throws ManifoldCFException
   {
@@ -97,6 +98,7 @@ public class LivelinkAuthority extends o
   
   /** Clear thread context.
   */
+  @Override
   public void clearThreadContext()
   {
     super.clearThreadContext();
@@ -106,6 +108,7 @@ public class LivelinkAuthority extends o
   /** Connect.  The configuration parameters are included.
   *@param configParams are the configuration parameters for this connection.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -181,6 +184,7 @@ public class LivelinkAuthority extends o
 
   /** Check connection for sanity.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -219,6 +223,7 @@ public class LivelinkAuthority extends o
 
   /** Close the connection.  Call this before discarding the repository connector.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -242,6 +247,7 @@ public class LivelinkAuthority extends o
   *@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
   {
@@ -279,7 +285,7 @@ public class LivelinkAuthority extends o
   }
   
   /** Uncached method to get access tokens for a user name. */
-  public AuthorizationResponse getAuthorizationResponseUncached(String userName)
+  protected AuthorizationResponse getAuthorizationResponseUncached(String userName)
     throws ManifoldCFException
   {
     // First, do what's necessary to map the user name that comes in to a reasonable
@@ -430,6 +436,7 @@ public class LivelinkAuthority extends o
   *@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
@@ -449,7 +456,8 @@ public class LivelinkAuthority extends o
   *@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("Server");
@@ -514,6 +522,7 @@ public class LivelinkAuthority extends o
   *@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
   {
@@ -622,6 +631,7 @@ public class LivelinkAuthority extends o
   *@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
   {
@@ -658,6 +668,7 @@ public class LivelinkAuthority extends o
   *@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/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-203/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1130363&r1=1130362&r2=1130363&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-203/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-203/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
Thu Jun  2 00:28:46 2011
@@ -149,22 +149,10 @@ public class LivelinkConnector extends o
   {
   }
 
-
-  /** Return the path for the UI interface JSP elements.
-  * These JSP's must be provided to allow the connector to be configured, and to
-  * permit it to present document filtering specification information in the UI.
-  * This method should return the name of the folder, under the <webapp>/connectors/
-  * 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 "livelink";
-  }
-
   /** Connect.  The configuration parameters are included.
   *@param configParams are the configuration parameters for this connection.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -240,6 +228,7 @@ public class LivelinkConnector extends o
   *@param documentIdentifier is the document identifier.
   *@return the bin name.
   */
+  @Override
   public String[] getBinNames(String documentIdentifier)
   {
     // This should return server name
@@ -494,6 +483,7 @@ public class LivelinkConnector extends o
 
   /** Check status of connection.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -590,6 +580,7 @@ public class LivelinkConnector extends o
   /** This method is periodically called for all connectors that are connected but not
   * in active use.
   */
+  @Override
   public void poll()
     throws ManifoldCFException
   {
@@ -599,6 +590,7 @@ public class LivelinkConnector extends o
 
   /** Close the connection.  Call this before discarding the repository connector.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -642,6 +634,7 @@ public class LivelinkConnector extends o
 
   /** List the activities we might report on.
   */
+  @Override
   public String[] getActivitiesList()
   {
     return activitiesList;
@@ -714,6 +707,7 @@ public class LivelinkConnector extends o
   *@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
   {
@@ -828,6 +822,7 @@ public class LivelinkConnector extends o
   *@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
@@ -895,6 +890,7 @@ public class LivelinkConnector extends o
   * 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 activities,
     DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
     throws ManifoldCFException, ServiceInterruption
@@ -1222,6 +1218,7 @@ public class LivelinkConnector extends o
   *@param scanOnly is an array corresponding to the document identifiers.  It is set to true
to indicate when the processing
   * should only find other references, and should not actually call the ingestion methods.
   */
+  @Override
   public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity
activities, DocumentSpecification spec, boolean[] scanOnly)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -1393,6 +1390,7 @@ public class LivelinkConnector extends o
   /** Get the maximum number of documents to amalgamate together into one batch, for this
connector.
   *@return the maximum number. 0 indicates "unlimited".
   */
+  @Override
   public int getMaxDocumentRequest()
   {
     // Intrinsically, Livelink doesn't batch well.  Multiple chunks have no advantage over
one-at-a-time requests,
@@ -1420,7 +1418,8 @@ public class LivelinkConnector extends o
   *@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("Server");
@@ -1527,6 +1526,7 @@ public class LivelinkConnector extends o
   *@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
   {
@@ -1771,6 +1771,7 @@ public class LivelinkConnector extends o
   *@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
   {
@@ -1885,6 +1886,7 @@ public class LivelinkConnector extends o
   *@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
   {
@@ -1933,7 +1935,8 @@ public class LivelinkConnector extends o
   *@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)
+  @Override
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Paths");
@@ -2063,6 +2066,7 @@ public class LivelinkConnector extends o
   *@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
   {
@@ -2786,6 +2790,7 @@ public class LivelinkConnector extends o
   *@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
   {
@@ -3271,6 +3276,7 @@ public class LivelinkConnector extends o
   *@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
   {



Mime
View raw message