You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/12/19 08:35:00 UTC

svn commit: r1220632 [1/9] - in /incubator/lcf/branches/CONNECTORS-314: ./ connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ connectors/cmis/connector/src/main/java/org/apache/manifoldcf/c...

Author: kwright
Date: Mon Dec 19 07:34:58 2011
New Revision: 1220632

URL: http://svn.apache.org/viewvc?rev=1220632&view=rev
Log:
Commit patch including mysql support and i18n work, on behalf of Hitoshi Ozawa.

Added:
    incubator/lcf/branches/CONNECTORS-314/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja.html
    incubator/lcf/branches/CONNECTORS-314/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja.js
    incubator/lcf/branches/CONNECTORS-314/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja.html
    incubator/lcf/branches/CONNECTORS-314/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/viewSpec_ja.html
    incubator/lcf/branches/CONNECTORS-314/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/view_ja.html
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/Messages.java
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common.properties
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common_en_US.properties
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common_ja_JP.properties
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/i18n/common_ja_JP.properties.utf8
    incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.derby
    incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml.mysql
Modified:
    incubator/lcf/branches/CONNECTORS-314/build.xml
    incubator/lcf/branches/CONNECTORS-314/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
    incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
    incubator/lcf/branches/CONNECTORS-314/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/filesystem/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filesystem/FileConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/GTSConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
    incubator/lcf/branches/CONNECTORS-314/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/webcrawler/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/webcrawler/WebcrawlerConnector.java
    incubator/lcf/branches/CONNECTORS-314/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
    incubator/lcf/branches/CONNECTORS-314/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
    incubator/lcf/branches/CONNECTORS-314/framework/agents/src/main/java/org/apache/manifoldcf/agents/outputconnection/OutputConnectionManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/agents/src/main/java/org/apache/manifoldcf/agents/outputconnmgr/OutputConnectorManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/build.xml
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/banner.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/documentstatus.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/editauthority.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/editconnection.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/editjob.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/editoutput.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/error.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/index.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/listauthorities.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/listconnections.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/listjobs.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/listoutputs.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/navigation.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/queuestatus.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/resultreport.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/simplereport.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewauthority.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewconnection.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewjob.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/crawler-ui/src/main/webapp/viewoutput.jsp
    incubator/lcf/branches/CONNECTORS-314/framework/jetty-example/properties.xml
    incubator/lcf/branches/CONNECTORS-314/framework/jetty-runner/src/main/resources/properties.xml
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authconnmgr/AuthorityConnectorManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/connmgr/ConnectorManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Carrydown.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopCount.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopDeleteDeps.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/HopFilterManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/IntrinsicLink.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PrereqEventManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/ScheduleManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryHistoryManager.java
    incubator/lcf/branches/CONNECTORS-314/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/ThrottleSpecManager.java

Modified: incubator/lcf/branches/CONNECTORS-314/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/build.xml?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-314/build.xml Mon Dec 19 07:34:58 2011
@@ -168,6 +168,7 @@
                 <include name="postgresql*.jar"/>
                 <include name="derby*.jar"/>
                 <include name="hsqldb*.jar"/>
+                <include name="mysql-connector-java*.jar"/>
             </fileset>
         </copy>
       </target>
@@ -1896,7 +1897,7 @@
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
-            <attribute name="Class-Path" value="lib/commons-codec.jar lib/commons-collections.jar lib/commons-el.jar lib/commons-fileupload.jar lib/commons-httpclient-mcf.jar lib/commons-io.jar lib/commons-logging.jar lib/hsqldb.jar lib/derbyclient.jar lib/derby.jar lib/derbyLocale_cs.jar lib/derbyLocale_de_DE.jar lib/derbyLocale_es.jar lib/derbyLocale_fr.jar lib/derbyLocale_hu.jar lib/derbyLocale_it.jar lib/derbyLocale_ja_JP.jar lib/derbyLocale_ko_KR.jar lib/derbyLocale_pl.jar lib/derbyLocale_pt_BR.jar lib/derbyLocale_ru.jar lib/derbyLocale_zh_CN.jar lib/derbyLocale_zh_TW.jar lib/derbynet.jar lib/derbyrun.jar lib/derbytools.jar lib/eclipse-ecj.jar lib/jasper-6.0.24.jar lib/jasper-el-6.0.24.jar lib/jdbcpool-0.99.jar lib/jetty-6.1.26-patched-JETTY-1340.jar lib/jetty-util-6.1.26-patched-JETTY-1340.jar lib/jsp-api-2.1-glassfish-2.1.v20091210.jar lib/json.jar lib/mcf-agents.jar lib/mcf-core.jar lib/mcf-jetty-runner.jar lib/mcf-pull-agent.jar lib/mcf-ui-core.jar lib/log4j-1.2.jar
  lib/postgresql.jar lib/serializer.jar lib/servlet-api-2.5-20081211.jar lib/tomcat-juli-6.0.24.jar lib/xalan2.jar lib/xercesImpl-mcf.jar lib/xml-apis.jar"/>
+            <attribute name="Class-Path" value="lib/commons-codec.jar lib/commons-collections.jar lib/commons-el.jar lib/commons-fileupload.jar lib/commons-httpclient-mcf.jar lib/commons-io.jar lib/commons-logging.jar lib/hsqldb.jar lib/derbyclient.jar lib/derby.jar lib/derbyLocale_cs.jar lib/derbyLocale_de_DE.jar lib/derbyLocale_es.jar lib/derbyLocale_fr.jar lib/derbyLocale_hu.jar lib/derbyLocale_it.jar lib/derbyLocale_ja_JP.jar lib/derbyLocale_ko_KR.jar lib/derbyLocale_pl.jar lib/derbyLocale_pt_BR.jar lib/derbyLocale_ru.jar lib/derbyLocale_zh_CN.jar lib/derbyLocale_zh_TW.jar lib/derbynet.jar lib/derbyrun.jar lib/derbytools.jar lib/eclipse-ecj.jar lib/jasper-6.0.24.jar lib/jasper-el-6.0.24.jar lib/jdbcpool-0.99.jar lib/jetty-6.1.26-patched-JETTY-1340.jar lib/jetty-util-6.1.26-patched-JETTY-1340.jar lib/jsp-api-2.1-glassfish-2.1.v20091210.jar lib/json.jar lib/mcf-agents.jar lib/mcf-core.jar lib/mcf-jetty-runner.jar lib/mcf-pull-agent.jar lib/mcf-ui-core.jar lib/log4j-1.2.jar
  lib/postgresql.jar lib/mysql-connector-java-5.1.18-bin.jar lib/serializer.jar lib/servlet-api-2.5-20081211.jar lib/tomcat-juli-6.0.24.jar lib/xalan2.jar lib/xercesImpl-mcf.jar lib/xml-apis.jar"/>
         </manifest>
         <jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
     </target>

Modified: incubator/lcf/branches/CONNECTORS-314/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ActiveDirectoryAuthority.java Mon Dec 19 07:34:58 2011
@@ -18,6 +18,7 @@
 */
 package org.apache.manifoldcf.authorities.authorities.activedirectory;
 
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.authorities.interfaces.*;
@@ -342,8 +343,8 @@ public class ActiveDirectoryAuthority ex
   public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Domain Controller");
