manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1130475 [1/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
Author: kwright
Date: Thu Jun  2 10:32:04 2011
New Revision: 1130475

URL: http://svn.apache.org/viewvc?rev=1130475&view=rev
Log:
Merge changes for CONNECTORS-203.

Modified:
    incubator/lcf/trunk/   (props changed)
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/connectors/activedirectory/build.xml
    incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
    incubator/lcf/trunk/connectors/documentum/build.xml
    incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
    incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
    incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/MatchMap.java
    incubator/lcf/trunk/connectors/filenet/build.xml
    incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
    incubator/lcf/trunk/connectors/filesystem/build.xml
    incubator/lcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
    incubator/lcf/trunk/connectors/gts/build.xml
    incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
    incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
    incubator/lcf/trunk/connectors/jcifs/build.xml
    incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/GetConnectionInfo.java
    incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/MatchMap.java
    incubator/lcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
    incubator/lcf/trunk/connectors/jdbc/build.xml
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    incubator/lcf/trunk/connectors/livelink/build.xml
    incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/GetConnectionInfo.java
    incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
    incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
    incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
    incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/MatchMap.java
    incubator/lcf/trunk/connectors/memex/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/memex/MatchMap.java
    incubator/lcf/trunk/connectors/meridio/build.xml
    incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MatchMap.java
    incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
    incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
    incubator/lcf/trunk/connectors/nullauthority/build.xml
    incubator/lcf/trunk/connectors/nullauthority/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nullauthority/NullAuthority.java
    incubator/lcf/trunk/connectors/nulloutput/build.xml
    incubator/lcf/trunk/connectors/nulloutput/connector/src/main/java/org/apache/manifoldcf/agents/output/nullconnector/NullConnector.java
    incubator/lcf/trunk/connectors/rss/build.xml
    incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
    incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/Robots.java
    incubator/lcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/ThrottledFetcher.java
    incubator/lcf/trunk/connectors/sharepoint/build.xml
    incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/MatchMap.java
    incubator/lcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
    incubator/lcf/trunk/connectors/solr/build.xml
    incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
    incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
    incubator/lcf/trunk/connectors/webcrawler/build.xml
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/BasicParseState.java
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/CookieManager.java
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/RobotsManager.java
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/ThrottledFetcher.java
    incubator/lcf/trunk/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLStringContext.java
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/common/XMLWriterContext.java
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
    incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/outputconnection/OutputConnectionManager.java
    incubator/lcf/trunk/framework/api-servlet/src/main/java/org/apache/manifoldcf/api/APIServlet.java
    incubator/lcf/trunk/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/servlet/UserACLServlet.java
    incubator/lcf/trunk/framework/build.xml
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/cachemanager/CacheManager.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/common/XMLDoc.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/BaseTable.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/QueryDescription.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/RRow.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/RSet.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ConfigParams.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/Configuration.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ConfigurationNode.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IDBInterface.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IResultRow.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ResultSpecification.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/StringSet.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/LockObject.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/CheckAll.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/AddScheduledTime.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/GetJobSchedule.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobStatuses.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/ListJobs.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunDocumentStatus.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxActivityHistory.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunMaxBandwidthHistory.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunQueueStatus.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/RunSimpleHistory.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connectors/BaseRepositoryConnector.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnector.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/QueueTracker.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/SortOrder.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PrereqEventManager.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java
    incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java
    incubator/lcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/util/Encoder.java
    incubator/lcf/trunk/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/util/Formatter.java

Propchange: incubator/lcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun  2 10:32:04 2011
@@ -1,4 +1,5 @@
 /incubator/lcf/branches/CONNECTORS-151-branch:1063444-1071206
 /incubator/lcf/branches/CONNECTORS-160-branch:1071241-1071534
 /incubator/lcf/branches/CONNECTORS-195:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203:1128152-1130460
 /incubator/lcf/branches/CONNECTORS-32:1092556-1094216

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Thu Jun  2 10:32:04 2011
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.3-dev =========================
 
+CONNECTORS-203: Move to Java 1.5 compilation and conventions.
+(Erlend GarĂ¥sen, Tommaso Teofili, Karl Wright et al)
+
 CONNECTORS-201: Add activity interface ICarrydownActivity to allow
 sharing of functionality across IVersionActivity and IProcessActivity.
 (Karl Wright)

Modified: incubator/lcf/trunk/connectors/activedirectory/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/activedirectory/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/activedirectory/build.xml (original)
+++ incubator/lcf/trunk/connectors/activedirectory/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/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java (original)
+++ incubator/lcf/trunk/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java Thu Jun  2 10:32:04 2011
@@ -74,6 +74,7 @@ public class ActiveDirectoryAuthority ex
 
   /** Set thread context.
   */
+  @Override
   public void setThreadContext(IThreadContext tc)
     throws ManifoldCFException
   {
@@ -83,6 +84,7 @@ public class ActiveDirectoryAuthority ex
   
   /** Clear thread context.
   */
+  @Override
   public void clearThreadContext()
   {
     super.clearThreadContext();
@@ -92,6 +94,7 @@ public class ActiveDirectoryAuthority ex
   /** Connect.  The configuration parameters are included.
   *@param configParams are the configuration parameters for this connection.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -111,6 +114,7 @@ public class ActiveDirectoryAuthority ex
 
   /** Check connection for sanity.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -120,6 +124,7 @@ public class ActiveDirectoryAuthority ex
 
   /** Poll.  The connection should be closed if it has been idle for too long.
   */
+  @Override
   public void poll()
     throws ManifoldCFException
   {
@@ -148,6 +153,7 @@ public class ActiveDirectoryAuthority ex
   
   /** Close the connection.  Call this before discarding the repository connector.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -165,6 +171,7 @@ public class ActiveDirectoryAuthority ex
   *@return the response tokens (according to the current authority).
   * (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
   */
+  @Override
   public AuthorizationResponse getAuthorizationResponse(String userName)
     throws ManifoldCFException
   {
@@ -297,6 +304,7 @@ public class ActiveDirectoryAuthority ex
   *@param userName is the user name or identifier.
   *@return the default response tokens, presuming that the connect method fails.
   */
+  @Override
   public AuthorizationResponse getDefaultAuthorizationResponse(String userName)
   {
     // The default response if the getConnection method fails
@@ -316,7 +324,8 @@ public class ActiveDirectoryAuthority ex
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
+  @Override
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Domain Controller");
@@ -368,6 +377,7 @@ public class ActiveDirectoryAuthority ex
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -442,6 +452,7 @@ public class ActiveDirectoryAuthority ex
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
+  @Override
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -470,6 +481,7 @@ public class ActiveDirectoryAuthority ex
   *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
+  @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
     throws ManifoldCFException, IOException
   {
@@ -594,7 +606,7 @@ public class ActiveDirectoryAuthority ex
     }
     
     //Build the DN searchBase from domain part
-    StringBuffer domainsb = new StringBuffer();
+    StringBuilder domainsb = new StringBuilder();
     int j = 0;
     while (true)
     {
@@ -661,7 +673,7 @@ public class ActiveDirectoryAuthority ex
   protected static String ldapEscape(String input)
   {
     //Add escape sequence to all commas
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     int index = 0;
     while (true)
     {
@@ -681,7 +693,7 @@ public class ActiveDirectoryAuthority ex
   /** Convert a binary SID to a string */
   protected static String sid2String(byte[] SID)
   {
-    StringBuffer strSID = new StringBuffer("S");
+    StringBuilder strSID = new StringBuilder("S");
     long version = SID[0];
     strSID.append("-").append(Long.toString(version));
     long authority = SID[4];

Modified: incubator/lcf/trunk/connectors/documentum/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/build.xml (original)
+++ incubator/lcf/trunk/connectors/documentum/build.xml Thu Jun  2 10:32:04 2011
@@ -41,7 +41,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"/>
             </classpath>
@@ -52,12 +52,12 @@
 
     <target name="compile-interface" depends="precompile-check" if="canBuild">
         <mkdir dir="build/interface/classes"/>
-        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" classpath="" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source"/>
+        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" classpath="" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source"/>
     </target>
 
     <target name="compile-implementation" depends="compile-interface,precompile-check" if="canBuild">
         <mkdir dir="build/implementation/classes"/>
-        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath id="implementation.classpath">
                 <fileset dir="dfc"> 
                     <include name="*.jar"/> 
@@ -113,17 +113,17 @@
     
     <target name="compile-server" depends="compile-interface,compile-implementation,compile-rmic,precompile-check" if="canBuild">
         <mkdir dir="build/server/classes"/>
-        <javac srcdir="server/src/main/java" destdir="build/server/classes" classpath="build/interface/classes:build/implementation/classes:build/rmistub/classes:build/rmiskel/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source"/>
+        <javac srcdir="server/src/main/java" destdir="build/server/classes" classpath="build/interface/classes:build/implementation/classes:build/rmistub/classes:build/rmiskel/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source"/>
     </target>
 
     <target name="compile-registry" depends="compile-interface,precompile-check" if="canBuild">
         <mkdir dir="build/registry/classes"/>
-        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" classpath="build/interface/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source"/>
+        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" classpath="build/interface/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source"/>
     </target>
 
     <target name="compile-connector" depends="compile-interface,compile-rmic,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">
+        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5">
             <classpath>
                 <fileset dir="lib" includes="*.jar"/>
                 <pathelement location="build/interface/classes"/>

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

Modified: incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java (original)
+++ incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java Thu Jun  2 10:32:04 2011
@@ -550,6 +550,7 @@ public class DCTM extends org.apache.man
 
   /** Let the crawler know the completeness of the information we are giving it.
   */
+  @Override
   public int getConnectorModel()
   {
     // For documentum, originally we thought it would return the deleted objects when we
@@ -563,21 +564,16 @@ public class DCTM extends org.apache.man
   /** Return the list of activities that this connector supports (i.e. writes into the log).
   *@return the list.
   */
+  @Override
   public String[] getActivitiesList()
   {
     return new String[]{ACTIVITY_FETCH};
   }
 
-  /** Get the folder for the jsps.
-  */
-  public String getJSPFolder()
-  {
-    return "DCTM";
-  }
-
   /** Test the connection.  Returns a string describing the connection integrity.
   *@return the connection's status as a displayable string.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -611,6 +607,7 @@ public class DCTM extends org.apache.man
   *@param configParams are the configuration parameters for this connection.
   * Note well: There are no exceptions allowed from this call, since it is expected to mainly establish connection parameters.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -628,6 +625,7 @@ public class DCTM extends org.apache.man
   /** This method is periodically called for all connectors that are connected but not
   * in active use.
   */
+  @Override
   public void poll()
     throws ManifoldCFException
   {
@@ -636,6 +634,7 @@ public class DCTM extends org.apache.man
 
   /** Disconnect from Documentum.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -713,6 +712,7 @@ public class DCTM extends org.apache.man
 
   /** Get the bin (so throttling makes sense).  We will bin by docbase.
   */
+  @Override
   public String[] getBinNames(String documentIdentifier)
   {
     // Previously, this actually established a session and went back-and-forth with
@@ -851,6 +851,7 @@ public class DCTM extends org.apache.man
   *@param command is the command, which is taken directly from the API request.
   *@return true if the resource is found, false if not.  In either case, output may be filled in.
   */
+  @Override
   public boolean requestInfo(Configuration output, String command)
     throws ManifoldCFException
   {
@@ -962,6 +963,7 @@ public class DCTM extends org.apache.man
   *@param startTime is the beginning of the time range to consider, inclusive.
   *@param endTime is the end of the time range to consider, exclusive.
   */
+  @Override
   public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
     long startTime, long endTime)
     throws ManifoldCFException, ServiceInterruption
@@ -969,7 +971,7 @@ public class DCTM extends org.apache.man
     // First, build the query
 
     int i = 0;
-    StringBuffer strLocationsClause = new StringBuffer();
+    StringBuilder strLocationsClause = new StringBuilder();
     ArrayList tokenList = new ArrayList();
     ArrayList contentList = null;
     String maxSize = null;
@@ -1032,7 +1034,7 @@ public class DCTM extends org.apache.man
         startTime = startTime - 300000L;
       else
         startTime = 0L;
-      StringBuffer strDQLend = new StringBuffer(" where r_modify_date >= " + buildDateString(startTime) +
+      StringBuilder strDQLend = new StringBuilder(" where r_modify_date >= " + buildDateString(startTime) +
         " and r_modify_date<=" + buildDateString(endTime) +
         " AND (i_is_deleted=TRUE Or (i_is_deleted=FALSE AND a_full_text=TRUE AND r_content_size>0");
 
@@ -1239,7 +1241,7 @@ public class DCTM extends org.apache.man
 
             // The version string format was reorganized on 11/6/2006.
 
-            StringBuffer strVersionLabel = new StringBuffer();
+            StringBuilder strVersionLabel = new StringBuilder();
 
             // Get the type name; this is what we use to figure out the desired attributes
             String typeName = object.getTypeName();
@@ -1327,6 +1329,7 @@ public class DCTM extends org.apache.man
   * Empty version strings indicate that there is no versioning ability for the corresponding document, and the document
   * will always be processed.
   */
+  @Override
   public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activity,
     DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
     throws ManifoldCFException, ServiceInterruption
@@ -1338,7 +1341,7 @@ public class DCTM extends org.apache.man
     // Get the forced acls (and whether security is on as well)
     String[] acls = getAcls(spec);
     // Build a "forced acl" version string, of the form ";<acl>+<acl>+..."
-    StringBuffer forcedAclString = new StringBuffer();
+    StringBuilder forcedAclString = new StringBuilder();
     if (acls != null)
     {
       forcedAclString.append('+');
@@ -1406,7 +1409,7 @@ public class DCTM extends org.apache.man
           j++;
         }
         java.util.Arrays.sort(sortArray);
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         packList(sb,sortArray,'+');
         typeMap.put(typeName,sb.toString());
       }
@@ -1425,7 +1428,7 @@ public class DCTM extends org.apache.man
 
     // 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);
 
@@ -1600,7 +1603,7 @@ public class DCTM extends org.apache.man
             {
               acls = new ArrayList();
               startPosition = unpackList(acls,versionString,startPosition,'+');
-              StringBuffer denyAclBuffer = new StringBuffer();
+              StringBuilder denyAclBuffer = new StringBuilder();
               startPosition = unpack(denyAclBuffer,versionString,startPosition,'+');
               denyAcl = denyAclBuffer.toString();
             }
@@ -1708,6 +1711,7 @@ public class DCTM extends org.apache.man
 
   /** Process documents whose versions indicate they need processing.
   */
+  @Override
   public void processDocuments(String[] documentIdentifiers, String[] documentVersions,
     IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly)
     throws ManifoldCFException, ServiceInterruption
@@ -1847,12 +1851,14 @@ public class DCTM extends org.apache.man
   *@param documentIdentifiers is the set of document identifiers.
   *@param versions is the corresponding set of version identifiers (individual identifiers may be null).
   */
+  @Override
   public void releaseDocumentVersions(String[] documentIdentifiers, String[] versions)
     throws ManifoldCFException
   {
     // Nothing to do
   }
 
+  @Override
   public int getMaxDocumentRequest()
   {
     // 1 at a time, since this connector does not deal with documents en masse, but one at a time.
@@ -1875,7 +1881,8 @@ public class DCTM extends org.apache.man
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
+  @Override
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Docbase");
@@ -1931,6 +1938,7 @@ public class DCTM extends org.apache.man
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -2012,6 +2020,7 @@ public class DCTM extends org.apache.man
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
+  @Override
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -2045,6 +2054,7 @@ public class DCTM extends org.apache.man
   *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
+  @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
     throws ManifoldCFException, IOException
   {
@@ -2093,7 +2103,8 @@ public class DCTM extends org.apache.man
   *@param ds is the current document specification for this job.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  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");
@@ -2177,6 +2188,7 @@ public class DCTM extends org.apache.man
   *@param ds is the current document specification for this job.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputSpecificationBody(IHTTPOutput out, DocumentSpecification ds, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -2864,6 +2876,7 @@ public class DCTM extends org.apache.man
   *@param ds is the current document specification for this job.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
   */
+  @Override
   public String processSpecificationPost(IPostParameters variableContext, DocumentSpecification ds)
     throws ManifoldCFException
   {
@@ -3172,6 +3185,7 @@ public class DCTM extends org.apache.man
   *@param out is the output to which any HTML should be sent.
   *@param ds is the current document specification for this job.
   */
+  @Override
   public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
     throws ManifoldCFException, IOException
   {
@@ -3917,7 +3931,7 @@ public class DCTM extends org.apache.man
   }
 
   /** 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())
@@ -3931,7 +3945,7 @@ public class DCTM extends org.apache.man
   }
 
   /** 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())
     {
@@ -3949,7 +3963,7 @@ public class DCTM extends org.apache.man
   }
 
   /** 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)
@@ -3961,7 +3975,7 @@ public class DCTM extends org.apache.man
   /** 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)
     {
@@ -3973,7 +3987,7 @@ public class DCTM extends org.apache.man
   }
 
   /** 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;
@@ -3984,7 +3998,7 @@ public class DCTM extends org.apache.man
   }
 
   /** 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;
@@ -4003,7 +4017,7 @@ public class DCTM extends org.apache.man
   */
   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/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/MatchMap.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/MatchMap.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/MatchMap.java (original)
+++ incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/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/filenet/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/build.xml (original)
+++ incubator/lcf/trunk/connectors/filenet/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"/>
             </classpath>
@@ -46,12 +46,12 @@
 
     <target name="compile-interface" depends="precompile-check" if="canBuild">
         <mkdir dir="build/interface/classes"/>
-        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" classpath="" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source"/>
+        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" classpath="" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source"/>
     </target>
 
     <target name="compile-implementation" depends="compile-interface,precompile-check" if="canBuild">
         <mkdir dir="build/implementation/classes"/>
-        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath id="implementation.classpath">
                 <fileset dir="filenet-api"> 
                     <include name="*.jar"/> 
@@ -101,7 +101,7 @@
     
     <target name="compile-server" depends="compile-interface,compile-implementation,compile-rmic,precompile-check" if="canBuild">
         <mkdir dir="build/server/classes"/>
-        <javac srcdir="server/src/main/java" destdir="build/server/classes" target="1.5" source="1.4" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="server/src/main/java" destdir="build/server/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <pathelement location="build/interface/classes"/>
                 <pathelement location="build/implementation/classes"/>
@@ -113,12 +113,12 @@
 
     <target name="compile-registry" depends="compile-interface,precompile-check" if="canBuild">
         <mkdir dir="build/registry/classes"/>
-        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" classpath="build/interface/classes" target="1.5" source="1.4"/>
+        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" classpath="build/interface/classes" target="1.5" source="1.5"/>
     </target>
 
     <target name="compile-connector" depends="compile-interface,compile-rmic,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/interface/classes"/>

Modified: incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java (original)
+++ incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Thu Jun  2 10:32:04 2011
@@ -345,6 +345,7 @@ public class FilenetConnector extends or
 
   /** Let the crawler know the completeness of the information we are giving it.
   */
+  @Override
   public int getConnectorModel()
   {
     return MODEL_ADD;
@@ -359,6 +360,7 @@ public class FilenetConnector extends or
   *@param documentIdentifier is the document identifier.
   *@return the bin name.
   */
+  @Override
   public String[] getBinNames(String documentIdentifier)
   {
     return new String[]{serverHostname};
@@ -367,20 +369,15 @@ public class FilenetConnector extends or
   /** Return the list of activities that this connector supports (i.e. writes into the log).
   *@return the list.
   */
+  @Override
   public String[] getActivitiesList()
   {
     return new String[]{ACTIVITY_FETCH};
   }
 
-  /** Get the folder for the jsps.
-  */
-  public String getJSPFolder()
-  {
-    return "filenet";
-  }
-
   /** Connect to filenet.
   */
+  @Override
   public void connect(ConfigParams configParams)
   {
     super.connect(configParams);
@@ -432,6 +429,7 @@ public class FilenetConnector extends or
   /** Test the connection.  Returns a string describing the connection integrity.
   *@return the connection's status as a displayable string.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -464,6 +462,7 @@ public class FilenetConnector extends or
   /** This method is periodically called for all connectors that are connected but not
   * in active use.
   */
+  @Override
   public void poll()
     throws ManifoldCFException
   {
@@ -472,6 +471,7 @@ public class FilenetConnector extends or
 
   /** Disconnect from Filenet.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -540,6 +540,7 @@ public class FilenetConnector extends or
   *@param command is the command, which is taken directly from the API request.
   *@return true if the resource is found, false if not.  In either case, output may be filled in.
   */
+  @Override
   public boolean requestInfo(Configuration output, String command)
     throws ManifoldCFException
   {
@@ -671,6 +672,7 @@ public class FilenetConnector extends or
   *@param startTime is the beginning of the time range to consider, inclusive.
   *@param endTime is the end of the time range to consider, exclusive.
   */
+  @Override
   public void addSeedDocuments(ISeedingActivity activities, DocumentSpecification spec,
     long startTime, long endTime)
     throws ManifoldCFException, ServiceInterruption
@@ -680,7 +682,7 @@ public class FilenetConnector extends or
     // Go through all the document classes and do a query for each one
     //get all mimetypes and build a SQL "where condition"
 
-    StringBuffer mimeTypesClause = new StringBuffer();
+    StringBuilder mimeTypesClause = new StringBuilder();
     int i = 0;
     while (i < spec.getChildCount())
     {
@@ -711,7 +713,7 @@ public class FilenetConnector extends or
       }
     }
 
-    StringBuffer sqlBuffer = new StringBuffer(" WHERE ([IsCurrentVersion] = TRUE AND (");
+    StringBuilder sqlBuffer = new StringBuilder(" WHERE ([IsCurrentVersion] = TRUE AND (");
     sqlBuffer.append(mimeTypesClause);
     sqlBuffer.append(")");
     Calendar c = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
@@ -768,7 +770,7 @@ public class FilenetConnector extends or
         String dc = n.getAttributeValue(SPEC_ATTRIBUTE_VALUE);
         DocClassSpec dcs = new DocClassSpec(n);
         int matchCount = dcs.getMatchCount();
-        StringBuffer moreWhereClause = new StringBuffer(whereClause);
+        StringBuilder moreWhereClause = new StringBuilder(whereClause);
         int q = 0;
         while (q < matchCount)
         {
@@ -812,7 +814,7 @@ public class FilenetConnector extends or
 
   protected static String quoteSQLString(String value)
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append('\'');
     int i = 0;
     while (i < value.length())
@@ -830,7 +832,7 @@ public class FilenetConnector extends or
   {
     c.setTimeInMillis(timeValue);
     //c.computeFields();
-    StringBuffer rval = new StringBuffer();
+    StringBuilder rval = new StringBuilder();
     print_int(rval,c.get(Calendar.YEAR),4);
     print_int(rval,c.get(Calendar.MONTH)+1,2);
     print_int(rval,c.get(Calendar.DAY_OF_MONTH),2);
@@ -842,7 +844,7 @@ public class FilenetConnector extends or
     return rval.toString();
   }
 
-  protected static void print_int(StringBuffer sb, int value, int digits)
+  protected static void print_int(StringBuilder sb, int value, int digits)
   {
     if (digits == 4)
     {
@@ -865,7 +867,7 @@ public class FilenetConnector extends or
     }
   }
 
-  protected static int print_digit(StringBuffer sb, int value, int divisor)
+  protected static int print_digit(StringBuilder sb, int value, int divisor)
   {
     int digit = value / divisor;
     int x = '0' + digit;
@@ -890,6 +892,7 @@ public class FilenetConnector extends or
   * Empty version strings indicate that there is no versioning ability for the corresponding document, and the document
   * will always be processed.
   */
+  @Override
   public String[] getDocumentVersions(String[] documentIdentifiers, String[] oldVersions, IVersionActivity activity,
     DocumentSpecification spec, int jobMode, boolean usesDefaultAuthority)
     throws ManifoldCFException, ServiceInterruption
@@ -981,7 +984,7 @@ public class FilenetConnector extends or
             // (a) metadata info
             // (b) acl info
             // (c) the url prefix to use
-            StringBuffer versionBuffer = new StringBuffer();
+            StringBuilder versionBuffer = new StringBuilder();
 
             String docClass = fileInfo.getDocClass();
             DocClassSpec docclassspec = (DocClassSpec)docClassSpecs.get(docClass);
@@ -1199,8 +1202,8 @@ public class FilenetConnector extends or
           ArrayList metadataValues = new ArrayList();
           ArrayList aclValues = null;
           ArrayList denyAclValues = null;
-          StringBuffer documentClass = new StringBuffer();
-          StringBuffer urlBase = new StringBuffer();
+          StringBuilder documentClass = new StringBuilder();
+          StringBuilder urlBase = new StringBuilder();
           int position = 0;
           position = unpackList(metadataNames, documentVersion, position, '+');
           position = unpackList(metadataValues, documentVersion, position, '+');
@@ -1410,12 +1413,14 @@ public class FilenetConnector extends or
   *@param documentIdentifiers is the set of document identifiers.
   *@param versions is the corresponding set of version identifiers (individual identifiers may be null).
   */
+  @Override
   public void releaseDocumentVersions(String[] documentIdentifiers, String[] versions)
     throws ManifoldCFException
   {
     // Nothing to do
   }
 
+  @Override
   public int getMaxDocumentRequest()
   {
     // 1 at a time, since this connector does not deal with documents en masse, but one at a time.
@@ -1438,7 +1443,8 @@ public class FilenetConnector extends or
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
+  @Override
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Server");
@@ -1542,6 +1548,7 @@ public class FilenetConnector extends or
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -1722,6 +1729,7 @@ public class FilenetConnector extends or
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
+  @Override
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -1782,6 +1790,7 @@ public class FilenetConnector extends or
   *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
+  @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
     throws ManifoldCFException, IOException
   {
@@ -1830,7 +1839,8 @@ public class FilenetConnector extends or
   *@param ds is the current document specification for this job.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, ArrayList tabsArray)
+  @Override
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Document Classes");
@@ -1906,6 +1916,7 @@ public class FilenetConnector extends or
   *@param ds is the current document specification for this job.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputSpecificationBody(IHTTPOutput out, DocumentSpecification ds, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -2551,6 +2562,7 @@ public class FilenetConnector extends or
   *@param ds is the current document specification for this job.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
   */
+  @Override
   public String processSpecificationPost(IPostParameters variableContext, DocumentSpecification ds)
     throws ManifoldCFException
   {
@@ -2814,6 +2826,7 @@ public class FilenetConnector extends or
   *@param out is the output to which any HTML should be sent.
   *@param ds is the current document specification for this job.
   */
+  @Override
   public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
     throws ManifoldCFException, IOException
   {
@@ -3905,7 +3918,7 @@ public class FilenetConnector 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())
@@ -3919,7 +3932,7 @@ public class FilenetConnector 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())
     {
@@ -3937,7 +3950,7 @@ public class FilenetConnector 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)
@@ -3949,7 +3962,7 @@ public class FilenetConnector 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)
     {
@@ -3961,7 +3974,7 @@ public class FilenetConnector 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;
@@ -3972,7 +3985,7 @@ public class FilenetConnector 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;
@@ -3991,7 +4004,7 @@ public class FilenetConnector 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/filesystem/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filesystem/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filesystem/build.xml (original)
+++ incubator/lcf/trunk/connectors/filesystem/build.xml Thu Jun  2 10:32:04 2011
@@ -25,7 +25,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>
@@ -35,7 +35,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/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java (original)
+++ incubator/lcf/trunk/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java Thu Jun  2 10:32:04 2011
@@ -53,22 +53,10 @@ public class FileConnector extends org.a
   {
   }
 
-
-  /** Return the path for the UI interface JSP elements.
-  * These JSP's must be provided to allow the connector to be configured, and to
-  * permit it to present document filtering specification information in the UI.
-  * This method should return the name of the folder, under the <webapp>/connectors/
-  * area, where the appropriate JSP's can be found.  The name should NOT have a slash in it.
-  *@return the folder part
-  */
-  public String getJSPFolder()
-  {
-    return "filesystem";
-  }
-
   /** Return the list of relationship types that this connector recognizes.
   *@return the list.
   */
+  @Override
   public String[] getRelationshipTypes()
   {
     return new String[]{RELATIONSHIP_CHILD};
@@ -76,6 +64,7 @@ public class FileConnector extends org.a
 
   /** List the activities we might report on.
   */
+  @Override
   public String[] getActivitiesList()
   {
     return activitiesList;
@@ -85,6 +74,7 @@ public class FileConnector extends org.a
   * For the file system, this would be typically just a blank value, but since we use this connector for testing, I have
   * it returning TWO values for each document, so I can set up tests to see how the scheduler behaves under those conditions.
   */
+  @Override
   public String[] getBinNames(String documentIdentifier)
   {
     // Note: This code is for testing, so we can see how documents behave when they are in various kinds of bin situations.
@@ -133,6 +123,7 @@ public class FileConnector extends org.a
   *@param endTime is the end of the time range to consider, exclusive.
   *@return the stream of local document identifiers that should be added to the queue.
   */
+  @Override
   public IDocumentIdentifierStream getDocumentIdentifiers(DocumentSpecification spec, long startTime, long endTime)
     throws ManifoldCFException
   {
@@ -148,6 +139,7 @@ public class FileConnector extends org.a
   * Empty version strings indicate that there is no versioning ability for the corresponding document, and the document
   * will always be processed.
   */
+  @Override
   public String[] getDocumentVersions(String[] documentIdentifiers, DocumentSpecification spec)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -174,7 +166,7 @@ public class FileConnector extends org.a
           // Get the file's modified date.
           long lastModified = file.lastModified();
           long fileLength = file.length();
-          StringBuffer sb = new StringBuffer();
+          StringBuilder sb = new StringBuilder();
           sb.append(new Long(lastModified).toString()).append(":").append(new Long(fileLength).toString());
           rval[i] = sb.toString();
         }
@@ -198,6 +190,7 @@ public class FileConnector extends org.a
   *@param scanOnly is an array corresponding to the document identifiers.  It is set to true to indicate when the processing
   * should only find other references, and should not actually call the ingestion methods.
   */
+  @Override
   public void processDocuments(String[] documentIdentifiers, String[] versions, IProcessActivity activities, DocumentSpecification spec, boolean[] scanOnly)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -315,7 +308,8 @@ public class FileConnector extends org.a
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
+  @Override
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     out.print(
@@ -354,6 +348,7 @@ public class FileConnector extends org.a
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
+  @Override
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -367,6 +362,7 @@ public class FileConnector extends org.a
   *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
+  @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
     throws ManifoldCFException, IOException
   {
@@ -379,7 +375,8 @@ public class FileConnector extends org.a
   *@param ds is the current document specification for this job.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, ArrayList tabsArray)
+  @Override
+  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Paths");
@@ -411,6 +408,7 @@ public class FileConnector extends org.a
   *@param ds is the current document specification for this job.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputSpecificationBody(IHTTPOutput out, DocumentSpecification ds, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -664,6 +662,7 @@ public class FileConnector extends org.a
   *@param ds is the current document specification for this job.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
   */
+  @Override
   public String processSpecificationPost(IPostParameters variableContext, DocumentSpecification ds)
     throws ManifoldCFException
   {
@@ -777,6 +776,7 @@ public class FileConnector extends org.a
   *@param out is the output to which any HTML should be sent.
   *@param ds is the current document specification for this job.
   */
+  @Override
   public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
     throws ManifoldCFException, IOException
   {

Modified: incubator/lcf/trunk/connectors/gts/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/gts/build.xml?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/gts/build.xml (original)
+++ incubator/lcf/trunk/connectors/gts/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/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java (original)
+++ incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java Thu Jun  2 10:32:04 2011
@@ -75,26 +75,18 @@ public class GTSConnector extends org.ap
   /** Return the list of activities that this connector supports (i.e. writes into the log).
   *@return the list.
   */
+  @Override
   public String[] getActivitiesList()
   {
     return new String[]{INGEST_ACTIVITY,REMOVE_ACTIVITY};
   }
 
-  /** Return the path for the UI interface JSP elements.
-  * This method should return the name of the folder, under the <webapp>/output/
-  * area, where the appropriate JSP's can be found.  The name should NOT have a slash in it.
-  *@return the folder part
-  */
-  public String getJSPFolder()
-  {
-    return "gts";
-  }
-
   /** Connect.
   *@param configParameters is the set of configuration parameters, which
   * in this case describe the target appliance, basic auth configuration, etc.  (This formerly came
   * out of the ini file.)
   */
+  @Override
   public void connect(ConfigParams configParameters)
   {
     super.connect(configParameters);
@@ -102,6 +94,7 @@ public class GTSConnector extends org.ap
 
   /** Close the connection.  Call this before discarding the connection.
   */
+  @Override
   public void disconnect()
     throws ManifoldCFException
   {
@@ -128,6 +121,7 @@ public class GTSConnector extends org.ap
   /** Test the connection.  Returns a string describing the connection integrity.
   *@return the connection's status as a displayable string.
   */
+  @Override
   public String check()
     throws ManifoldCFException
   {
@@ -205,6 +199,7 @@ public class GTSConnector extends org.ap
   *@param mimeType is the mime type of the document.
   *@return true if the mime type is indexable by this connector.
   */
+  @Override
   public boolean checkMimeTypeIndexable(String mimeType)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -217,6 +212,7 @@ public class GTSConnector extends org.ap
   *@param localFile is the local file to check.
   *@return true if the file is indexable.
   */
+  @Override
   public boolean checkDocumentIndexable(File localFile)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -241,6 +237,7 @@ public class GTSConnector extends org.ap
   *@return a string, of unlimited length, which uniquely describes output configuration and specification in such a way that if two such strings are equal,
   * the document will not need to be sent again to the output data store.
   */
+  @Override
   public String getOutputDescription(OutputSpecification spec)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -279,7 +276,7 @@ public class GTSConnector extends org.ap
     String ingestURI = params.getParameter(GTSConfig.PARAM_INGESTURI);
 
     // Now, construct the appropriate string
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     packList(sb,sortArray,'+');
     pack(sb,documentTemplate,'+');
     // From here on down, unpacking is unnecessary.
@@ -302,6 +299,7 @@ public class GTSConnector extends org.ap
   *@param activities is the handle to an object that the implementer of an output connector may use to perform operations, such as logging processing activity.
   *@return the document status (accepted or permanently rejected).
   */
+  @Override
   public int addOrReplaceDocument(String documentURI, String outputDescription, RepositoryDocument document, String authorityNameString, IOutputAddActivity activities)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -310,7 +308,7 @@ public class GTSConnector extends org.ap
 
     // Unpack what we need from the output description.  This consists of the collection names, plus the document template.
     ArrayList collections = new ArrayList();
-    StringBuffer documentTemplateBuffer = new StringBuffer();
+    StringBuilder documentTemplateBuffer = new StringBuilder();
     int startPosition = unpackList(collections,outputDescription,0,'+');
     startPosition = unpack(documentTemplateBuffer,outputDescription,startPosition,'+');
 
@@ -335,6 +333,7 @@ public class GTSConnector extends org.ap
   *@param outputDescription is the last description string that was constructed for this document by the getOutputDescription() method above.
   *@param activities is the handle to an object that the implementer of an output connector may use to perform operations, such as logging processing activity.
   */
+  @Override
   public void removeDocument(String documentURI, String outputDescription, IOutputRemoveActivity activities)
     throws ManifoldCFException, ServiceInterruption
   {
@@ -361,7 +360,8 @@ public class GTSConnector extends org.ap
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
+  @Override
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Appliance");
@@ -407,6 +407,7 @@ public class GTSConnector extends org.ap
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -479,6 +480,7 @@ public class GTSConnector extends org.ap
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
+  @Override
   public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
     throws ManifoldCFException
   {
@@ -508,6 +510,7 @@ public class GTSConnector extends org.ap
   *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
+  @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
     throws ManifoldCFException, IOException
   {
@@ -558,7 +561,8 @@ public class GTSConnector extends org.ap
   *@param os is the current output specification for this job.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification os, ArrayList tabsArray)
+  @Override
+  public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification os, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
     tabsArray.add("Collections");
@@ -592,6 +596,7 @@ public class GTSConnector extends org.ap
   *@param os is the current output specification for this job.
   *@param tabName is the current tab name.
   */
+  @Override
   public void outputSpecificationBody(IHTTPOutput out, OutputSpecification os, String tabName)
     throws ManifoldCFException, IOException
   {
@@ -670,6 +675,7 @@ public class GTSConnector extends org.ap
   *@param os is the current output specification for this job.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
   */
+  @Override
   public String processSpecificationPost(IPostParameters variableContext, OutputSpecification os)
     throws ManifoldCFException
   {
@@ -721,6 +727,7 @@ public class GTSConnector extends org.ap
   *@param out is the output to which any HTML should be sent.
   *@param os is the current output specification for this job.
   */
+  @Override
   public void viewSpecification(IHTTPOutput out, OutputSpecification os)
     throws ManifoldCFException, IOException
   {
@@ -775,7 +782,7 @@ public class GTSConnector extends org.ap
   // 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())
@@ -789,7 +796,7 @@ public class GTSConnector 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())
     {
@@ -807,7 +814,7 @@ public class GTSConnector 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)
@@ -819,7 +826,7 @@ public class GTSConnector 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)
     {
@@ -831,7 +838,7 @@ public class GTSConnector 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;
@@ -842,7 +849,7 @@ public class GTSConnector 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;
@@ -861,7 +868,7 @@ public class GTSConnector 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
     {
@@ -1101,7 +1108,7 @@ public class GTSConnector extends org.ap
 
   protected static String hexprint(byte x)
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append(nibbleprint(0x0f & (((int)x)>>4))).append(nibbleprint(0x0f & ((int)x)));
     return sb.toString();
   }

Modified: incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java?rev=1130475&r1=1130474&r2=1130475&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java (original)
+++ incubator/lcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java Thu Jun  2 10:32:04 2011
@@ -162,7 +162,7 @@ public class HttpPoster
     RepositoryDocument document, IOutputAddActivity activities)
     throws ManifoldCFException, ServiceInterruption
   {
-    StringBuffer aclXml = new StringBuffer();
+    StringBuilder aclXml = new StringBuilder();
     writeACLs(aclXml,"share",document.getShareACL(),document.getShareDenyACL(),authorityNameString,activities);
     int directoryCount = document.countDirectoryACLs();
     int q = 0;
@@ -268,8 +268,8 @@ public class HttpPoster
 
   }
 
-  /** Write acls into a stringbuffer */
-  protected static void writeACLs(StringBuffer aclXml, String type, String[] acl, String[] denyAcl, String authorityNameString, IOutputAddActivity activities)
+  /** Write acls into a StringBuilder */
+  protected static void writeACLs(StringBuilder aclXml, String type, String[] acl, String[] denyAcl, String authorityNameString, IOutputAddActivity activities)
     throws ManifoldCFException
   {
     if (acl != null && acl.length > 0 || denyAcl != null && denyAcl.length > 0)
@@ -462,7 +462,7 @@ public class HttpPoster
   protected String getResponse(BufferedReader stream) throws ManifoldCFException, ServiceInterruption
   {
     Logging.ingest.debug("Waiting for response stream");
-    StringBuffer res = new StringBuffer();
+    StringBuilder res = new StringBuilder();
     try
     {
       // Stream.ready() always returns false for secure sockets :-(.  So
@@ -548,7 +548,7 @@ public class HttpPoster
   */
   protected static String metadataEncode(String inputString)
   {
-    StringBuffer rval = new StringBuffer();
+    StringBuilder rval = new StringBuilder();
     int i = 0;
     while (i < inputString.length())
     {



Mime
View raw message