incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1130475 [2/6] - in /incubator/lcf/trunk: ./ connectors/activedirectory/ connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ connectors/documentum/ connectors/documentum/connecto...
Date Thu, 02 Jun 2011 10:32:07 GMT
Modified: incubator/lcf/trunk/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jcifs/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jcifs/build.xml (original)
+++ incubator/lcf/trunk/connectors/jcifs/build.xml Thu Jun  2 10:32:04 2011
@@ -35,7 +35,7 @@
 
     <target name="doc" depends="precompile-check" if="canBuild">
         <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.4">
+        <javadoc destdir="dist/doc" source="1.5">
             <classpath>
                 <fileset dir="jcifs" includes="*.jar"/>
                 <fileset dir="lib" includes="*.jar"/>
@@ -46,7 +46,7 @@
 
     <target name="compile-connector" depends="precompile-check" if="canBuild">
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <fileset dir="jcifs" includes="*.jar"/>
                 <fileset dir="lib" includes="*.jar"/>

Modified: incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java (original)
+++ incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java Thu Jun  2 10:32:04 2011
@@ -73,7 +73,7 @@ public class GetConnectionInfo
 
   protected static String commaEscape(String input)
   {
-    StringBuffer output = new StringBuffer();
+    StringBuilder output = new StringBuilder();
     int i = 0;
     while (i < input.length())
     {

Modified: incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/MatchMap.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/MatchMap.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/MatchMap.java (original)
+++ incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/MatchMap.java Thu Jun  2 10:32:04 2011
@@ -57,8 +57,8 @@ public class MatchMap
   {
     matchStrings = new ArrayList();
     replaceStrings = new ArrayList();
-    StringBuffer matchString = new StringBuffer();
-    StringBuffer replaceString = new StringBuffer();
+    StringBuilder matchString = new StringBuilder();
+    StringBuilder replaceString = new StringBuilder();
     int i = 0;
     while (i < stringForm.length())
     {
@@ -168,7 +168,7 @@ public class MatchMap
     // original parser (which basically will guarantee that we get it right)
 
     EvaluatorTokenStream et = new EvaluatorTokenStream(oldstyleReplace);
-    StringBuffer newStyleReplace = new StringBuffer();
+    StringBuilder newStyleReplace = new StringBuilder();
 
     while (true)
     {
@@ -214,7 +214,7 @@ public class MatchMap
   }
 
   /** Escape a string so it is verbatim */
-  protected static void escape(StringBuffer output, String input)
+  protected static void escape(StringBuilder output, String input)
   {
     int i = 0;
     while (i < input.length())
@@ -230,7 +230,7 @@ public class MatchMap
   public String toString()
   {
     int i = 0;
-    StringBuffer rval = new StringBuffer();
+    StringBuilder rval = new StringBuilder();
     while (i < matchStrings.size())
     {
       String matchString = (String)matchStrings.get(i);
@@ -246,7 +246,7 @@ public class MatchMap
   }
 
   /** Stuff characters */
-  protected static void stuff(StringBuffer sb, String value)
+  protected static void stuff(StringBuilder sb, String value)
   {
     int i = 0;
     while (i < value.length())
@@ -294,7 +294,7 @@ public class MatchMap
       String outputDescription = (String)replaceStrings.get(j);
       j++;
       // Create a copy buffer
-      StringBuffer outputBuffer = new StringBuffer();
+      StringBuilder outputBuffer = new StringBuilder();
       // Keep track of the index in the original string we have done up to
       int currentIndex = 0;
       // Scan the string using find, and for each one found, do a translation
@@ -335,7 +335,7 @@ public class MatchMap
             if (x == '(')
             {
               // Process evaluation expression
-              StringBuffer numberBuf = new StringBuffer();
+              StringBuilder numberBuf = new StringBuilder();
               boolean upper = false;
               boolean lower = false;
               boolean mixed = false;
@@ -502,13 +502,13 @@ public class MatchMap
         pos++;
       }
 
-      StringBuffer sb;
+      StringBuilder sb;
 
       if (x == '"')
       {
         // Parse text
         pos++;
-        sb = new StringBuffer();
+        sb = new StringBuilder();
         while (true)
         {
           if (pos == text.length())
@@ -538,7 +538,7 @@ public class MatchMap
       }
 
       // Eat number at beginning
-      sb = new StringBuffer();
+      sb = new StringBuilder();
       while (true)
       {
         if (pos == text.length())

Modified: incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java (original)
+++ incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java Thu Jun  2 10:32:04 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};
@@ -288,7 +281,7 @@ public class SharedDriveConnector extend
       try
       {
         byte[] byteArray = serverPath.getBytes("utf-8");
-        StringBuffer output = new StringBuffer();
+        StringBuilder output = new StringBuilder();
         int i = 0;
         while (i < byteArray.length)
         {
@@ -326,7 +319,7 @@ public class SharedDriveConnector extend
       // 3.9.0), and the various clients are responsible for converting that form into something the browser will accept.
       try
       {
-        StringBuffer output = new StringBuffer();
+        StringBuilder output = new StringBuilder();
 
         int i = 0;
         while (i < serverPath.length())
@@ -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
@@ -543,7 +539,7 @@ public class SharedDriveConnector extend
             // The format of this string changed again on 7/3/2009 to permit the ingestion uri/iri to be included.
             // This was to support filename/uri mapping functionality.
 
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
 
             // Parseable stuff goes first.  There's no metadata for jcifs, so this will just be the acls
             describeDocumentSecurity(sb,file,acls,shareAcls);
@@ -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
   {
@@ -776,7 +773,7 @@ public class SharedDriveConnector extend
                         int index = 0;
                         index = setDocumentSecurity(rd,version,index);
                         index = setPathMetadata(rd,version,index);
-                        StringBuffer ingestURI = new StringBuffer();
+                        StringBuilder ingestURI = new StringBuilder();
                         index = unpack(ingestURI,version,index,'+');
                         activities.ingestDocument(documentIdentifier, versions[i], ingestURI.toString(), rd);
                       }
@@ -828,7 +825,7 @@ public class SharedDriveConnector extend
                     int index = 0;
                     index = setDocumentSecurity(rd,version,index);
                     index = setPathMetadata(rd,version,index);
-                    StringBuffer ingestURI = new StringBuffer();
+                    StringBuilder ingestURI = new StringBuilder();
                     index = unpack(ingestURI,version,index,'+');
                     activities.ingestDocument(documentIdentifier, versions[i], ingestURI.toString(), rd);
                   }
@@ -973,7 +970,7 @@ public class SharedDriveConnector extend
   /** This method calculates an ACL string based on whether there are forced acls and also based on
   * the acls in place for a file.
   */
-  protected void describeDocumentSecurity(StringBuffer description, SmbFile file, String[] forcedacls,
+  protected void describeDocumentSecurity(StringBuilder description, SmbFile file, String[] forcedacls,
     String[] forcedShareAcls)
     throws ManifoldCFException, IOException
   {
@@ -1277,8 +1274,8 @@ public class SharedDriveConnector extend
   {
     if (version.length() > index && version.charAt(index++) == '+')
     {
-      StringBuffer pathAttributeNameBuffer = new StringBuffer();
-      StringBuffer pathAttributeValueBuffer = new StringBuffer();
+      StringBuilder pathAttributeNameBuffer = new StringBuilder();
+      StringBuilder pathAttributeValueBuffer = new StringBuilder();
       index = unpack(pathAttributeNameBuffer,version,index,'+');
       index = unpack(pathAttributeValueBuffer,version,index,'+');
       String pathAttributeName = pathAttributeNameBuffer.toString();
@@ -1296,6 +1293,7 @@ public class SharedDriveConnector extend
 
   /** Check status of connection.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -2040,7 +2038,7 @@ public class SharedDriveConnector extend
   }
 
   /** Stuffer for packing a single string with an end delimiter */
-  protected static void pack(StringBuffer output, String value, char delimiter)
+  protected static void pack(StringBuilder output, String value, char delimiter)
   {
     int i = 0;
     while (i < value.length())
@@ -2054,7 +2052,7 @@ public class SharedDriveConnector extend
   }
 
   /** Unstuffer for the above. */
-  protected static int unpack(StringBuffer sb, String value, int startPosition, char delimiter)
+  protected static int unpack(StringBuilder sb, String value, int startPosition, char delimiter)
   {
     while (startPosition < value.length())
     {
@@ -2072,7 +2070,7 @@ public class SharedDriveConnector extend
   }
 
   /** Stuffer for packing lists of fixed length */
-  protected static void packFixedList(StringBuffer output, String[] values, char delimiter)
+  protected static void packFixedList(StringBuilder output, String[] values, char delimiter)
   {
     int i = 0;
     while (i < values.length)
@@ -2084,7 +2082,7 @@ public class SharedDriveConnector extend
   /** Unstuffer for unpacking lists of fixed length */
   protected static int unpackFixedList(String[] output, String value, int startPosition, char delimiter)
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     int i = 0;
     while (i < output.length)
     {
@@ -2096,7 +2094,7 @@ public class SharedDriveConnector extend
   }
 
   /** Stuffer for packing lists of variable length */
-  protected static void packList(StringBuffer output, ArrayList values, char delimiter)
+  protected static void packList(StringBuilder output, ArrayList values, char delimiter)
   {
     pack(output,Integer.toString(values.size()),delimiter);
     int i = 0;
@@ -2107,7 +2105,7 @@ public class SharedDriveConnector extend
   }
 
   /** Another stuffer for packing lists of variable length */
-  protected static void packList(StringBuffer output, String[] values, char delimiter)
+  protected static void packList(StringBuilder output, String[] values, char delimiter)
   {
     pack(output,Integer.toString(values.length),delimiter);
     int i = 0;
@@ -2126,7 +2124,7 @@ public class SharedDriveConnector extend
   */
   protected static int unpackList(ArrayList output, String value, int startPosition, char delimiter)
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     startPosition = unpack(sb,value,startPosition,delimiter);
     try
     {
@@ -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/trunk/connectors/jdbc/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/build.xml (original)
+++ incubator/lcf/trunk/connectors/jdbc/build.xml Thu Jun  2 10:32:04 2011
@@ -24,7 +24,7 @@
 
     <target name="doc">
         <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.4">
+        <javadoc destdir="dist/doc" source="1.5">
             <classpath>
                 <fileset dir="lib" includes="*.jar"/>
             </classpath>
@@ -34,7 +34,7 @@
 
     <target name="compile-connector">
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <fileset dir="lib" includes="*.jar"/>
             </classpath>

Modified: incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java (original)
+++ incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java Thu Jun  2 10:32:04 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
@@ -237,7 +232,7 @@ public class JDBCConnector extends org.a
 
     // Do the substitution
     ArrayList paramList = new ArrayList();
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     substituteQuery(ts.idQuery,vm,sb,paramList);
 
     IDynamicResultSet idSet;
@@ -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
@@ -341,7 +337,7 @@ public class JDBCConnector extends org.a
 
     // Do the substitution
     ArrayList paramList = new ArrayList();
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     substituteQuery(ts.versionQuery,vm,sb,paramList);
 
     // Now, build a result return, and a hash table so we can correlate the returned values with the place to put them.
@@ -393,7 +389,7 @@ public class JDBCConnector extends org.a
         else
         {
           // A real version string!  Any acls must be added to the front, if they are present...
-          sb = new StringBuffer();
+          sb = new StringBuilder();
           packList(sb,acls,'+');
           if (acls.length > 0)
           {
@@ -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
   {
@@ -448,7 +445,7 @@ public class JDBCConnector extends org.a
 
     // Do the substitution
     ArrayList paramList = new ArrayList();
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     substituteQuery(ts.dataQuery,vm,sb,paramList);
 
     int i;
@@ -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
   {
@@ -1405,7 +1410,7 @@ public class JDBCConnector extends org.a
     {
       // Unpack access tokens and the deny token too
       ArrayList acls = new ArrayList();
-      StringBuffer denyAclBuffer = new StringBuffer();
+      StringBuilder denyAclBuffer = new StringBuilder();
       int startPos = unpackList(acls,version,0,'+');
       if (startPos < version.length() && version.charAt(startPos++) == '+')
       {
@@ -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.
@@ -1475,7 +1481,7 @@ public class JDBCConnector extends org.a
   protected static boolean addIDList(VariableMap map, String varName, String[] documentIdentifiers, boolean[] scanOnly)
   {
     ArrayList params = new ArrayList();
-    StringBuffer sb = new StringBuffer(" (");
+    StringBuilder sb = new StringBuilder(" (");
     int i = 0;
     int k = 0;
     while (i < documentIdentifiers.length)
@@ -1499,7 +1505,7 @@ public class JDBCConnector extends org.a
   /** Given a query, and a parameter map, substitute it.
   * Each variable substitutes the string, and it also substitutes zero or more query parameters.
   */
-  protected static void substituteQuery(String inputString, VariableMap inputMap, StringBuffer outputQuery, ArrayList outputParams)
+  protected static void substituteQuery(String inputString, VariableMap inputMap, StringBuilder outputQuery, ArrayList outputParams)
     throws ManifoldCFException
   {
     // We are looking for strings that look like this: $(something)
@@ -1568,7 +1574,7 @@ public class JDBCConnector extends org.a
   }
 
   /** Stuffer for packing a single string with an end delimiter */
-  protected static void pack(StringBuffer output, String value, char delimiter)
+  protected static void pack(StringBuilder output, String value, char delimiter)
   {
     int i = 0;
     while (i < value.length())
@@ -1582,7 +1588,7 @@ public class JDBCConnector extends org.a
   }
 
   /** Unstuffer for the above. */
-  protected static int unpack(StringBuffer sb, String value, int startPosition, char delimiter)
+  protected static int unpack(StringBuilder sb, String value, int startPosition, char delimiter)
   {
     while (startPosition < value.length())
     {
@@ -1600,7 +1606,7 @@ public class JDBCConnector extends org.a
   }
 
   /** Stuffer for packing lists of fixed length */
-  protected static void packFixedList(StringBuffer output, String[] values, char delimiter)
+  protected static void packFixedList(StringBuilder output, String[] values, char delimiter)
   {
     int i = 0;
     while (i < values.length)
@@ -1612,7 +1618,7 @@ public class JDBCConnector extends org.a
   /** Unstuffer for unpacking lists of fixed length */
   protected static int unpackFixedList(String[] output, String value, int startPosition, char delimiter)
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     int i = 0;
     while (i < output.length)
     {
@@ -1624,7 +1630,7 @@ public class JDBCConnector extends org.a
   }
 
   /** Stuffer for packing lists of variable length */
-  protected static void packList(StringBuffer output, ArrayList values, char delimiter)
+  protected static void packList(StringBuilder output, ArrayList values, char delimiter)
   {
     pack(output,Integer.toString(values.size()),delimiter);
     int i = 0;
@@ -1635,7 +1641,7 @@ public class JDBCConnector extends org.a
   }
 
   /** Another stuffer for packing lists of variable length */
-  protected static void packList(StringBuffer output, String[] values, char delimiter)
+  protected static void packList(StringBuilder output, String[] values, char delimiter)
   {
     pack(output,Integer.toString(values.length),delimiter);
     int i = 0;
@@ -1654,7 +1660,7 @@ public class JDBCConnector extends org.a
   */
   protected static int unpackList(ArrayList output, String value, int startPosition, char delimiter)
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     startPosition = unpack(sb,value,startPosition,delimiter);
     try
     {
@@ -1678,7 +1684,7 @@ public class JDBCConnector extends org.a
   */
   protected static String createQueryString(String queryText, ArrayList paramList)
   {
-    StringBuffer sb = new StringBuffer(queryText);
+    StringBuilder sb = new StringBuilder(queryText);
     sb.append("; arguments = (");
     int i = 0;
     while (i < paramList.size())
@@ -1699,7 +1705,7 @@ public class JDBCConnector extends org.a
   */
   protected static String quoteSQLString(String input)
   {
-    StringBuffer sb = new StringBuffer("\'");
+    StringBuilder sb = new StringBuilder("\'");
     int i = 0;
     while (i < input.length())
     {
@@ -1729,7 +1735,7 @@ public class JDBCConnector extends org.a
         try
         {
           InputStreamReader reader = new InputStreamReader(is,"utf-8");
-          StringBuffer sb = new StringBuffer();
+          StringBuilder sb = new StringBuilder();
           while (true)
           {
             int x = reader.read();

Modified: incubator/lcf/trunk/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/build.xml (original)
+++ incubator/lcf/trunk/connectors/livelink/build.xml Thu Jun  2 10:32:04 2011
@@ -35,7 +35,7 @@
 
     <target name="doc" depends="precompile-check" if="canBuild">
         <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.4">
+        <javadoc destdir="dist/doc" source="1.5">
             <classpath>
                 <fileset dir="lib" includes="*.jar"/>
                 <fileset dir="lapi" includes="*.jar"/>
@@ -46,7 +46,7 @@
 
     <target name="compile-connector" depends="precompile-check" if="canBuild">
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <fileset dir="lib" includes="*.jar"/>
                 <fileset dir="lapi" includes="*.jar"/>

Modified: incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java (original)
+++ incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java Thu Jun  2 10:32:04 2011
@@ -76,7 +76,7 @@ public class GetConnectionInfo
 
   protected static String commaEscape(String input)
   {
-    StringBuffer output = new StringBuffer();
+    StringBuilder output = new StringBuilder();
     int i = 0;
     while (i < input.length())
     {

Modified: incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java (original)
+++ incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java Thu Jun  2 10:32:04 2011
@@ -157,7 +157,7 @@ public class LLSERVER
   {
     if (session == null)
       return null;
-    StringBuffer rval = new StringBuffer();
+    StringBuilder rval = new StringBuilder();
     if (session.getStatus() != 0)
       rval.append("LAPI status code: ").append(session.getStatus());
     if (session.getApiError().length() > 0)

Modified: incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java Thu Jun  2 10:32:04 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/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original)
+++ incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Thu Jun  2 10:32:04 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
@@ -969,11 +965,11 @@ public class LivelinkConnector extends o
     }
 
     // Prepare the specified metadata
-    StringBuffer metadataString = null;
+    StringBuilder metadataString = null;
     CategoryPathAccumulator catAccum = null;
     if (!includeAllMetadata)
     {
-      metadataString = new StringBuffer();
+      metadataString = new StringBuilder();
       // Put into an array
       String[] sortArray = new String[holder.size()];
       i = 0;
@@ -993,7 +989,7 @@ public class LivelinkConnector extends o
 
     // Calculate the part of the version string that comes from path name and mapping.
     // This starts with = since ; is used by another optional component (the forced acls)
-    StringBuffer pathNameAttributeVersion = new StringBuffer();
+    StringBuilder pathNameAttributeVersion = new StringBuilder();
     if (pathAttributeName != null)
       pathNameAttributeVersion.append("=").append(pathAttributeName).append(":").append(matchMap);
 
@@ -1051,7 +1047,7 @@ public class LivelinkConnector extends o
             // we want to pull the transient information out of the version string where
             // possible (so there is no mismatch between version checking and ingestion).
 
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
 
             // On 1/17/2008 I changed the version generation code to NOT include metadata, view info, etc. for folders, since
             // folders make absolutely no use of this info.
@@ -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
   {
@@ -2864,7 +2869,7 @@ public class LivelinkConnector extends o
         String addon = variableContext.getParameter("pathaddon");
         if (addon != null && addon.length() > 0)
         {
-          StringBuffer sb = new StringBuffer();
+          StringBuilder sb = new StringBuilder();
           int k = 0;
           while (k < addon.length())
           {
@@ -3130,7 +3135,7 @@ public class LivelinkConnector extends o
         String addon = variableContext.getParameter("metadataaddon");
         if (addon != null && addon.length() > 0)
         {
-          StringBuffer sb = new StringBuffer();
+          StringBuilder sb = new StringBuilder();
           int k = 0;
           while (k < addon.length())
           {
@@ -3151,7 +3156,7 @@ public class LivelinkConnector extends o
         String addon = variableContext.getParameter("metadataaddon");
         if (addon != null && addon.length() > 0)
         {
-          StringBuffer sb = new StringBuffer();
+          StringBuilder sb = new StringBuilder();
           int k = 0;
           while (k < addon.length())
           {
@@ -3171,7 +3176,7 @@ public class LivelinkConnector extends o
         String addon = variableContext.getParameter("categoryaddon");
         if (addon != null && addon.length() > 0)
         {
-          StringBuffer sb = new StringBuffer();
+          StringBuilder sb = new StringBuilder();
           int k = 0;
           while (k < addon.length())
           {
@@ -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
   {
@@ -3637,7 +3643,7 @@ public class LivelinkConnector extends o
   {
     try
     {
-      StringBuffer llURI = new StringBuffer();
+      StringBuilder llURI = new StringBuilder();
 
       llURI.append(ingestCgiPath);
       llURI.append("?func=ll.login&CurrentClientTime=D%2F2005%2F3%2F9%3A13%3A16%3A30&NextURL=");
@@ -3803,7 +3809,7 @@ public class LivelinkConnector extends o
         }
         rd.setACL(aclArray);
 
-        StringBuffer denyBuffer = new StringBuffer();
+        StringBuilder denyBuffer = new StringBuilder();
         startPos = unpack(denyBuffer,version,startPos,'+');
         String denyAcl = denyBuffer.toString();
         String[] denyAclArray = new String[1];
@@ -4151,14 +4157,14 @@ public class LivelinkConnector extends o
   /** Pack category and attribute */
   protected static String packCategoryAttribute(String category, String attribute)
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     pack(sb,category,':');
     pack(sb,attribute,':');
     return sb.toString();
   }
 
   /** Unpack category and attribute */
-  protected static void unpackCategoryAttribute(StringBuffer category, StringBuffer attribute, String value)
+  protected static void unpackCategoryAttribute(StringBuilder category, StringBuilder attribute, String value)
   {
     int startPos = 0;
     startPos = unpack(category,value,startPos,':');
@@ -4166,7 +4172,7 @@ public class LivelinkConnector extends o
   }
 
   /** Stuffer for packing a single string with an end delimiter */
-  protected static void pack(StringBuffer output, String value, char delimiter)
+  protected static void pack(StringBuilder output, String value, char delimiter)
   {
     int i = 0;
     while (i < value.length())
@@ -4180,7 +4186,7 @@ public class LivelinkConnector extends o
   }
 
   /** Unstuffer for the above. */
-  protected static int unpack(StringBuffer sb, String value, int startPosition, char delimiter)
+  protected static int unpack(StringBuilder sb, String value, int startPosition, char delimiter)
   {
     while (startPosition < value.length())
     {
@@ -4198,7 +4204,7 @@ public class LivelinkConnector extends o
   }
 
   /** Stuffer for packing lists of fixed length */
-  protected static void packFixedList(StringBuffer output, String[] values, char delimiter)
+  protected static void packFixedList(StringBuilder output, String[] values, char delimiter)
   {
     int i = 0;
     while (i < values.length)
@@ -4210,7 +4216,7 @@ public class LivelinkConnector extends o
   /** Unstuffer for unpacking lists of fixed length */
   protected static int unpackFixedList(String[] output, String value, int startPosition, char delimiter)
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     int i = 0;
     while (i < output.length)
     {
@@ -4222,7 +4228,7 @@ public class LivelinkConnector extends o
   }
 
   /** Stuffer for packing lists of variable length */
-  protected static void packList(StringBuffer output, ArrayList values, char delimiter)
+  protected static void packList(StringBuilder output, ArrayList values, char delimiter)
   {
     pack(output,Integer.toString(values.size()),delimiter);
     int i = 0;
@@ -4233,7 +4239,7 @@ public class LivelinkConnector extends o
   }
 
   /** Another stuffer for packing lists of variable length */
-  protected static void packList(StringBuffer output, String[] values, char delimiter)
+  protected static void packList(StringBuilder output, String[] values, char delimiter)
   {
     pack(output,Integer.toString(values.length),delimiter);
     int i = 0;
@@ -4252,7 +4258,7 @@ public class LivelinkConnector extends o
   */
   protected static int unpackList(ArrayList output, String value, int startPosition, char delimiter)
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     startPosition = unpack(sb,value,startPosition,delimiter);
     try
     {
@@ -5269,7 +5275,7 @@ public class LivelinkConnector extends o
     int charindex = 0;
     while (charindex < startPath.length())
     {
-      StringBuffer currentTokenBuffer = new StringBuffer();
+      StringBuilder currentTokenBuffer = new StringBuilder();
       // Find the current token
       while (charindex < startPath.length())
       {
@@ -5380,7 +5386,7 @@ public class LivelinkConnector extends o
     int charindex = 0;
     while (charindex < startPath.length())
     {
-      StringBuffer currentTokenBuffer = new StringBuffer();
+      StringBuilder currentTokenBuffer = new StringBuilder();
       // Find the current token
       while (charindex < startPath.length())
       {
@@ -5476,7 +5482,7 @@ public class LivelinkConnector extends o
   */
   protected static String buildFilterString(DocumentSpecification spec)
   {
-    StringBuffer rval = new StringBuffer();
+    StringBuilder rval = new StringBuilder();
 
 
     boolean first = true;
@@ -5506,7 +5512,7 @@ public class LivelinkConnector extends o
     String filterStringPiece = rval.toString();
     if (filterStringPiece.length() == 0)
       return "0>1";
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append("SubType=").append(new Integer(LAPI_DOCUMENTS.FOLDERSUBTYPE).toString());
     sb.append(" or SubType=").append(new Integer(LAPI_DOCUMENTS.COMPOUNDDOCUMENTSUBTYPE).toString());
     sb.append(" or SubType=").append(new Integer(LAPI_DOCUMENTS.PROJECTSUBTYPE).toString());
@@ -5950,8 +5956,8 @@ public class LivelinkConnector extends o
       while (i < metadataItems.size())
       {
         String metadataSpec = (String)metadataItems.get(i++);
-        StringBuffer categoryBuffer = new StringBuffer();
-        StringBuffer attributeBuffer = new StringBuffer();
+        StringBuilder categoryBuffer = new StringBuilder();
+        StringBuilder attributeBuffer = new StringBuilder();
         unpackCategoryAttribute(categoryBuffer,attributeBuffer,metadataSpec);
         String category = categoryBuffer.toString();
         String attributeName = attributeBuffer.toString();

Modified: incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/MatchMap.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/MatchMap.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/MatchMap.java (original)
+++ incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/MatchMap.java Thu Jun  2 10:32:04 2011
@@ -57,8 +57,8 @@ public class MatchMap
   {
     matchStrings = new ArrayList();
     replaceStrings = new ArrayList();
-    StringBuffer matchString = new StringBuffer();
-    StringBuffer replaceString = new StringBuffer();
+    StringBuilder matchString = new StringBuilder();
+    StringBuilder replaceString = new StringBuilder();
     int i = 0;
     while (i < stringForm.length())
     {
@@ -168,7 +168,7 @@ public class MatchMap
     // original parser (which basically will guarantee that we get it right)
 
     EvaluatorTokenStream et = new EvaluatorTokenStream(oldstyleReplace);
-    StringBuffer newStyleReplace = new StringBuffer();
+    StringBuilder newStyleReplace = new StringBuilder();
 
     while (true)
     {
@@ -214,7 +214,7 @@ public class MatchMap
   }
 
   /** Escape a string so it is verbatim */
-  protected static void escape(StringBuffer output, String input)
+  protected static void escape(StringBuilder output, String input)
   {
     int i = 0;
     while (i < input.length())
@@ -230,7 +230,7 @@ public class MatchMap
   public String toString()
   {
     int i = 0;
-    StringBuffer rval = new StringBuffer();
+    StringBuilder rval = new StringBuilder();
     while (i < matchStrings.size())
     {
       String matchString = (String)matchStrings.get(i);
@@ -246,7 +246,7 @@ public class MatchMap
   }
 
   /** Stuff characters */
-  protected static void stuff(StringBuffer sb, String value)
+  protected static void stuff(StringBuilder sb, String value)
   {
     int i = 0;
     while (i < value.length())
@@ -294,7 +294,7 @@ public class MatchMap
       String outputDescription = (String)replaceStrings.get(j);
       j++;
       // Create a copy buffer
-      StringBuffer outputBuffer = new StringBuffer();
+      StringBuilder outputBuffer = new StringBuilder();
       // Keep track of the index in the original string we have done up to
       int currentIndex = 0;
       // Scan the string using find, and for each one found, do a translation
@@ -335,7 +335,7 @@ public class MatchMap
             if (x == '(')
             {
               // Process evaluation expression
-              StringBuffer numberBuf = new StringBuffer();
+              StringBuilder numberBuf = new StringBuilder();
               boolean upper = false;
               boolean lower = false;
               boolean mixed = false;
@@ -502,13 +502,13 @@ public class MatchMap
         pos++;
       }
 
-      StringBuffer sb;
+      StringBuilder sb;
 
       if (x == '"')
       {
         // Parse text
         pos++;
-        sb = new StringBuffer();
+        sb = new StringBuilder();
         while (true)
         {
           if (pos == text.length())
@@ -538,7 +538,7 @@ public class MatchMap
       }
 
       // Eat number at beginning
-      sb = new StringBuffer();
+      sb = new StringBuilder();
       while (true)
       {
         if (pos == text.length())

Modified: incubator/lcf/trunk/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MatchMap.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MatchMap.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MatchMap.java (original)
+++ incubator/lcf/trunk/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MatchMap.java Thu Jun  2 10:32:04 2011
@@ -56,8 +56,8 @@ public class MatchMap
   {
     matchStrings = new ArrayList();
     replaceStrings = new ArrayList();
-    StringBuffer matchString = new StringBuffer();
-    StringBuffer replaceString = new StringBuffer();
+    StringBuilder matchString = new StringBuilder();
+    StringBuilder replaceString = new StringBuilder();
     int i = 0;
     while (i < stringForm.length())
     {
@@ -167,7 +167,7 @@ public class MatchMap
     // original parser (which basically will guarantee that we get it right)
 
     EvaluatorTokenStream et = new EvaluatorTokenStream(oldstyleReplace);
-    StringBuffer newStyleReplace = new StringBuffer();
+    StringBuilder newStyleReplace = new StringBuilder();
 
     while (true)
     {
@@ -213,7 +213,7 @@ public class MatchMap
   }
 
   /** Escape a string so it is verbatim */
-  protected static void escape(StringBuffer output, String input)
+  protected static void escape(StringBuilder output, String input)
   {
     int i = 0;
     while (i < input.length())
@@ -229,7 +229,7 @@ public class MatchMap
   public String toString()
   {
     int i = 0;
-    StringBuffer rval = new StringBuffer();
+    StringBuilder rval = new StringBuilder();
     while (i < matchStrings.size())
     {
       String matchString = (String)matchStrings.get(i);
@@ -245,7 +245,7 @@ public class MatchMap
   }
 
   /** Stuff characters */
-  protected static void stuff(StringBuffer sb, String value)
+  protected static void stuff(StringBuilder sb, String value)
   {
     int i = 0;
     while (i < value.length())
@@ -283,7 +283,7 @@ public class MatchMap
       String outputDescription = (String)replaceStrings.get(j);
       j++;
       // Create a copy buffer
-      StringBuffer outputBuffer = new StringBuffer();
+      StringBuilder outputBuffer = new StringBuilder();
       // Keep track of the index in the original string we have done up to
       int currentIndex = 0;
       // Scan the string using find, and for each one found, do a translation
@@ -324,7 +324,7 @@ public class MatchMap
             if (x == '(')
             {
               // Process evaluation expression
-              StringBuffer numberBuf = new StringBuffer();
+              StringBuilder numberBuf = new StringBuilder();
               boolean upper = false;
               boolean lower = false;
               boolean mixed = false;
@@ -491,13 +491,13 @@ public class MatchMap
         pos++;
       }
 
-      StringBuffer sb;
+      StringBuilder sb;
 
       if (x == '"')
       {
         // Parse text
         pos++;
-        sb = new StringBuffer();
+        sb = new StringBuilder();
         while (true)
         {
           if (pos == text.length())
@@ -527,7 +527,7 @@ public class MatchMap
       }
 
       // Eat number at beginning
-      sb = new StringBuffer();
+      sb = new StringBuilder();
       while (true)
       {
         if (pos == text.length())

Modified: incubator/lcf/trunk/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/meridio/build.xml (original)
+++ incubator/lcf/trunk/connectors/meridio/build.xml Thu Jun  2 10:32:04 2011
@@ -117,7 +117,7 @@
 
     <target name="compile-wsdls" depends="classcreate-wsdls,precompile-check" if="canBuild">
         <mkdir dir="build/wsdlclasses"/>
-        <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <fileset dir="lib" includes="*.jar"/>
             </classpath>
@@ -147,7 +147,7 @@
 
     <target name="compile-connector" depends="compile-wsdls,compile-xsds,precompile-check" if="canBuild">
         <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <fileset dir="lib" includes="*.jar"/>
                 <pathelement location="build/wsdlclasses"/>

Modified: incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MatchMap.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MatchMap.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MatchMap.java (original)
+++ incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MatchMap.java Thu Jun  2 10:32:04 2011
@@ -56,8 +56,8 @@ public class MatchMap
   {
     matchStrings = new ArrayList();
     replaceStrings = new ArrayList();
-    StringBuffer matchString = new StringBuffer();
-    StringBuffer replaceString = new StringBuffer();
+    StringBuilder matchString = new StringBuilder();
+    StringBuilder replaceString = new StringBuilder();
     int i = 0;
     while (i < stringForm.length())
     {
@@ -167,7 +167,7 @@ public class MatchMap
     // original parser (which basically will guarantee that we get it right)
 
     EvaluatorTokenStream et = new EvaluatorTokenStream(oldstyleReplace);
-    StringBuffer newStyleReplace = new StringBuffer();
+    StringBuilder newStyleReplace = new StringBuilder();
 
     while (true)
     {
@@ -213,7 +213,7 @@ public class MatchMap
   }
 
   /** Escape a string so it is verbatim */
-  protected static void escape(StringBuffer output, String input)
+  protected static void escape(StringBuilder output, String input)
   {
     int i = 0;
     while (i < input.length())
@@ -229,7 +229,7 @@ public class MatchMap
   public String toString()
   {
     int i = 0;
-    StringBuffer rval = new StringBuffer();
+    StringBuilder rval = new StringBuilder();
     while (i < matchStrings.size())
     {
       String matchString = (String)matchStrings.get(i);
@@ -245,7 +245,7 @@ public class MatchMap
   }
 
   /** Stuff characters */
-  protected static void stuff(StringBuffer sb, String value)
+  protected static void stuff(StringBuilder sb, String value)
   {
     int i = 0;
     while (i < value.length())
@@ -283,7 +283,7 @@ public class MatchMap
       String outputDescription = (String)replaceStrings.get(j);
       j++;
       // Create a copy buffer
-      StringBuffer outputBuffer = new StringBuffer();
+      StringBuilder outputBuffer = new StringBuilder();
       // Keep track of the index in the original string we have done up to
       int currentIndex = 0;
       // Scan the string using find, and for each one found, do a translation
@@ -324,7 +324,7 @@ public class MatchMap
             if (x == '(')
             {
               // Process evaluation expression
-              StringBuffer numberBuf = new StringBuffer();
+              StringBuilder numberBuf = new StringBuilder();
               boolean upper = false;
               boolean lower = false;
               boolean mixed = false;
@@ -491,13 +491,13 @@ public class MatchMap
         pos++;
       }
 
-      StringBuffer sb;
+      StringBuilder sb;
 
       if (x == '"')
       {
         // Parse text
         pos++;
-        sb = new StringBuffer();
+        sb = new StringBuilder();
         while (true)
         {
           if (pos == text.length())
@@ -527,7 +527,7 @@ public class MatchMap
       }
 
       // Eat number at beginning
-      sb = new StringBuffer();
+      sb = new StringBuilder();
       while (true)
       {
         if (pos == text.length())

Modified: incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java (original)
+++ incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java Thu Jun  2 10:32:04 2011
@@ -87,6 +87,7 @@ public class MeridioAuthority extends or
 
   /** Set thread context.
   */
+  @Override
   public void setThreadContext(IThreadContext tc)
     throws ManifoldCFException
   {
@@ -96,6 +97,7 @@ public class MeridioAuthority extends or
   
   /** Clear thread context.
   */
+  @Override
   public void clearThreadContext()
   {
     super.clearThreadContext();
@@ -105,6 +107,7 @@ public class MeridioAuthority extends or
   /** Connect.  The configuration parameters are included.
   *@param configParams are the configuration parameters for this connection.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -273,6 +276,7 @@ public class MeridioAuthority extends or
 
   /** Check connection for sanity.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -368,6 +372,7 @@ public class MeridioAuthority extends or
 
   /** Close the connection.  Call this before discarding the repository connector.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -445,6 +450,7 @@ public class MeridioAuthority extends or
   *@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
   {
@@ -484,7 +490,7 @@ public class MeridioAuthority extends or
   }
   
   /** Uncached method to get an authorization response. */
-  public AuthorizationResponse getAuthorizationResponseUncached(String userName)
+  protected AuthorizationResponse getAuthorizationResponseUncached(String userName)
     throws ManifoldCFException
   {
     if (Logging.authorityConnectors.isDebugEnabled())
@@ -647,6 +653,7 @@ public class MeridioAuthority extends or
   *@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;
@@ -665,7 +672,8 @@ public class MeridioAuthority 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("Document Server");
@@ -815,6 +823,7 @@ public class MeridioAuthority 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
   {
@@ -1107,6 +1116,7 @@ public class MeridioAuthority 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
   {
@@ -1259,6 +1269,7 @@ public class MeridioAuthority 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
   {



Mime
View raw message