-    tabsArray.add("Cache");
+    tabsArray.add(Messages.getString("ActiveDirectoryAuthority.DomainController"));
+    tabsArray.add(Messages.getString("ActiveDirectoryAuthority.Cache"));
     
     out.print(
 "<script type=\"text/javascript\">\n"+
@@ -448,29 +449,29 @@ public class ActiveDirectoryAuthority ex
       cacheLRUsize = "1000";    
     
     // The "Domain Controller" tab
-    if (tabName.equals("Domain Controller"))
+    if (tabName.equals(Messages.getString("ActiveDirectoryAuthority.DomainController")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Domain controller name:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("ActiveDirectoryAuthority.DomainControllerName") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"64\" name=\"domaincontrollername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(domainControllerName)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Administrative user name:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("ActiveDirectoryAuthority.AdministrativeUserName") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"32\" name=\"username\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(userName)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Administrative password:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("ActiveDirectoryAuthority.AdministrativePassword") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"password\" size=\"32\" name=\"password\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(password)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Authentication:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("ActiveDirectoryAuthority.Authentication") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"32\" name=\"authentication\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(authentication)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Login name AD attribute:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("ActiveDirectoryAuthority.LoginNameADAttribute") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <select name=\"userACLsUsername\">\n"+
 "        <option value=\"sAMAccountName\""+(userACLsUsername.equals("sAMAccountName")?" selected=\"true\"":"")+">sAMAccountName</option>\n"+
@@ -492,17 +493,17 @@ public class ActiveDirectoryAuthority ex
       );
     }
     // The "Cache" tab
-    if (tabName.equals("Cache"))
+    if (tabName.equals(Messages.getString("ActiveDirectoryAuthority.Cache")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Cache lifetime:</nobr></td>\n"+
-"    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"cachelifetime\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime)+"\"/> minutes</td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("ActiveDirectoryAuthority.CacheLifetime") + "</nobr></td>\n"+
+"    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"cachelifetime\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLifetime)+"\"/> " + Messages.getString("ActiveDirectoryAuthority.minutes") + "</td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Cache LRU size:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("ActiveDirectoryAuthority.CacheLRUSize") + "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"cachelrusize\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(cacheLRUsize)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
@@ -570,7 +571,7 @@ public class ActiveDirectoryAuthority ex
     out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr>\n"+
-"    <td class=\"description\" colspan=\"1\"><nobr>Parameters:</nobr></td>\n"+
+"    <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getString("ActiveDirectoryAuthority.Parameters") + "</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"3\">\n"
     );
     Iterator iter = parameters.listParameters();

Modified: incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java Mon Dec 19 07:34:58 2011
@@ -25,6 +25,7 @@ import java.util.Map;
 import org.apache.commons.lang.StringUtils;
 import org.apache.manifoldcf.authorities.authorities.BaseAuthorityConnector;
 import org.apache.manifoldcf.authorities.interfaces.AuthorizationResponse;
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.core.interfaces.CacheManagerFactory;
 import org.apache.manifoldcf.core.interfaces.ConfigParams;
 import org.apache.manifoldcf.core.interfaces.ICacheCreateHandle;
@@ -63,8 +64,8 @@ public class CmisAuthorityConnector exte
   protected static final String CONFIG_PARAM_USERNAME_REGEXP = "usernameregexp";
   protected static final String CONFIG_PARAM_USER_TRANSLATION = "usertranslation";
   
-  private static final String TAB_NAME_REPOSITORY = "Repository";
-  private static final String TAB_NAME_USER_MAPPING = "User Mapping";
+  private static final String TAB_NAME_REPOSITORY = Messages.getString("CmisAuthorityConnector.Repository");
+  private static final String TAB_NAME_USER_MAPPING = Messages.getString("CmisAuthorityConnector.UserMapping");
   
   private static final String DEFAULT_VALUE_ENDPOINT = "http://localhost:8080/cmis/";
   private static final String DEFAULT_VALUE_REPOSITORY_ID = "uuid";
