Return-Path: X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ECB764ED4 for ; Thu, 2 Jun 2011 10:32:33 +0000 (UTC) Received: (qmail 23129 invoked by uid 500); 2 Jun 2011 10:32:33 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 23087 invoked by uid 500); 2 Jun 2011 10:32:33 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 23080 invoked by uid 99); 2 Jun 2011 10:32:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jun 2011 10:32:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jun 2011 10:32:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AD18F2388A2C; Thu, 2 Jun 2011 10:32:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1130475 [3/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 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110602103209.AD18F2388A2C@eris.apache.org> Modified: incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java (original) +++ incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java Thu Jun 2 10:32:04 2011 @@ -49,6 +49,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.HashMap; +import java.util.List; import javax.xml.soap.SOAPException; @@ -94,6 +95,7 @@ public class MeridioConnector extends or * This must return a model value as specified above. *@return the model type value. */ + @Override public int getConnectorModel() { // Return the simplest model - full everything @@ -101,20 +103,6 @@ public class MeridioConnector extends or } - - /** 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 /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() - { - final String jspFolder = "meridio"; - return jspFolder; - } - /** Set up the session with Meridio */ protected void getSession() throws ManifoldCFException, ServiceInterruption @@ -259,6 +247,7 @@ public class MeridioConnector extends or *@param documentIdentifier is the document identifier. *@return the bin name. */ + @Override public String[] getBinNames(String documentIdentifier) { String dmwshost = params.getParameter("DMWSServerName"); @@ -269,6 +258,7 @@ public class MeridioConnector 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 { @@ -390,6 +380,7 @@ public class MeridioConnector extends or /** Close the connection. Call this before discarding the repository connector. */ + @Override public void disconnect() throws ManifoldCFException { @@ -460,6 +451,7 @@ public class MeridioConnector extends or /** 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() { return 10; @@ -472,6 +464,7 @@ public class MeridioConnector 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 { @@ -588,6 +581,7 @@ public class MeridioConnector extends or *@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 { @@ -629,6 +623,7 @@ public class MeridioConnector 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 activities, DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority) throws ManifoldCFException, ServiceInterruption @@ -721,7 +716,7 @@ public class MeridioConnector extends or java.util.Arrays.sort(sortArray); // Prepare the part of the version string that is decodeable - StringBuffer decodeableString = new StringBuffer(); + StringBuilder decodeableString = new StringBuilder(); // Add the metadata piece first packList(decodeableString,sortArray,'+'); @@ -814,7 +809,7 @@ public class MeridioConnector extends or { // Set the version string. The parseable stuff goes first, so parsing is easy. String version = doc.getStr_value(); - StringBuffer composedVersion = new StringBuffer(); + StringBuilder composedVersion = new StringBuilder(); composedVersion.append(decodeableString); composedVersion.append(version); // Added 9/7/2007 @@ -899,6 +894,7 @@ public class MeridioConnector extends or *@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 { @@ -1102,7 +1098,7 @@ public class MeridioConnector extends or x = docVersion.charAt(startPos++); if (x == '+') { - StringBuffer denyAclBuffer = new StringBuffer(); + StringBuilder denyAclBuffer = new StringBuilder(); unpack(denyAclBuffer,docVersion,startPos,'+'); denyAcl = denyAclBuffer.toString(); } @@ -1126,7 +1122,7 @@ public class MeridioConnector extends or char x = docVersion.charAt(startPos++); if (x == '+') { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); startPos = unpack(sb,docVersion,startPos,'+'); pathAttributeName = sb.toString(); sb.setLength(0); @@ -1492,7 +1488,8 @@ public class MeridioConnector 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 tabsArray) throws ManifoldCFException, IOException { tabsArray.add("Document Server"); @@ -1635,6 +1632,7 @@ public class MeridioConnector 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 { @@ -1942,6 +1940,7 @@ public class MeridioConnector 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 { @@ -2089,6 +2088,7 @@ public class MeridioConnector 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 { @@ -2189,7 +2189,8 @@ public class MeridioConnector 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 tabsArray) throws ManifoldCFException, IOException { tabsArray.add("Search Paths"); @@ -2284,6 +2285,7 @@ public class MeridioConnector 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 { @@ -2954,6 +2956,7 @@ public class MeridioConnector 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 { @@ -3305,6 +3308,7 @@ public class MeridioConnector 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 { @@ -3715,7 +3719,7 @@ public class MeridioConnector extends or } /** 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()) @@ -3729,7 +3733,7 @@ public class MeridioConnector extends or } /** 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()) { @@ -3747,7 +3751,7 @@ public class MeridioConnector extends or } /** 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) @@ -3759,7 +3763,7 @@ public class MeridioConnector extends or /** 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) { @@ -3771,7 +3775,7 @@ public class MeridioConnector extends or } /** 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; @@ -3782,7 +3786,7 @@ public class MeridioConnector extends or } /** 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; @@ -3801,7 +3805,7 @@ public class MeridioConnector extends or */ 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 { Modified: incubator/lcf/trunk/connectors/nullauthority/build.xml URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/nullauthority/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/nullauthority/build.xml (original) +++ incubator/lcf/trunk/connectors/nullauthority/build.xml Thu Jun 2 10:32:04 2011 @@ -24,7 +24,7 @@ - + @@ -34,7 +34,7 @@ - + Modified: incubator/lcf/trunk/connectors/nullauthority/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nullauthority/NullAuthority.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/nullauthority/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nullauthority/NullAuthority.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/nullauthority/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nullauthority/NullAuthority.java (original) +++ incubator/lcf/trunk/connectors/nullauthority/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nullauthority/NullAuthority.java Thu Jun 2 10:32:04 2011 @@ -52,6 +52,7 @@ public class NullAuthority extends org.a /** Check connection for sanity. */ + @Override public String check() throws ManifoldCFException { @@ -63,6 +64,7 @@ public class NullAuthority extends org.a *@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 { @@ -74,6 +76,7 @@ public class NullAuthority extends org.a *@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, which should never happen. @@ -93,7 +96,8 @@ public class NullAuthority 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 tabsArray) throws ManifoldCFException, IOException { out.print( @@ -123,6 +127,7 @@ public class NullAuthority 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 { @@ -138,6 +143,7 @@ public class NullAuthority 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 { @@ -151,6 +157,7 @@ public class NullAuthority 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 { Modified: incubator/lcf/trunk/connectors/nulloutput/build.xml URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/nulloutput/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/nulloutput/build.xml (original) +++ incubator/lcf/trunk/connectors/nulloutput/build.xml Thu Jun 2 10:32:04 2011 @@ -24,7 +24,7 @@ - + @@ -34,7 +34,7 @@ - + Modified: incubator/lcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java (original) +++ incubator/lcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java Thu Jun 2 10:32:04 2011 @@ -45,26 +45,18 @@ public class NullConnector 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 new String[]{INGEST_ACTIVITY,REMOVE_ACTIVITY}; } - /** Return the path for the UI interface JSP elements. - * This method should return the name of the folder, under the /output/ - * area, where the appropriate JSP's can be found. The name should NOT have a slash in it. - *@return the folder part - */ - public String getJSPFolder() - { - return "nullconnector"; - } - /** Connect. *@param configParameters is the set of configuration parameters, which * in this case describe the target appliance, basic auth configuration, etc. (This formerly came * out of the ini file.) */ + @Override public void connect(ConfigParams configParameters) { super.connect(configParameters); @@ -72,6 +64,7 @@ public class NullConnector extends org.a /** Close the connection. Call this before discarding the connection. */ + @Override public void disconnect() throws ManifoldCFException { @@ -87,6 +80,7 @@ public class NullConnector extends org.a /** 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 { @@ -112,6 +106,7 @@ public class NullConnector extends org.a *@return a string, of unlimited length, which uniquely describes output configuration and specification in such a way that if two such strings are equal, * the document will not need to be sent again to the output data store. */ + @Override public String getOutputDescription(OutputSpecification spec) throws ManifoldCFException, ServiceInterruption { @@ -132,6 +127,7 @@ public class NullConnector extends org.a *@param activities is the handle to an object that the implementer of an output connector may use to perform operations, such as logging processing activity. *@return the document status (accepted or permanently rejected). */ + @Override public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities) throws ManifoldCFException, ServiceInterruption { @@ -148,6 +144,7 @@ public class NullConnector extends org.a *@param outputDescription is the last description string that was constructed for this document by the getOutputDescription() method above. *@param activities is the handle to an object that the implementer of an output connector may use to perform operations, such as logging processing activity. */ + @Override public void removeDocument(String documentURI, String outputDescription, IOutputRemoveActivity activities) throws ManifoldCFException, ServiceInterruption { Modified: incubator/lcf/trunk/connectors/rss/build.xml URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/rss/build.xml (original) +++ incubator/lcf/trunk/connectors/rss/build.xml Thu Jun 2 10:32:04 2011 @@ -24,7 +24,7 @@ - + @@ -34,7 +34,7 @@ - + Modified: incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java (original) +++ incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java Thu Jun 2 10:32:04 2011 @@ -260,6 +260,7 @@ public class RSSConnector extends org.ap /** Return the list of activities that this connector supports (i.e. writes into the log). *@return the list. */ + @Override public String[] getActivitiesList() { return new String[]{ACTIVITY_FETCH, ACTIVITY_ROBOTSPARSE}; @@ -269,24 +270,13 @@ public class RSSConnector extends org.ap * This must return a model value as specified above. *@return the model type value. */ + @Override public int getConnectorModel() { // This connector is currently structured that the RSS feeds are the seeds. return MODEL_ALL; } - /** 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 /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 "rss"; - } - // All methods below this line will ONLY be called if a connect() call succeeded // on this instance! @@ -294,6 +284,7 @@ public class RSSConnector extends org.ap *@param configParams are the configuration parameters for this connection. * Note well: There are no exceptions allowed from this call, since it is expected to mainly establish connection parameters. */ + @Override public void connect(ConfigParams configParams) { super.connect(configParams); @@ -314,6 +305,7 @@ public class RSSConnector extends org.ap /** This method is periodically called for all connectors that are connected but not * in active use. */ + @Override public void poll() throws ManifoldCFException { @@ -323,6 +315,7 @@ public class RSSConnector extends org.ap /** Check status of connection. */ + @Override public String check() throws ManifoldCFException { @@ -332,6 +325,7 @@ public class RSSConnector extends org.ap /** Close the connection. Call this before discarding the repository connector. */ + @Override public void disconnect() throws ManifoldCFException { @@ -366,6 +360,7 @@ public class RSSConnector extends org.ap *@param documentIdentifier is the document identifier. *@return the bin name. */ + @Override public String[] getBinNames(String documentIdentifier) { try @@ -405,6 +400,7 @@ public class RSSConnector extends org.ap *@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 @@ -441,7 +437,7 @@ public class RSSConnector extends org.ap CanonicalizationPolicy p = policies.findMatch(rawURL); // Filter out control characters - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int i = 0; while (i < rawURL.length()) { @@ -626,7 +622,7 @@ public class RSSConnector extends org.ap } java.util.Arrays.sort(sortArray); - StringBuffer newString = new StringBuffer(); + StringBuilder newString = new StringBuilder(); boolean isFirst = true; i = 0; while (i < sortArray.length) @@ -650,7 +646,7 @@ public class RSSConnector extends org.ap else { // Do not reorder! - StringBuffer newString = new StringBuffer(); + StringBuilder newString = new StringBuilder(); int index = 0; boolean isFirst = true; while (index < queryString.length()) @@ -743,6 +739,7 @@ public class RSSConnector extends org.ap * 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 jobType, boolean usesDefaultAuthority) throws ManifoldCFException, ServiceInterruption @@ -776,7 +773,7 @@ public class RSSConnector extends org.ap String value = nv.getValue(); fixedListStrings[0] = name; fixedListStrings[1] = value; - StringBuffer newsb = new StringBuffer(); + StringBuilder newsb = new StringBuilder(); packFixedList(newsb,fixedListStrings,'='); metadata[k++] = newsb.toString(); } @@ -839,7 +836,7 @@ public class RSSConnector extends org.ap InputStream is = dechromedData[0].getUtf8Stream(); try { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); long checkSum = cache.addData(activities,urlValue,is); // Grab what we need from the passed-down data for the document. These will all become part // of the version string. @@ -931,9 +928,9 @@ public class RSSConnector extends org.ap if (false && jobType == JOBMODE_CONTINUOUS && oldVersionString != null && oldVersionString.startsWith("-")) { // It's a feed, so the last etag and last-modified fields should be encoded in this version string. - StringBuffer lastETagBuffer = new StringBuffer(); + StringBuilder lastETagBuffer = new StringBuilder(); int unpackPos = unpack(lastETagBuffer,oldVersionString,1,'+'); - StringBuffer lastModifiedBuffer = new StringBuffer(); + StringBuilder lastModifiedBuffer = new StringBuilder(); unpackPos = unpack(lastModifiedBuffer,oldVersionString,unpackPos,'+'); if (lastETagBuffer.length() > 0) lastETagValue = lastETagBuffer.toString(); @@ -1068,7 +1065,7 @@ public class RSSConnector extends org.ap try { long checkSum = cache.addData(activities,urlValue,is); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (ingestURL != null) { // We think it is ingestable. The version string accordingly starts with a "+". @@ -1218,6 +1215,7 @@ public class RSSConnector extends org.ap *@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, int jobType) throws ManifoldCFException, ServiceInterruption @@ -1315,7 +1313,7 @@ public class RSSConnector extends org.ap // Treat it as an ingestable document. // Version *should* start with a "+". ArrayList acls = new ArrayList(); - StringBuffer denyAclBuffer = new StringBuffer(); + StringBuilder denyAclBuffer = new StringBuilder(); int startPos = unpackList(acls,version,1,'+'); if (startPos < version.length() && version.charAt(startPos++) == '+') { @@ -1323,7 +1321,7 @@ public class RSSConnector extends org.ap } ArrayList metadata = new ArrayList(); startPos = unpackList(metadata,version,startPos,'+'); - StringBuffer ingestUrlBuffer = new StringBuffer(); + StringBuilder ingestUrlBuffer = new StringBuilder(); startPos = unpack(ingestUrlBuffer,version,startPos,'+'); String ingestURL = ingestUrlBuffer.toString(); ArrayList pubDates = new ArrayList(); @@ -1493,6 +1491,7 @@ public class RSSConnector extends org.ap *@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 { @@ -1525,7 +1524,8 @@ public class RSSConnector extends org.ap *@param parameters are the configuration parameters, as they currently exist, for this connection being configured. *@param tabsArray is an array of tab names. Add to this array any tab names that are specific to the connector. */ - public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray) + @Override + public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List tabsArray) throws ManifoldCFException, IOException { tabsArray.add("Email"); @@ -1590,6 +1590,7 @@ public class RSSConnector extends org.ap *@param parameters are the configuration parameters, as they currently exist, for this connection being configured. *@param tabName is the current tab name. */ + @Override public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName) throws ManifoldCFException, IOException { @@ -1757,6 +1758,7 @@ public class RSSConnector extends org.ap *@param parameters are the configuration parameters, as they currently exist, for this connection being configured. *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page). */ + @Override public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters) throws ManifoldCFException { @@ -1804,6 +1806,7 @@ public class RSSConnector extends org.ap *@param out is the output to which any HTML should be sent. *@param parameters are the configuration parameters, as they currently exist, for this connection being configured. */ + @Override public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters) throws ManifoldCFException, IOException { @@ -1852,7 +1855,8 @@ public class RSSConnector extends org.ap *@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 tabsArray) throws ManifoldCFException, IOException { tabsArray.add("URLs"); @@ -1971,6 +1975,7 @@ public class RSSConnector extends org.ap *@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 { @@ -1979,7 +1984,7 @@ public class RSSConnector extends org.ap // Build the url seed string, and the url regexp match and map - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); ArrayList regexp = new ArrayList(); ArrayList matchStrings = new ArrayList(); int feedTimeoutValue = 60; @@ -2567,6 +2572,7 @@ public class RSSConnector extends org.ap *@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 { @@ -2990,6 +2996,7 @@ public class RSSConnector extends org.ap *@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 { @@ -5043,7 +5050,7 @@ public class RSSConnector extends org.ap } /** 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()) @@ -5057,7 +5064,7 @@ public class RSSConnector extends org.ap } /** 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()) { @@ -5075,7 +5082,7 @@ public class RSSConnector extends org.ap } /** 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) @@ -5087,7 +5094,7 @@ public class RSSConnector extends org.ap /** 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) { @@ -5099,7 +5106,7 @@ public class RSSConnector extends org.ap } /** 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; @@ -5110,7 +5117,7 @@ public class RSSConnector extends org.ap } /** 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; @@ -5129,7 +5136,7 @@ public class RSSConnector extends org.ap */ 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 { @@ -5318,13 +5325,13 @@ public class RSSConnector extends org.ap pos++; } - StringBuffer sb; + StringBuilder sb; if (x == '"') { // Parse text pos++; - sb = new StringBuffer(); + sb = new StringBuilder(); while (true) { if (pos == text.length()) @@ -5354,7 +5361,7 @@ public class RSSConnector extends org.ap } // Eat number at beginning - sb = new StringBuffer(); + sb = new StringBuilder(); while (true) { if (pos == text.length()) @@ -5515,7 +5522,7 @@ public class RSSConnector extends org.ap if (evalExpression == null || evalExpression.length() == 0) return url; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); EvaluatorTokenStream et = new EvaluatorTokenStream(evalExpression); while (true) Modified: incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java (original) +++ incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java Thu Jun 2 10:32:04 2011 @@ -146,7 +146,7 @@ public class Robots */ protected static String makeReadable(String inputString) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int i = 0; while (i < inputString.length()) { Modified: incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java (original) +++ incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java Thu Jun 2 10:32:04 2011 @@ -561,7 +561,7 @@ public class ThrottledFetcher throws ManifoldCFException, ServiceInterruption { - StringBuffer sb = new StringBuffer(protocol); + StringBuilder sb = new StringBuilder(protocol); sb.append("://").append(server.getServerName()); if (port != -1) sb.append(":").append(Integer.toString(port)); Modified: incubator/lcf/trunk/connectors/sharepoint/build.xml URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/sharepoint/build.xml (original) +++ incubator/lcf/trunk/connectors/sharepoint/build.xml Thu Jun 2 10:32:04 2011 @@ -95,7 +95,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -115,7 +115,7 @@ - + Modified: incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/MatchMap.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/MatchMap.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/MatchMap.java (original) +++ incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/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/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original) +++ incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Thu Jun 2 10:32:04 2011 @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.List; import java.net.*; import org.apache.commons.httpclient.*; @@ -199,27 +200,17 @@ public class SharePointRepository 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_FETCH}; } - /** 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 /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 "sharepoint"; - } - /** Connect. *@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); @@ -229,6 +220,7 @@ public class SharePointRepository extend /** Close the connection. Call this before discarding the repository connector. */ + @Override public void disconnect() throws ManifoldCFException { @@ -265,6 +257,7 @@ public class SharePointRepository extend *@param documentIdentifier is the document identifier. *@return the bin name. */ + @Override public String[] getBinNames(String documentIdentifier) { return new String[]{serverName}; @@ -273,6 +266,7 @@ public class SharePointRepository extend /** 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() { // Since we pick up acls on a per-lib basis, it helps to have this bigger than 1. @@ -282,6 +276,7 @@ public class SharePointRepository extend /** 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 { @@ -314,6 +309,7 @@ public class SharePointRepository extend /** This method is periodically called for all connectors that are connected but not * in active use. */ + @Override public void poll() throws ManifoldCFException { @@ -328,6 +324,7 @@ public class SharePointRepository 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 { @@ -457,6 +454,7 @@ public class SharePointRepository extend *@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 @@ -485,6 +483,7 @@ public class SharePointRepository 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 @@ -530,7 +529,7 @@ public class SharePointRepository extend // 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); @@ -677,7 +676,7 @@ public class SharePointRepository extend String versionToken = modifyDate; // Revamped version string on 11/8/2006 to make parseability better - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); packList(sb,sortedMetadataFields,'+'); @@ -810,6 +809,7 @@ public class SharePointRepository extend *@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 { @@ -915,7 +915,7 @@ public class SharePointRepository extend nodeDocs.clear(); docs.processPath(nodeDocs, "*", documents); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for( int j =0; j < nodeDocs.size(); j++) { Object node = nodeDocs.get(j); @@ -989,7 +989,7 @@ public class SharePointRepository extend startPosition = unpackList(acls,version,startPosition,'+'); if (startPosition < version.length()) { - StringBuffer denyAclBuffer = new StringBuffer(); + StringBuilder denyAclBuffer = new StringBuilder(); startPosition = unpack(denyAclBuffer,version,startPosition,'+'); denyAcl = denyAclBuffer.toString(); } @@ -1197,7 +1197,7 @@ public class SharePointRepository extend if (Logging.connectors.isDebugEnabled()) { j = 0; - StringBuffer sb = new StringBuffer("SharePoint: Acls: [ "); + StringBuilder sb = new StringBuilder("SharePoint: Acls: [ "); while (j < actualAcls.length) { sb.append(actualAcls[j++]).append(" "); @@ -1349,7 +1349,8 @@ public class SharePointRepository 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 tabsArray) throws ManifoldCFException, IOException { tabsArray.add("Server"); @@ -1475,6 +1476,7 @@ public class SharePointRepository 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 { @@ -1632,6 +1634,7 @@ public class SharePointRepository 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 { @@ -1732,6 +1735,7 @@ public class SharePointRepository 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 { @@ -1780,7 +1784,8 @@ public class SharePointRepository 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 tabsArray) throws ManifoldCFException, IOException { tabsArray.add("Paths"); @@ -1956,6 +1961,7 @@ public class SharePointRepository 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 { @@ -2631,7 +2637,7 @@ public class SharePointRepository extend String lib = sn.getAttributeValue("lib"); String path = site + "/" + lib + "/*"; String allmetadata = sn.getAttributeValue("allmetadata"); - StringBuffer metadataFieldList = new StringBuffer(); + StringBuilder metadataFieldList = new StringBuilder(); ArrayList metadataFieldArray = new ArrayList(); if (allmetadata == null || !allmetadata.equals("true")) { @@ -2717,7 +2723,7 @@ public class SharePointRepository extend String path = sn.getAttributeValue("match"); String action = sn.getAttributeValue("action"); String allmetadata = sn.getAttributeValue("allmetadata"); - StringBuffer metadataFieldList = new StringBuffer(); + StringBuilder metadataFieldList = new StringBuilder(); ArrayList metadataFieldArray = new ArrayList(); if (action.equals("include")) { @@ -3231,6 +3237,7 @@ public class SharePointRepository 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 { @@ -3747,6 +3754,7 @@ public class SharePointRepository 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 { @@ -3886,7 +3894,7 @@ public class SharePointRepository extend String path = site + "/" + lib + "/*"; String allmetadata = sn.getAttributeValue("allmetadata"); - StringBuffer metadataFieldList = new StringBuffer(); + StringBuilder metadataFieldList = new StringBuilder(); if (allmetadata == null || !allmetadata.equals("true")) { int j = 0; @@ -3936,7 +3944,7 @@ public class SharePointRepository extend String path = sn.getAttributeValue("match"); String action = sn.getAttributeValue("action"); String allmetadata = sn.getAttributeValue("allmetadata"); - StringBuffer metadataFieldList = new StringBuffer(); + StringBuilder metadataFieldList = new StringBuilder(); if (action.equals("include")) { if (allmetadata == null || !allmetadata.equals("true")) @@ -4861,7 +4869,7 @@ public class SharePointRepository extend */ public static String decodePath(String relPath) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String[] pathEntries = relPath.split("/"); int k = 0; @@ -4882,7 +4890,7 @@ public class SharePointRepository extend */ public static String encodePath(String relPath) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String[] pathEntries = relPath.split("/"); int k = 0; @@ -4899,7 +4907,7 @@ public class SharePointRepository 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()) @@ -4913,7 +4921,7 @@ public class SharePointRepository 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()) { @@ -4931,7 +4939,7 @@ public class SharePointRepository 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) @@ -4943,7 +4951,7 @@ public class SharePointRepository 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) { @@ -4955,7 +4963,7 @@ public class SharePointRepository 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; @@ -4966,7 +4974,7 @@ public class SharePointRepository 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; @@ -4985,7 +4993,7 @@ public class SharePointRepository 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 { Modified: incubator/lcf/trunk/connectors/solr/build.xml URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/solr/build.xml (original) +++ incubator/lcf/trunk/connectors/solr/build.xml Thu Jun 2 10:32:04 2011 @@ -24,7 +24,7 @@ - + @@ -34,7 +34,7 @@ - + Modified: incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original) +++ incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Thu Jun 2 10:32:04 2011 @@ -994,7 +994,7 @@ public class HttpPoster /** XML encoding */ protected static String xmlEncode(String input) { - StringBuffer sb = new StringBuffer(""); return sb.toString(); Modified: incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java (original) +++ incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java Thu Jun 2 10:32:04 2011 @@ -56,26 +56,18 @@ public class SolrConnector 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 new String[]{INGEST_ACTIVITY,REMOVE_ACTIVITY}; } - /** Return the path for the UI interface JSP elements. - * This method should return the name of the folder, under the /output/ - * area, where the appropriate JSP's can be found. The name should NOT have a slash in it. - *@return the folder part - */ - public String getJSPFolder() - { - return "solr"; - } - /** Connect. *@param configParameters is the set of configuration parameters, which * in this case describe the target appliance, basic auth configuration, etc. (This formerly came * out of the ini file.) */ + @Override public void connect(ConfigParams configParameters) { super.connect(configParameters); @@ -83,6 +75,7 @@ public class SolrConnector extends org.a /** Close the connection. Call this before discarding the connection. */ + @Override public void disconnect() throws ManifoldCFException { @@ -170,6 +163,7 @@ public class SolrConnector extends org.a /** 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 { @@ -196,10 +190,11 @@ public class SolrConnector extends org.a *@return a string, of unlimited length, which uniquely describes output configuration and specification in such a way that if two such strings are equal, * the document will not need to be sent again to the output data store. */ + @Override public String getOutputDescription(OutputSpecification spec) throws ManifoldCFException, ServiceInterruption { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); // All the arguments need to go into this string, since they affect ingestion. Map args = new HashMap(); @@ -244,7 +239,7 @@ public class SolrConnector extends org.a String value = (String)values.get(j++); fixedList[0] = name; fixedList[1] = value; - StringBuffer pairBuffer = new StringBuffer(); + StringBuilder pairBuffer = new StringBuilder(); packFixedList(pairBuffer,fixedList,'='); nameValues.add(pairBuffer.toString()); } @@ -285,7 +280,7 @@ public class SolrConnector extends org.a String target = (String)fieldMap.get(source); fixedList[0] = source; fixedList[1] = target; - StringBuffer pairBuffer = new StringBuffer(); + StringBuilder pairBuffer = new StringBuilder(); packFixedList(pairBuffer,fixedList,'='); sourceTargets.add(pairBuffer.toString()); } @@ -309,6 +304,7 @@ public class SolrConnector extends org.a *@param activities is the handle to an object that the implementer of an output connector may use to perform operations, such as logging processing activity. *@return the document status (accepted or permanently rejected). */ + @Override public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities) throws ManifoldCFException, ServiceInterruption { @@ -363,6 +359,7 @@ public class SolrConnector extends org.a *@param outputDescription is the last description string that was constructed for this document by the getOutputDescription() method above. *@param activities is the handle to an object that the implementer of an output connector may use to perform operations, such as logging processing activity. */ + @Override public void removeDocument(String documentURI, String outputDescription, IOutputRemoveActivity activities) throws ManifoldCFException, ServiceInterruption { @@ -378,6 +375,7 @@ public class SolrConnector extends org.a * is a good time to synchronize things. It is called whenever a job is either completed or aborted. *@param activities is the handle to an object that the implementer of an output connector may use to perform operations, such as logging processing activity. */ + @Override public void noteJobComplete(IOutputNotifyActivity activities) throws ManifoldCFException, ServiceInterruption { @@ -405,7 +403,8 @@ public class SolrConnector 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 tabsArray) throws ManifoldCFException, IOException { tabsArray.add("Server"); @@ -591,6 +590,7 @@ public class SolrConnector 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 { @@ -984,6 +984,7 @@ public class SolrConnector 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 { @@ -1158,6 +1159,7 @@ public class SolrConnector 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 { @@ -1250,7 +1252,8 @@ public class SolrConnector extends org.a *@param os is the current output specification for this job. *@param tabsArray is an array of tab names. Add to this array any tab names that are specific to the connector. */ - public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification os, ArrayList tabsArray) + @Override + public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification os, List tabsArray) throws ManifoldCFException, IOException { tabsArray.add("Field Mapping"); @@ -1300,6 +1303,7 @@ public class SolrConnector extends org.a *@param os is the current output specification for this job. *@param tabName is the current tab name. */ + @Override public void outputSpecificationBody(IHTTPOutput out, OutputSpecification os, String tabName) throws ManifoldCFException, IOException { @@ -1443,6 +1447,7 @@ public class SolrConnector extends org.a *@param os is the current output specification for this job. *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page). */ + @Override public String processSpecificationPost(IPostParameters variableContext, OutputSpecification os) throws ManifoldCFException { @@ -1501,6 +1506,7 @@ public class SolrConnector extends org.a *@param out is the output to which any HTML should be sent. *@param os is the current output specification for this job. */ + @Override public void viewSpecification(IHTTPOutput out, OutputSpecification os) throws ManifoldCFException, IOException { @@ -1585,7 +1591,7 @@ public class SolrConnector extends org.a // Protected methods /** 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()) @@ -1599,7 +1605,7 @@ public class SolrConnector 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()) { @@ -1617,7 +1623,7 @@ public class SolrConnector 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) @@ -1629,7 +1635,7 @@ public class SolrConnector 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) { @@ -1641,7 +1647,7 @@ public class SolrConnector 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; @@ -1652,7 +1658,7 @@ public class SolrConnector 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; @@ -1671,7 +1677,7 @@ public class SolrConnector 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 { Modified: incubator/lcf/trunk/connectors/webcrawler/build.xml URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/webcrawler/build.xml (original) +++ incubator/lcf/trunk/connectors/webcrawler/build.xml Thu Jun 2 10:32:04 2011 @@ -24,7 +24,7 @@ - + @@ -34,7 +34,7 @@ - + Modified: incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/BasicParseState.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/BasicParseState.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/BasicParseState.java (original) +++ incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/BasicParseState.java Thu Jun 2 10:32:04 2011 @@ -45,9 +45,9 @@ public class BasicParseState protected int currentState = BASICPARSESTATE_NORMAL; - protected StringBuffer currentTagNameBuffer = null; - protected StringBuffer currentAttrNameBuffer = null; - protected StringBuffer currentValueBuffer = null; + protected StringBuilder currentTagNameBuffer = null; + protected StringBuilder currentAttrNameBuffer = null; + protected StringBuilder currentValueBuffer = null; protected String currentTagName = null; protected String currentAttrName = null; @@ -84,12 +84,12 @@ public class BasicParseState else if (thisChar == '/') { currentState = BASICPARSESTATE_IN_END_TAG_NAME; - currentTagNameBuffer = new StringBuffer(); + currentTagNameBuffer = new StringBuilder(); } else { currentState = BASICPARSESTATE_IN_TAG_NAME; - currentTagNameBuffer = new StringBuffer(); + currentTagNameBuffer = new StringBuilder(); if (!isHTMLWhitespace(thisChar)) currentTagNameBuffer.append(thisCharLower); } @@ -133,7 +133,7 @@ public class BasicParseState currentTagNameBuffer = null; currentAttrMap = new HashMap(); currentState = BASICPARSESTATE_IN_ATTR_NAME; - currentAttrNameBuffer = new StringBuffer(); + currentAttrNameBuffer = new StringBuilder(); } } else if (thisChar == '/') @@ -189,7 +189,7 @@ public class BasicParseState currentAttrName = currentAttrNameBuffer.toString(); currentAttrNameBuffer = null; currentState = BASICPARSESTATE_IN_ATTR_VALUE; - currentValueBuffer = new StringBuffer(); + currentValueBuffer = new StringBuilder(); } } else if (thisChar == '/') @@ -231,7 +231,7 @@ public class BasicParseState if (thisChar == '=') { currentState = BASICPARSESTATE_IN_ATTR_VALUE; - currentValueBuffer = new StringBuffer(); + currentValueBuffer = new StringBuilder(); } else if (thisChar == '>') { @@ -251,7 +251,7 @@ public class BasicParseState { currentAttrMap.put(currentAttrName,""); currentState = BASICPARSESTATE_IN_ATTR_NAME; - currentAttrNameBuffer = new StringBuffer(); + currentAttrNameBuffer = new StringBuilder(); currentAttrNameBuffer.append(thisCharLower); currentAttrName = null; } @@ -310,7 +310,7 @@ public class BasicParseState currentAttrName = null; currentValueBuffer = null; currentState = BASICPARSESTATE_IN_ATTR_NAME; - currentAttrNameBuffer = new StringBuffer(); + currentAttrNameBuffer = new StringBuilder(); } else currentValueBuffer.append(thisChar); @@ -322,7 +322,7 @@ public class BasicParseState currentAttrName = null; currentValueBuffer = null; currentState = BASICPARSESTATE_IN_ATTR_NAME; - currentAttrNameBuffer = new StringBuffer(); + currentAttrNameBuffer = new StringBuilder(); } else currentValueBuffer.append(thisChar); @@ -334,7 +334,7 @@ public class BasicParseState currentAttrName = null; currentValueBuffer = null; currentState = BASICPARSESTATE_IN_ATTR_NAME; - currentAttrNameBuffer = new StringBuffer(); + currentAttrNameBuffer = new StringBuilder(); } else if (thisChar == '/') { @@ -381,7 +381,7 @@ public class BasicParseState /** Decode an html attribute */ protected static String htmlAttributeDecode(String input) { - StringBuffer output = new StringBuffer(); + StringBuilder output = new StringBuilder(); int i = 0; while (i < input.length()) { @@ -415,7 +415,7 @@ public class BasicParseState try { int value = Integer.parseInt(input.substring(1)); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append((char)value); return sb.toString(); } Modified: incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/CookieManager.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/CookieManager.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/CookieManager.java (original) +++ incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/CookieManager.java Thu Jun 2 10:32:04 2011 @@ -422,7 +422,7 @@ public class CookieManager extends org.a */ protected static String portsToString(int[] ports) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int i = 0; while (i < ports.length) { Modified: incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java (original) +++ incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java Thu Jun 2 10:32:04 2011 @@ -278,7 +278,7 @@ public class RobotsManager extends org.a */ protected static String makeReadable(String inputString) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int i = 0; while (i < inputString.length()) { Modified: incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java?rev=1130475&r1=1130474&r2=1130475&view=diff ============================================================================== --- incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java (original) +++ incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java Thu Jun 2 10:32:04 2011 @@ -1281,7 +1281,7 @@ public class ThrottledFetcher LoginCookies loginCookies) throws ManifoldCFException, ServiceInterruption { - StringBuffer sb = new StringBuffer(protocol); + StringBuilder sb = new StringBuilder(protocol); sb.append("://").append(server); if (port != -1) { @@ -1359,7 +1359,7 @@ public class ThrottledFetcher String fullUrlPath; if (formData != null) { - StringBuffer psb = new StringBuffer(urlPath); + StringBuilder psb = new StringBuilder(urlPath); Iterator iter = formData.getElementIterator(); char appendChar; if (urlPath.indexOf("?") == -1)