@@ -162,10 +163,10 @@ public class CmisAuthorityConnector exte
     {
     out.print("<table class=\"displaytable\">\n"
         + "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n");
-    out.print("<tr><td class=\"description\"><nobr>Endpoint:</nobr></td>" +
+    out.print("<tr><td class=\"description\"><nobr>" + Messages.getString("CmisAuthorityConnector.Endpoint") + "</nobr></td>" +
         "<td class=\"value\"><input type=\"text\" name=\""
         + CONFIG_PARAM_ENDPOINT + "\" value=\""+Encoder.attributeEscape(endpoint)+"\" size=\"50\"/></td></tr>\n");
-    out.print("<tr><td class=\"description\"><nobr>Repository ID:</nobr></td>" +
+    out.print("<tr><td class=\"description\"><nobr>" + Messages.getString("CmisAuthorityConnector.RepositoryID") + "</nobr></td>" +
         "<td class=\"value\"><input type=\"text\" name=\""
         + CONFIG_PARAM_REPOSITORY_ID + "\" value=\""+Encoder.attributeEscape(repositoryId)+"\"/></td></tr>\n");
     out.print("</table>\n");
@@ -182,7 +183,7 @@ public class CmisAuthorityConnector exte
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>User mapping:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("CmisAuthorityConnector.UserMapping") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <input type=\"text\" size=\"32\" name=\""+CONFIG_PARAM_USERNAME_REGEXP+"\" value=\""+
   Encoder.attributeEscape(usernameRegexp)+"\"/> ==&gt; \n"+
@@ -233,15 +234,15 @@ public class CmisAuthorityConnector exte
     out.print("<script type=\"text/javascript\">\n" + "<!--\n"
         + "function checkConfig()\n" + "{\n"
         + "  if (editconnection.endpoint.value == \"\")\n" + "  {\n"
-        + "    alert(\"The endpoint must be not null\");\n"
+        + "    alert(\"" + Messages.getString("CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
         + "    editconnection.endpoint.focus();\n" + "    return false;\n"
         + "  }\n" + "\n" + "  return true;\n" + "}\n" + " \n"
         + "function checkConfigForSave()\n" + "{\n"
         + "  if (editconnection.endpoint.value == \"\")\n" + "  {\n"
-        + "    alert(\"The endpoint must be not null\");\n"
+        + "    alert(\"" + Messages.getString("CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
         + "    editconnection.endpoint.focus();\n" + "    return false;\n"
         + "  }\n" + "  if (editconnection.repositoryId.value == \"\")\n" + "  {\n"
-        + "    alert(\"The repository id must be not null\");\n"
+        + "    alert(\"" + Messages.getString("CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
         + "    editconnection.repositoryId.focus();\n" + "    return false;\n"
         + "  }\n" + "  return true;\n" + "}\n" + "\n" + "//-->\n"
         + "</script>\n");
@@ -315,7 +316,7 @@ public class CmisAuthorityConnector exte
       ConfigParams parameters) throws ManifoldCFException, IOException {
     out.print("<table class=\"displaytable\">\n"
         + "  <tr>\n"
-        + "    <td class=\"description\" colspan=\"1\"><nobr>Parameters:</nobr></td>\n"
+        + "    <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getString("CmisAuthorityConnector.Parameters") + "</nobr></td>\n"
         + "    <td class=\"value\" colspan=\"3\">\n");
     Iterator iter = parameters.listParameters();
     while (iter.hasNext()) {
@@ -473,4 +474,4 @@ public class CmisAuthorityConnector exte
       
     }
     
-}
\ No newline at end of file
+}

Modified: incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java Mon Dec 19 07:34:58 2011
@@ -51,6 +51,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.impl.Constants;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
 import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
 import org.apache.manifoldcf.core.interfaces.ConfigParams;
@@ -83,7 +84,7 @@ public class CmisRepositoryConnector ext
   private static final String BINDING_WS_VALUE = "ws";
 
   private static final String JOB_STARTPOINT_NODE_TYPE = "startpoint";
-  private static final String TAB_LABEL_CMIS_QUERY = "CMIS Query";
+  private static final String TAB_LABEL_CMIS_QUERY = Messages.getString("CmisRepositoryConnector.CMISQuery");
 
   protected final static String ACTIVITY_READ = "read document";
   protected static final String RELATIONSHIP_CHILD = "child";
@@ -93,13 +94,13 @@ public class CmisRepositoryConnector ext
   private static final SimpleDateFormat ISO8601_DATE_FORMATTER = new SimpleDateFormat(
       "yyyy-MM-dd'T'HH:mm:ssZ");
   
-  private static final String VIEW_CONFIG_FORWARD = "viewConfiguration.html";
-  private static final String EDIT_CONFIG_FORWARD = "editConfiguration.html";
-  private static final String EDIT_CONFIG_HEADER_FORWARD = "editConfiguration.js";
+  private static final String VIEW_CONFIG_FORWARD = Messages.getString("CmisRepositoryConnector.viewConfigurationHtml");
+  private static final String EDIT_CONFIG_FORWARD = Messages.getString("CmisRepositoryConnector.editConfigurationHtml");
+  private static final String EDIT_CONFIG_HEADER_FORWARD = Messages.getString("CmisRepositoryConnector.editConfigurationJs");
   
-  private static final String VIEW_SPEC_FORWARD = "viewSpecification.html";
-  private static final String EDIT_SPEC_FORWARD = "editSpecification.html";
-  private static final String EDIT_SPEC_HEADER_FORWARD = "editSpecification.js";
+  private static final String VIEW_SPEC_FORWARD = Messages.getString("CmisRepositoryConnector.viewSpecificationHtml");
+  private static final String EDIT_SPEC_FORWARD = Messages.getString("CmisRepositoryConnector.editSpecificationHtml");
+  private static final String EDIT_SPEC_HEADER_FORWARD = Messages.getString("CmisRepositoryConnector.editSpecificationJs");
 
   /**
    * CMIS Session handle
@@ -172,6 +173,7 @@ public class CmisRepositoryConnector ext
         // create session
         if (StringUtils.isEmpty(repositoryId)) {
 
+
           // get a session from the first CMIS repository exposed by
           // the endpoint
           List<Repository> repos = null;
@@ -656,6 +658,7 @@ public class CmisRepositoryConnector ext
   }
 
   /**
+
    * Output the configuration header section. This method is called in the head
    * section of the connector's configuration page. Its purpose is to add the
    * required tabs to the list, and to output any javascript methods that might
@@ -1099,4 +1102,4 @@ public class CmisRepositoryConnector ext
     }
     return rval;
   }
-}
\ No newline at end of file
+}

Modified: incubator/lcf/branches/CONNECTORS-314/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java Mon Dec 19 07:34:58 2011
@@ -19,6 +19,7 @@
 package org.apache.manifoldcf.crawler.connectors.DCTM;
 
 import org.apache.log4j.*;
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.interfaces.*;
@@ -1887,6 +1888,8 @@ public class DCTM extends org.apache.man
   @Override
   public void releaseDocumentVersions(String[] documentIdentifiers, String[] versions)
     throws ManifoldCFException
+
+
   {
     // Nothing to do
   }
@@ -1918,8 +1921,8 @@ public class DCTM extends org.apache.man
   public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Docbase");
-    tabsArray.add("Webtop");
+    tabsArray.add(Messages.getString("DCTM.Docbase"));
+    tabsArray.add(Messages.getString("DCTM.Webtop"));
     
     out.print(
 "<script type=\"text/javascript\">\n"+
@@ -1929,28 +1932,28 @@ public class DCTM extends org.apache.man
 "  if (editconnection.docbasename.value == \"\")\n"+
 "  {\n"+
 "    alert(\"Please supply the name of a Docbase\");\n"+
-"    SelectTab(\"Docbase\");\n"+
+"    SelectTab(\"" + Messages.getString("DCTM.Docbase") + ”\");\n"+
 "    editconnection.docbasename.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.docbaseusername.value == \"\")\n"+
 "  {\n"+
 "    alert(\"The connection requires a valid Documentum user name\");\n"+
-"    SelectTab(\"Docbase\");\n"+
+"    SelectTab(\"" + Messages.getString("DCTM.Docbase") + "\");\n"+
 "    editconnection.docbaseusername.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.docbasepassword.value == \"\")\n"+
 "  {\n"+
 "    alert(\"The connection requires the Documentum user's password\");\n"+
-"    SelectTab(\"Docbase\");\n"+
+"    SelectTab(\"" + Messages.getString("DCTM.Docbase") + "\");\n"+
 "    editconnection.docbasepassword.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.webtopbaseurl.value == \"\")\n"+
 "  {\n"+
 "    alert(\"Please specify the base url to a webtop to serve selected documents\");\n"+
-"    SelectTab(\"Webtop\");\n"+
+"    SelectTab(\"" + Messages.getString("DCTM.Webtop") + "\");\n"+
 "    editconnection.webtopbaseurl.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -1992,22 +1995,22 @@ public class DCTM extends org.apache.man
       webtopBaseUrl = "http://localhost/webtop/";
 
     // "Docbase" tab
-    if (tabName.equals("Docbase"))
+    if (tabName.equals(Messages.getString("DCTM.Docbase")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Docbase name:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"docbasename\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(docbaseName)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.DocbaseName") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"docbasename\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(docbaseName)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Docbase user name:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"docbaseusername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(docbaseUserName)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.DocbaseUserName") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"docbaseusername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(docbaseUserName)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Docbase password:</nobr></td><td class=\"value\"><input type=\"password\" size=\"32\" name=\"docbasepassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(docbasePassword)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.DocbasePassword") + "</nobr></td><td class=\"value\"><input type=\"password\" size=\"32\" name=\"docbasepassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(docbasePassword)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Docbase domain:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"docbasedomain\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(docbaseDomain)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.DocbaseDomain") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"docbasedomain\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(docbaseDomain)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -2024,13 +2027,13 @@ public class DCTM extends org.apache.man
     }
 
     // Webtop tab
-    if (tabName.equals("Webtop"))
+    if (tabName.equals(Messages.getString("DCTM.Webtop")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Webtop Base URL:</nobr></td><td class=\"value\"><input type=\"text\" size=\"64\" name=\"webtopbaseurl\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(webtopBaseUrl)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.WebtopBaseURL") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"64\" name=\"webtopbaseurl\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(webtopBaseUrl)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -2094,7 +2097,7 @@ public class DCTM extends org.apache.man
     out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr>\n"+
-"    <td class=\"description\" colspan=\"1\"><nobr>Parameters:</nobr></td>\n"+
+"    <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getString("DCTM.Parameters") + "</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"3\">\n"
     );
     Iterator iter = parameters.listParameters();
@@ -2140,12 +2143,12 @@ public class DCTM extends org.apache.man
   public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Paths");
-    tabsArray.add("Document Types");
-    tabsArray.add("Content Types");
-    tabsArray.add("Content Length");
-    tabsArray.add("Security");
-    tabsArray.add("Path Metadata");
+    tabsArray.add(Messages.getString("DCTM.Paths"));
+    tabsArray.add(Messages.getString("DCTM.DocumentTypes"));
+    tabsArray.add(Messages.getString("DCTM.ContentTypes"));
+    tabsArray.add(Messages.getString("DCTM.ContentLength"));
+    tabsArray.add(Messages.getString("DCTM.Security"));
+    tabsArray.add(Messages.getString("DCTM.PathMetadata"));
     out.print(
 "<script type=\"text/javascript\">\n"+
 "<!--\n"+
@@ -2229,7 +2232,7 @@ public class DCTM extends org.apache.man
     int k;
 
     // Paths tab
-    if (tabName.equals("Paths"))
+    if (tabName.equals(Messages.getString("DCTM.Paths")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2255,6 +2258,7 @@ public class DCTM extends org.apache.man
 "      </a>&nbsp;\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
+
 "      "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(sn.getAttributeValue("path"))+"\n"+
 "    </td>\n"+
 "  </tr>\n"
@@ -2386,13 +2390,13 @@ public class DCTM extends org.apache.man
       }
     }
 
-    if (tabName.equals("Security"))
+    if (tabName.equals(Messages.getString("DCTM.Security")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Security:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>Messages.getString("DCTM.Security2")</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"1\">\n"+
 "      <input type=\"radio\" name=\"specsecurity\" value=\"on\" "+((securityOn)?"checked=\"true\"":"")+" />Enabled&nbsp;\n"+
 "      <input type=\"radio\" name=\"specsecurity\" value=\"off\" "+((securityOn==false)?"checked=\"true\"":"")+" />Disabled\n"+
@@ -2432,7 +2436,7 @@ public class DCTM extends org.apache.man
       {
         out.print(
 "  <tr>\n"+
-"    <td class=\"message\" colspan=\"2\">No access tokens present</td>\n"+
+"    <td class=\"message\" colspan=\"2\">" + Messages.getString("DCTM.NoAccessTokensPresent") + "</td>\n"+
 "  </tr>\n"
         );
       }
@@ -2516,7 +2520,7 @@ public class DCTM extends org.apache.man
       }
     }
 
-    if (tabName.equals("Document Types"))
+    if (tabName.equals(Messages.getString("DCTM.DocumentTypes")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2676,7 +2680,7 @@ public class DCTM extends org.apache.man
       }
     }
 
-    if (tabName.equals("Content Types"))
+    if (tabName.equals(Messages.getString("DCTM.ContentTypes")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2772,7 +2776,7 @@ public class DCTM extends org.apache.man
       }
     }
 
-    if (tabName.equals("Content Length"))
+    if (tabName.equals(Messages.getString("DCTM.ContentLength")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2824,7 +2828,7 @@ public class DCTM extends org.apache.man
       }
     }
 
-    if (tabName.equals("Path Metadata"))
+    if (tabName.equals(Messages.getString("DCTM.PathMetadata")))
     {
       out.print(
 "<input type=\"hidden\" name=\"specmappingcount\" value=\""+Integer.toString(matchMap.getMatchCount())+"\"/>\n"+
@@ -2833,7 +2837,7 @@ public class DCTM extends org.apache.man
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"4\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\" colspan=\"1\"><nobr>Path attribute name:</nobr></td>\n"+
+"    <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getString("DCTM.PathAttributeName") + "</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"3\">\n"+
 "      <input type=\"text\" name=\"specpathnameattribute\" size=\"20\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pathNameAttribute)+"\"/>\n"+
 "    </td>\n"+
@@ -2849,7 +2853,7 @@ public class DCTM extends org.apache.man
 "  <tr>\n"+
 "    <td class=\"description\"><input type=\"hidden\" name=\""+"specmappingop_"+Integer.toString(i)+"\" value=\"\"/>\n"+
 "      <a name=\""+"mapping_"+Integer.toString(i)+"\">\n"+
-"        <input type=\"button\" onClick='Javascript:SpecOp(\"specmappingop_"+Integer.toString(i)+"\",\"Delete\",\"mapping_"+Integer.toString(i)+"\")' alt=\"Delete mapping #"+Integer.toString(i)+"\" value=\"Delete\"/>\n"+
+"        <input type=\"button\" onClick='Javascript:SpecOp(\"specmappingop_"+Integer.toString(i)+"\",\"" + Messages.getString("DCTM.Delete") + "\",\"mapping_"+Integer.toString(i)+"\")' alt=\"" + Messages.getString("DCTM.DeleteMapping") + Integer.toString(i)+"\" value=\"Delete\"/>\n"+
 "      </a>\n"+
 "    </td>\n"+
 "    <td class=\"value\"><input type=\"hidden\" name=\"specmatch_"+Integer.toString(i)+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(matchString)+"\"/>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(matchString)+"</td>\n"+
@@ -2862,7 +2866,7 @@ public class DCTM extends org.apache.man
       if (i == 0)
       {
         out.print(
-"  <tr><td colspan=\"4\" class=\"message\">No mappings specified</td></tr>\n"
+"  <tr><td colspan=\"4\" class=\"message\">" + Messages.getString("DCTM.NoMappingsSpecified") + "</td></tr>\n"
         );
       }
       out.print(
@@ -2871,12 +2875,12 @@ public class DCTM extends org.apache.man
 "  <tr>\n"+
 "    <td class=\"description\">\n"+
 "      <a name=\""+"mapping_"+Integer.toString(i)+"\">\n"+
-"        <input type=\"button\" onClick='Javascript:SpecAddMapping(\"mapping_"+Integer.toString(i+1)+"\")' alt=\"Add to mappings\" value=\"Add\"/>\n"+
+"        <input type=\"button\" onClick='Javascript:SpecAddMapping(\"mapping_"+Integer.toString(i+1)+"\")' alt=\"" + Messages.getString("DCTM.AddToMappings") + "\" value=\"" + Messages.getString("DCTM.Add") + "\"/>\n"+
 "      </a>\n"+
 "    </td>\n"+
-"    <td class=\"value\">Match regexp:&nbsp;<input type=\"text\" name=\"specmatch\" size=\"32\" value=\"\"/></td>\n"+
+"    <td class=\"value\">" + Messages.getString("DCTM.MatchRegexp") + "&nbsp;<input type=\"text\" name=\"specmatch\" size=\"32\" value=\"\"/></td>\n"+
 "    <td class=\"value\">==></td>\n"+
-"    <td class=\"value\">Replace string:&nbsp;<input type=\"text\" name=\"specreplace\" size=\"32\" value=\"\"/></td>\n"+
+"    <td class=\"value\">" + Messages.getString("DCTM.ReplaceString") + "&nbsp;<input type=\"text\" name=\"specreplace\" size=\"32\" value=\"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -3237,7 +3241,7 @@ public class DCTM extends org.apache.man
         {
           seenAny = true;
           out.print(
-"    <td class=\"description\">Cabinet/folder paths:</td>\n"+
+"    <td class=\"description\">" + Messages.getString("DCTM.CabinetFolderPaths") + "</td>\n"+
 "    <td class=\"value\">\n"
           );
         }
@@ -3256,7 +3260,7 @@ public class DCTM extends org.apache.man
     else
     {
       out.print(
-"    <td colspan=\"2\" class=\"message\">No cabinet/folder paths specified (everything in docbase will be scanned)</td>\n"
+"    <td colspan=\"2\" class=\"message\">" + Messages.getString("DCTM.NoCabinetFolderPathsSpecified") + "</td>\n"
       );
     }
     out.print(
@@ -3275,7 +3279,7 @@ public class DCTM extends org.apache.man
         if (seenAny == false)
         {
           out.print(
-"    <td class=\"description\"><nobr>Object types:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.ObjectTypes") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <table class=\"displaytable\">\n"
           );
@@ -3292,7 +3296,7 @@ public class DCTM extends org.apache.man
         );
         if (isAll != null && isAll.equals("true"))
           out.print(
-"            <nobr>(all metadata attributes)</nobr>\n"
+"            <nobr>" + Messages.getString("DCTM.allMetadataAttributes") + "</nobr>\n"
           );
         else
         {
@@ -3326,7 +3330,7 @@ public class DCTM extends org.apache.man
     else
     {
       out.print(
-"    <td colspan=\"2\" class=\"message\">No document types specified</td>\n"
+"    <td colspan=\"2\" class=\"message\">" + Messages.getString("DCTM.NoDocumentTypesSpecified") + "</td>\n"
       );
     }
     out.print(
@@ -3345,7 +3349,7 @@ public class DCTM extends org.apache.man
         if (seenAny == false)
         {
           out.print(
-"    <td class=\"description\"><nobr>Content types:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.ContentTypes2") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"
           );
           seenAny = true;
@@ -3365,7 +3369,7 @@ public class DCTM extends org.apache.man
     else
     {
       out.print(
-"    <td colspan=\"2\" class=\"message\">No mime types specified - ALL will be ingested</td>\n"
+"    <td colspan=\"2\" class=\"message\">" + Messages.getString("DCTM.NoMimeTypesSpecified") + "</td>\n"
       );
     }
     out.print(
@@ -3388,7 +3392,7 @@ public class DCTM extends org.apache.man
     out.print(
 "\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Maximum document length:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.MaximumDocumentLength") + "</nobr></td>\n"+
 "    <td class=\"value\">"+maxDocumentLength+"</td>\n"+
 "  </tr>\n"+
 "\n"+
@@ -3414,7 +3418,7 @@ public class DCTM extends org.apache.man
     out.print(
 "\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Security:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>Messages.getString("DCTM.Security2")</nobr></td>\n"+
 "    <td class=\"value\">"+((securityOn)?"Enabled":"Disabled")+"</td>\n"+
 "  </tr>\n"+
 "\n"+
@@ -3432,7 +3436,7 @@ public class DCTM extends org.apache.man
         {
           out.print(
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Access tokens:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.AccessTokens") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"
           );
           seenAny = true;
@@ -3454,7 +3458,7 @@ public class DCTM extends org.apache.man
     else
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\">No access tokens specified</td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\">" + Messages.getString("DCTM.NoAccessTokensSpecified") + "</td></tr>\n"
       );
     }
 
@@ -3481,14 +3485,14 @@ public class DCTM extends org.apache.man
     if (pathNameAttribute.length() > 0)
     {
       out.print(
-"    <td class=\"description\">Path-name metadata attribute:</td>\n"+
+"    <td class=\"description\">" + Messages.getString("DCTM.PathNameMetadataAttribute") + "</td>\n"+
 "    <td class=\"value\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(pathNameAttribute)+"</td>\n"
       );
     }
     else
     {
       out.print(
-"    <td class=\"message\" colspan=\"2\">No path-name metadata attribute specified</td>\n"
+"    <td class=\"message\" colspan=\"2\">" +  + "</td>\n"
       );
     }
     
@@ -3516,7 +3520,7 @@ public class DCTM extends org.apache.man
     if (matchMap.getMatchCount() > 0)
     {
       out.print(
-"    <td class=\"description\"><nobr>Path-value mapping:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("DCTM.PathValueMapping") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <table class=\"displaytable\">\n"
       );
@@ -3543,7 +3547,7 @@ public class DCTM extends org.apache.man
     else
     {
       out.print(
-"    <td class=\"message\" colspan=\"2\">No mappings specified</td>\n"
+"    <td class=\"message\" colspan=\"2\">" + Messages.getString("DCTM.NoMappingsSpecified") + "</td>\n"
       );
     }
 

Modified: incubator/lcf/branches/CONNECTORS-314/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1220632&r1=1220631&r2=1220632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java (original)
+++ incubator/lcf/branches/CONNECTORS-314/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Mon Dec 19 07:34:58 2011
@@ -19,6 +19,7 @@
 package org.apache.manifoldcf.crawler.connectors.filenet;
 
 import org.apache.log4j.*;
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.interfaces.*;
@@ -1109,6 +1110,7 @@ public class FilenetConnector extends or
             if (Logging.connectors.isDebugEnabled())
               Logging.connectors.debug("FileNet: Skipping file '"+documentIdentifier+"' because: "+e.getMessage(),e);
             rval[i] = null;
+
           }
           else
             throw new ManifoldCFException(e.getMessage(),e);
@@ -1453,10 +1455,10 @@ public class FilenetConnector extends or
   public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Server");
-    tabsArray.add("Object Store");
-    tabsArray.add("Document URL");
-    tabsArray.add("Credentials");
+    tabsArray.add(Messages.getString("FilenetConnector.Server"));
+    tabsArray.add(Messages.getString("FilenetConnector.ObjectStore"));
+    tabsArray.add(Messages.getString("FilenetConnector.DocumentURL"));
+    tabsArray.add(Messages.getString("FilenetConnector.Credentials"));
     out.print(
 "<script type=\"text/javascript\">\n"+
 "<!--\n"+
@@ -1483,28 +1485,28 @@ public class FilenetConnector extends or
 "  if (editconnection.serverhostname.value == \"\")\n"+
 "  {\n"+
 "    alert(\"The connection requires a FileNet host name\");\n"+
-"    SelectTab(\"Server\");\n"+
+"    SelectTab(\"" + Messages.getString("FilenetConnector.Server") + "\");\n"+
 "    editconnection.serverhostname.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.serverport.value != \"\" && !isInteger(editconnection.serverport.value))\n"+
 "  {\n"+
 "    alert(\"The server port must be an integer\");\n"+
-"    SelectTab(\"Server\");\n"+
+"    SelectTab(\"" + Messages.getString("FilenetConnector.Server") + "\");\n"+
 "    editconnection.serverport.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.urlhostname.value == \"\")\n"+
 "  {\n"+
 "    alert(\"The Document URL requires a host name\");\n"+
-"    SelectTab(\"Document URL\");\n"+
+"    SelectTab(\"" + Messages.getString("FilenetConnector.DocumentURL") + "\");\n"+
 "    editconnection.urlhostname.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.urlport.value != \"\" && !isInteger(editconnection.urlport.value))\n"+
 "  {\n"+
 "    alert(\"The Document URL port must be an integer\");\n"+
-"    SelectTab(\"Document URL\");\n"+
+"    SelectTab(\"" + Messages.getString("FilenetConnector.DocumentURL") + "\");\n"+
 "    editconnection.urlport.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -1512,28 +1514,28 @@ public class FilenetConnector extends or
 "  if (editconnection.filenetdomain.value == \"\")\n"+
 "  {\n"+
 "    alert(\"The file net domain name cannot be null\");\n"+
-"    SelectTab(\"Object Store\");\n"+
+"    SelectTab(\"" + Messages.getString("FilenetConnector.ObjectStore") + "\");\n"+
 "    editconnection.filenetdomain.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.objectstore.value == \"\")\n"+
 "  {\n"+
 "    alert(\"The object store name cannot be null\");\n"+
-"    SelectTab(\"Object Store\");\n"+
+"    SelectTab(\"" + Messages.getString("FilenetConnector.ObjectStore") + "\");\n"+
 "    editconnection.objectstore.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.userid.value == \"\")\n"+
 "  {\n"+
 "    alert(\"The connection requires a valid FileNet user ID\");\n"+
-"    SelectTab(\"Credentials\");\n"+
+"    SelectTab(\"" + Messages.getString("FilenetConnector.Credentials") + "\");\n"+
 "    editconnection.userid.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.password.value == \"\")\n"+
 "  {\n"+
 "    alert(\"The connection requires the FileNet user's password\");\n"+
-"    SelectTab(\"Credentials\");\n"+
+"    SelectTab(\"" + Messages.getString("FilenetConnector.Credentials") + "\");\n"+
 "    editconnection.password.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -1600,13 +1602,13 @@ public class FilenetConnector extends or
       urllocation = "Workplace/Browse.jsp";
 
     // "Server" tab
-    if (tabName.equals("Server"))
+    if (tabName.equals(Messages.getString("FilenetConnector.Server")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Server protocol:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.ServerProtocol") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <select name=\"serverprotocol\" size=\"2\">\n"+
 "        <option value=\"http\" "+(serverprotocol.equals("http")?"selected=\"true\"":"")+">http</option>\n"+
@@ -1615,13 +1617,13 @@ public class FilenetConnector extends or
 "    </td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Server host name:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"serverhostname\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverhostname)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.ServerHostName") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"serverhostname\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverhostname)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Server port:</nobr></td><td class=\"value\"><input type=\"text\" size=\"5\" name=\"serverport\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverport)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.ServerPort") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"5\" name=\"serverport\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverport)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Server web service location:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"serverwsilocation\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverwsilocation)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.ServerWebServiceLocation") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"serverwsilocation\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverwsilocation)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -1638,13 +1640,13 @@ public class FilenetConnector extends or
     }
 
     // "Document URL" tab
-    if (tabName.equals("Document URL"))
+    if (tabName.equals(Messages.getString("FilenetConnector.DocumentURL")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Document URL protocol:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.DocumentURLProtocol") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <select name=\"urlprotocol\" size=\"2\">\n"+
 "        <option value=\"http\" "+(serverprotocol.equals("http")?"selected=\"true\"":"")+">http</option>\n"+
@@ -1653,13 +1655,13 @@ public class FilenetConnector extends or
 "    </td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Document URL host name:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"urlhostname\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(urlhostname)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.DocumentURLHostName") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"urlhostname\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(urlhostname)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Document URL port:</nobr></td><td class=\"value\"><input type=\"text\" size=\"5\" name=\"urlport\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(urlport)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.DocumentURLPort") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"5\" name=\"urlport\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(urlport)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Document URL location:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"urllocation\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(urllocation)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + DocumentURLLocation + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"urllocation\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(urllocation)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -1676,16 +1678,16 @@ public class FilenetConnector extends or
     }
 
     // "Object Store" tab
-    if (tabName.equals("Object Store"))
+    if (tabName.equals(Messages.getString("FilenetConnector.ObjectStore")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>FileNet domain name:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"filenetdomain\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(filenetdomain)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.FileNetDomainName") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"filenetdomain\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(filenetdomain)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Object store name:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"objectstore\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(objectstore)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.ObjectStoreName") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"objectstore\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(objectstore)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -1701,16 +1703,16 @@ public class FilenetConnector extends or
 
 
     // "Credentials" tab
-    if (tabName.equals("Credentials"))
+    if (tabName.equals(Messages.getString("FilenetConnector.Credentials")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>User ID:</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"userid\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(userID)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.UserID") + "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"userid\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(userID)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Password:</nobr></td><td class=\"value\"><input type=\"password\" size=\"32\" name=\"password\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(password)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.Password") + "</nobr></td><td class=\"value\"><input type=\"password\" size=\"32\" name=\"password\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(password)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -1803,9 +1805,10 @@ public class FilenetConnector extends or
     out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr>\n"+
-"    <td class=\"description\" colspan=\"1\"><nobr>Parameters:</nobr></td>\n"+
+"    <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getString("FilenetConnector.Parameters") + "</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"3\">\n"
     );
+
     Iterator iter = parameters.listParameters();
     while (iter.hasNext())
     {
@@ -1849,10 +1852,10 @@ public class FilenetConnector extends or
   public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Document Classes");
-    tabsArray.add("Mime Types");
-    tabsArray.add("Folders");
-    tabsArray.add("Security");
+    tabsArray.add(Messages.getString("FilenetConnector.DocumentClasses"));
+    tabsArray.add(Messages.getString("FilenetConnector.MimeTypes"));
+    tabsArray.add(Messages.getString("FilenetConnector.Folders"));
+    tabsArray.add(Messages.getString("FilenetConnector.Security"));
     out.print(
 "<script type=\"text/javascript\">\n"+
 "<!--\n"+
@@ -1947,7 +1950,7 @@ public class FilenetConnector extends or
     }
 
     // Folders tab
-    if (tabName.equals("Folders"))
+    if (tabName.equals(Messages.getString("FilenetConnector.Folders")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -1970,7 +1973,7 @@ public class FilenetConnector extends or
 "  <tr>\n"+
 "    <td class=\"value\">\n"+
 "      <a name=\""+"path_"+Integer.toString(k)+"\">\n"+
-"        <input type=\"button\" value=\"Delete\" alt=\""+"Delete path #"+Integer.toString(k)+"\" onClick='Javascript:SpecOp(\""+pathOpName+"\",\"Delete\",\"path_"+Integer.toString(k)+"\")'/>\n"+
+"        <input type=\"button\" value=\"" + Messages.getString("FilenetConnector.Delete") + "\" alt=\""+Messages.getString("FilenetConnector.DeletePath")+Integer.toString(k)+"\" onClick='Javascript:SpecOp(\""+pathOpName+"\",\"Delete\",\"path_"+Integer.toString(k)+"\")'/>\n"+
 "      </a>&nbsp;\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
@@ -1987,7 +1990,7 @@ public class FilenetConnector extends or
       {
         out.print(
 "  <tr>\n"+
-"    <td class=\"message\" colspan=\"2\">No folders chosen - all documents will be taken</td>\n"+
+"    <td class=\"message\" colspan=\"2\">" + Messages.getString("FilenetConnector.NoFoldersChosen") + "</td>\n"+
 "  </tr>\n"
         );
       }
@@ -2020,22 +2023,22 @@ public class FilenetConnector extends or
         out.print(
 "          <input type=\"hidden\" name=\"specpath\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(pathSoFar)+"\"/>\n"+
 "          <input type=\"hidden\" name=\"pathop\" value=\"\"/>\n"+
-"          <input type=\"button\" value=\"Add\" alt=\"Add path\" onClick='Javascript:SpecOp(\"pathop\",\"Add\",\"path_"+Integer.toString(k+1)+"\")'/>\n"+
+"          <input type=\"button\" value=\"" + Messages.getString("FilenetConnector.Add") + "\" alt=\"" + Messages.getString("FilenetConnector.AddPath") + "\" onClick='Javascript:SpecOp(\"pathop\",\"Add\",\"path_"+Integer.toString(k+1)+"\")'/>\n"+
 "          &nbsp;"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(pathSoFar)+"\n"
         );
         if (pathSoFar.length() > 0)
         {
           out.print(
-"          <input type=\"button\" value=\"-\" alt=\"Remove from path\" onClick='Javascript:SpecOp(\"pathop\",\"Up\",\"path_"+Integer.toString(k)+"\")'/>\n"
+"          <input type=\"button\" value=\"-\" alt=\"" + Messages.getString("FilenetConnector.RemoveFromPath") + "\" onClick='Javascript:SpecOp(\"pathop\",\"Up\",\"path_"+Integer.toString(k)+"\")'/>\n"
           );
         }
         if (childList.length > 0)
         {
           out.print(
 "          <nobr>\n"+
-"            <input type=\"button\" value=\"+\" alt=\"Add to path\" onClick='Javascript:SpecAddToPath(\"path_"+Integer.toString(k)+"\")'/>&nbsp;\n"+
+"            <input type=\"button\" value=\"+\" alt=\"" + Messages.getString("FilenetConnector.AddToPath") + "\" onClick='Javascript:SpecAddToPath(\"path_"+Integer.toString(k)+"\")'/>&nbsp;\n"+
 "            <select multiple=\"false\" name=\"pathaddon\" size=\"4\">\n"+
-"              <option value=\"\" selected=\"selected\">-- Pick a folder --</option>\n"
+"              <option value=\"\" selected=\"selected\">-- " + Messages.getString("FilenetConnector.PickAFolder") + " --</option>\n"
           );
           int j = 0;
           while (j < childList.length)
@@ -2094,7 +2097,7 @@ public class FilenetConnector extends or
     }
     
     // Document classes tab
-    if (tabName.equals("Document Classes"))
+    if (tabName.equals(Messages.getString("FilenetConnector.DocumentClasses")))
     {
       out.print(
 "<input type=\"hidden\" name=\"hasdocumentclasses\" value=\"true\"/>\n"+
@@ -2149,7 +2152,7 @@ public class FilenetConnector extends or
 "      <table class=\"displaytable\">\n"+
 "        <tr>\n"+
 "          <td class=\"description\">\n"+
-"            <nobr>Include?</nobr>\n"+
+"            <nobr>" + Messages.getString("FilenetConnector.Include") + "</nobr>\n"+
 "          </td>\n"+
 "          <td class=\"value\">\n"+
 "            <nobr><input type=\"checkbox\" name=\"documentclasses\" "+((spec != null)?"checked=\"true\"":"")+" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"\"></input></nobr>\n"+
@@ -2157,7 +2160,7 @@ public class FilenetConnector extends or
 "        </tr>\n"+
 "        <tr>\n"+
 "          <td class=\"description\">\n"+
-"            <nobr>Document criteria:</nobr>\n"+
+"            <nobr>" + Messages.getString("FilenetConnector.DocumentCriteria") + "</nobr>\n"+
 "          </td>\n"+
 "          <td class=\"boxcell\">\n"+
 "            <table class=\"displaytable\">\n"
@@ -2188,7 +2191,7 @@ public class FilenetConnector extends or
 "                <td class=\"description\">\n"+
 "                  <input type=\"hidden\" name=\""+opName+"\" value=\"\"/>\n"+
 "                  <a name=\""+labelName+"\">\n"+
-"                    <input type=\"button\" value=\"Delete\" alt=\"Delete "+documentClass+" match # "+Integer.toString(q)+"\" onClick='Javascript:SpecOp(\""+opName+"\",\"Delete\",\""+labelName+"\")'/>\n"+
+"                    <input type=\"button\" value=\"" + Messages.getString("FilenetConnector.Delete") + "\" alt=\"" + Messages.getString("FilenetConnector.Delete") + documentClass+" match # "+Integer.toString(q)+"\" onClick='Javascript:SpecOp(\""+opName+"\",\"Delete\",\""+labelName+"\")'/>\n"+
 "                  </a>\n"+
 "                </td>\n"+
 "                <td class=\"value\">\n"+
@@ -2210,7 +2213,7 @@ public class FilenetConnector extends or
           if (q == 0)
           {
             out.print(
-"              <tr><td class=\"message\" colspan=\"4\"><nobr>(No criteria specified - all documents will be taken)</nobr></td></tr>\n"
+"              <tr><td class=\"message\" colspan=\"4\"><nobr>" + Messages.getString("FilenetConnector.NoCriteriaSpecified") + "</nobr></td></tr>\n"
             );
           }
           String addLabelName = "match_"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"_"+Integer.toString(q);
@@ -2222,7 +2225,7 @@ public class FilenetConnector extends or
 "                  <input type=\"hidden\" name=\""+"matchcount_"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"\" value=\""+Integer.toString(matchCount)+"\"/>\n"+
 "                  <input type=\"hidden\" name=\""+addOpName+"\" value=\"\"/>\n"+
 "                  <a name=\""+addLabelName+"\">\n"+
-"                    <input type=\"button\" value=\"Add\" alt=\"Add match for "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"\" onClick='Javascript:SpecAddMatch(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"\",\"match_"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"_"+Integer.toString(q+1)+"\")'/>\n"+
+"                    <input type=\"button\" value=\"" + Messages.getString("FilenetConnector.Add") + "\" alt=\"Add match for "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"\" onClick='Javascript:SpecAddMatch(\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"\",\"match_"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"_"+Integer.toString(q+1)+"\")'/>\n"+
 "                  </a>\n"+
 "                </td>\n"+
 "                <td class=\"value\">\n"+
@@ -2257,7 +2260,7 @@ public class FilenetConnector extends or
 "        </tr>\n"+
 "        <tr>\n"+
 "          <td class=\"description\">\n"+
-"            <nobr>Ingest all metadata fields?</nobr>\n"+
+"            <nobr>" + Messages.getString("FilenetConnector.IngestAllMetadataFields") + "</nobr>\n"+
 "          </td>\n"+
 "          <td class=\"value\">\n"+
 "            <nobr><input type=\"checkbox\" name=\"allmetadata_"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"\" value=\"true\" "+((spec != null && spec.getAllMetadata())?"checked=\"\"":"")+"></input></nobr><br/>\n"+
@@ -2265,7 +2268,7 @@ public class FilenetConnector extends or
 "        </tr>\n"+
 "        <tr>\n"+
 "          <td class=\"description\">\n"+
-"            <nobr>Metadata fields:</nobr>\n"+
+"            <nobr>" + Messages.getString("FilenetConnector.MetadataFields") + "</nobr>\n"+
 "          </td>\n"+
 "          <td class=\"value\">\n"+
 "            <nobr>\n"+
@@ -2362,7 +2365,7 @@ public class FilenetConnector extends or
       }
     }
 
-    if (tabName.equals("Mime Types"))
+    if (tabName.equals(Messages.getString("FilenetConnector.MimeTypes")))
     {
       out.print(
 "<input type=\"hidden\" name=\"hasmimetypes\" value=\"true\"/>\n"+
@@ -2396,7 +2399,7 @@ public class FilenetConnector extends or
       else
       {
         out.print(
-"    <td class=\"description\"><nobr>Mime types to include:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.MimeTypesToInclude") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <select name=\"mimetypes\" size=\"10\" multiple=\"true\">\n"
         );
@@ -2466,13 +2469,13 @@ public class FilenetConnector extends or
       }
     }
 
-    if (tabName.equals("Security"))
+    if (tabName.equals(Messages.getString("FilenetConnector.Security")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Security:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.Security2") + "</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"1\">\n"+
 "      <input type=\"radio\" name=\"specsecurity\" value=\"on\" "+((securityOn)?"checked=\"true\"":"")+" />Enabled&nbsp;\n"+
 "      <input type=\"radio\" name=\"specsecurity\" value=\"off\" "+((securityOn==false)?"checked=\"true\"":"")+" />Disabled\n"+
@@ -2497,7 +2500,7 @@ public class FilenetConnector extends or
 "      <input type=\"hidden\" name=\""+accessOpName+"\" value=\"\"/>\n"+
 "      <input type=\"hidden\" name=\""+"spectoken"+accessDescription+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(token)+"\"/>\n"+
 "      <a name=\""+"token_"+Integer.toString(k)+"\">\n"+
-"        <input type=\"button\" value=\"Delete\" alt=\""+"Delete access token #"+Integer.toString(k)+"\" onClick='Javascript:SpecOp(\""+accessOpName+"\",\"Delete\",\"token_"+Integer.toString(k)+"\")'/>\n"+
+"        <input type=\"button\" value=\"" + Messages.getString("FilenetConnector.Delete") + "\" alt=\""+"Delete access token #"+Integer.toString(k)+"\" onClick='Javascript:SpecOp(\""+accessOpName+"\",\"Delete\",\"token_"+Integer.toString(k)+"\")'/>\n"+
 "      </a>\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
@@ -2512,7 +2515,7 @@ public class FilenetConnector extends or
       {
         out.print(
 "  <tr>\n"+
-"    <td class=\"message\" colspan=\"2\">No access tokens present</td>\n"+
+"    <td class=\"message\" colspan=\"2\">" + Messages.getString("FilenetConnector.NoAccessTokensPresent") + "</td>\n"+
 "  </tr>\n"
         );
       }
@@ -2523,7 +2526,7 @@ public class FilenetConnector extends or
 "      <input type=\"hidden\" name=\"tokencount\" value=\""+Integer.toString(k)+"\"/>\n"+
 "      <input type=\"hidden\" name=\"accessop\" value=\"\"/>\n"+
 "      <a name=\""+"token_"+Integer.toString(k)+"\">\n"+
-"        <input type=\"button\" value=\"Add\" alt=\"Add access token\" onClick='Javascript:SpecAddToken(\"token_"+Integer.toString(k+1)+"\")'/>\n"+
+"        <input type=\"button\" value=\"" + Messages.getString("FilenetConnector.Add") + "\" alt=\"Add access token\" onClick='Javascript:SpecAddToken(\"token_"+Integer.toString(k+1)+"\")'/>\n"+
 "      </a>\n"+
 "    </td>\n"+
 "    <td class=\"value\">\n"+
@@ -2867,13 +2870,13 @@ public class FilenetConnector extends or
     if (sortedDocumentClasses.length == 0)
     {
       out.print(
-"    <td class=\"message\" colspan=\"2\"><nobr>No included document classes</nobr></td>\n"
+"    <td class=\"message\" colspan=\"2\"><nobr>" + Messages.getString("FilenetConnector.NoIncludedDocumentClasses") + "</nobr></td>\n"
       );
     }
     else
     {
       out.print(
-"    <td class=\"description\"><nobr>Included document classes:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.IncludedDocumentClasses") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <table class=\"displaytable\">\n"
       );
@@ -2887,7 +2890,7 @@ public class FilenetConnector extends or
 "          <td class=\"boxcell\">\n"+
 "            <table class=\"displaytable\">\n"+
 "              <tr>\n"+
-"                <td class=\"description\"><nobr>Metadata:</nobr></td>\n"+
+"                <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.Metadata") + "</nobr></td>\n"+
 "                <td class=\"value\">\n"
         );
         org.apache.manifoldcf.crawler.connectors.filenet.DocClassSpec fieldValues = (org.apache.manifoldcf.crawler.connectors.filenet.DocClassSpec)documentClasses.get(docclass);
@@ -2914,7 +2917,7 @@ public class FilenetConnector extends or
 "                </td>\n"+
 "              </tr>\n"+
 "              <tr>\n"+
-"                <td class=\"description\"><nobr>Documents matching:</nobr></td>\n"+
+"                <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.DocumentsMatching") + "</nobr></td>\n"+
 "                <td class=\"value\">\n"
         );
         int matchCount = fieldValues.getMatchCount();
@@ -2980,7 +2983,7 @@ public class FilenetConnector extends or
       }
       java.util.Arrays.sort(sortedMimeTypes);
       out.print(
-"    <td class=\"description\"><nobr>Included mime types:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.IncludedMimeTypes") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"
       );
       i = 0;
@@ -2998,7 +3001,7 @@ public class FilenetConnector extends or
     else
     {
       out.print(
-"    <td class=\"message\" colspan=\"2\"><nobr>No included mime types - ALL will be ingested</nobr></td>\n"
+"    <td class=\"message\" colspan=\"2\"><nobr>" + Messages.getString("FilenetConnector.NoIncludedMimeTypes") + "</nobr></td>\n"
       );
     }
     out.print(
@@ -3020,7 +3023,7 @@ public class FilenetConnector extends or
         }
         out.print(
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Folders:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.Folders2") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(spn.getAttributeValue(SPEC_ATTRIBUTE_VALUE))+"</nobr>\n"+
 "    </td>\n"+
@@ -3031,7 +3034,7 @@ public class FilenetConnector extends or
     if (seenAny == false)
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\">All folders specified</td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\">" + Messages.getString("FilenetConnector.AllFoldersSpecified") + "</td></tr>\n"
       );
     }
     out.print(
@@ -3056,7 +3059,7 @@ public class FilenetConnector extends or
     }
     out.print(
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Security:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.Security2") + "</nobr></td>\n"+
 "    <td class=\"value\">"+(securityOn?"Enabled":"Disabled")+"</td>\n"+
 "  </tr>\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"
@@ -3073,7 +3076,7 @@ public class FilenetConnector extends or
         {
           out.print(
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Access tokens:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("FilenetConnector.AccessTokens") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"
           );
           seenAny = true;
@@ -3095,7 +3098,7 @@ public class FilenetConnector extends or
     else
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\">No access tokens specified</td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\">" + Messages.getString("FilenetConnector.NoAccessTokensSpecified") + "</td></tr>\n"
       );
     }
     out.print(