incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1222373 [2/7] - in /incubator/lcf/branches/CONNECTORS-335: connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ connectors/cmis/connector/src/main/java/org/apache/manifoldcf/craw...
Date Thu, 22 Dec 2011 17:51:32 GMT
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1222373&r1=1222372&r2=1222373&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
Thu Dec 22 17:51:31 2011
@@ -42,6 +42,7 @@ import jcifs.smb.SmbFileFilter;
 
 import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
 import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.core.interfaces.IThreadContext;
 import org.apache.manifoldcf.core.interfaces.IHTTPOutput;
 import org.apache.manifoldcf.core.interfaces.IPostParameters;
@@ -1294,6 +1295,7 @@ public class SharedDriveConnector extend
   /** Check status of connection.
   */
   @Override
+
   public String check()
     throws ManifoldCFException
   {
@@ -2482,6 +2484,7 @@ public class SharedDriveConnector extend
         throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
       }
       catch (IOException e)
+
       {
         throw new ManifoldCFException("Could not get a canonical path: "+e.getMessage(),e);
       }
@@ -2715,12 +2718,12 @@ public class SharedDriveConnector extend
   public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Paths");
-    tabsArray.add("Security");
-    tabsArray.add("Metadata");
-    tabsArray.add("Content Length");
-    tabsArray.add("File Mapping");
-    tabsArray.add("URL Mapping");
+    tabsArray.add(Messages.getString("SharedDriveConnector.Paths"));
+    tabsArray.add(Messages.getString("SharedDriveConnector.Security"));
+    tabsArray.add(Messages.getString("SharedDriveConnector.Metadata"));
+    tabsArray.add(Messages.getString("SharedDriveConnector.ContentLength"));
+    tabsArray.add(Messages.getString("SharedDriveConnector.FileMapping"));
+    tabsArray.add(Messages.getString("SharedDriveConnector.URLMapping"));
     out.print(
 "<script type=\"text/javascript\">\n"+
 "//<!--\n"+
@@ -2875,7 +2878,7 @@ public class SharedDriveConnector extend
     if (maxLength == null)
       maxLength = "";
 
-    if (tabName.equals("Content Length"))
+    if (tabName.equals(Messages.getString("SharedDriveConnector.ContentLength")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2895,7 +2898,7 @@ public class SharedDriveConnector extend
     }
 
     // Check for Paths tab
-    if (tabName.equals("Paths"))
+    if (tabName.equals(Messages.getString("SharedDriveConnector.Paths")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -3196,7 +3199,7 @@ public class SharedDriveConnector extend
       }
     }
 
-    if (tabName.equals("Security"))
+    if (tabName.equals(Messages.getString("SharedDriveConnector.Security")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -3332,7 +3335,7 @@ public class SharedDriveConnector extend
       }
     }
 
-    if (tabName.equals("Metadata"))
+    if (tabName.equals(Messages.getString("SharedDriveConnector.Metadata")))
     {
       out.print(
 "<input type=\"hidden\" name=\"specmappingcount\" value=\""+Integer.toString(matchMap.getMatchCount())+"\"/>\n"+
@@ -3435,7 +3438,7 @@ public class SharedDriveConnector extend
       }
     }
 
-    if (tabName.equals("File Mapping"))
+    if (tabName.equals(Messages.getString("SharedDriveConnector.FileMapping")))
     {
       out.print(
 "<input type=\"hidden\" name=\"specfmapcount\" value=\""+Integer.toString(fileMap.getMatchCount())+"\"/>\n"+
@@ -3503,7 +3506,7 @@ public class SharedDriveConnector extend
       }
     }
 	
-    if (tabName.equals("URL Mapping"))
+    if (tabName.equals(Messages.getString("SharedDriveConnector.URLMapping")))
     {
       out.print(
 "<input type=\"hidden\" name=\"specumapcount\" value=\""+Integer.toString(uriMap.getMatchCount())+"\"/>\n"+

Modified: incubator/lcf/branches/CONNECTORS-335/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1222373&r1=1222372&r2=1222373&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
Thu Dec 22 17:51:31 2011
@@ -18,6 +18,7 @@
 */
 package org.apache.manifoldcf.crawler.connectors.jdbc;
 
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.interfaces.*;
@@ -654,9 +655,9 @@ public class JDBCConnector extends org.a
   public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Database Type");
-    tabsArray.add("Server");
-    tabsArray.add("Credentials");
+    tabsArray.add(Messages.getString("JDBCConnector.DatabaseType"));
+    tabsArray.add(Messages.getString("JDBCConnector.Server"));
+    tabsArray.add(Messages.getString("JDBCConnector.Credentials"));
 
     out.print(
 "<script type=\"text/javascript\">\n"+
@@ -666,21 +667,21 @@ public class JDBCConnector extends org.a
 "  if (editconnection.databasehost.value == \"\")\n"+
 "  {\n"+
 "    alert(\"Please fill in a database server name\");\n"+
-"    SelectTab(\"Server\");\n"+
+"    SelectTab(\"" + Messages.getString("JDBCConnector.Server") + "\");\n"+
 "    editconnection.databasehost.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.databasename.value == \"\")\n"+
 "  {\n"+
 "    alert(\"Please fill in the name of the database\");\n"+
-"    SelectTab(\"Server\");\n"+
+"    SelectTab(\"" + Messages.getString("JDBCConnector.Server") + "\");\n"+
 "    editconnection.databasename.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.username.value == \"\")\n"+
 "  {\n"+
 "    alert(\"Please supply the database username for this connection\");\n"+
-"    SelectTab(\"Credentials\");\n"+
+"    SelectTab(\"" + Messages.getString("JDBCConnector.Credentials") + "\");\n"+
 "    editconnection.username.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -722,13 +723,13 @@ public class JDBCConnector extends org.a
       databasePassword = "";
 
     // "Database Type" tab
-    if (tabName.equals("Database Type"))
+    if (tabName.equals(Messages.getString("JDBCConnector.DatabaseType")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Database type:</nobr></td><td
class=\"value\">\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("JDBCConnector.DatabaseType2")
+ "</nobr></td><td class=\"value\">\n"+
 "      <select multiple=\"false\" name=\"databasetype\" size=\"2\">\n"+
 "        <option value=\"oracle:thin:@\" "+(jdbcProvider.equals("oracle:thin:@")?"selected=\"selected\"":"")+">Oracle</option>\n"+
 "        <option value=\"postgresql:\" "+(jdbcProvider.equals("postgresql:")?"selected=\"selected\"":"")+">Postgres
SQL</option>\n"+
@@ -749,16 +750,16 @@ public class JDBCConnector extends org.a
     }
 
     // "Server" tab
-    if (tabName.equals("Server"))
+    if (tabName.equals(Messages.getString("JDBCConnector.Server")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Database host and port:</nobr></td><td
class=\"value\"><input type=\"text\" size=\"64\" name=\"databasehost\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(host)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("JDBCConnector.DatabaseHostAndPort")
+ "</nobr></td><td class=\"value\"><input type=\"text\" size=\"64\" name=\"databasehost\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(host)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Database service name or instance/database:</nobr></td><td
class=\"value\"><input type=\"text\" size=\"32\" name=\"databasename\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(databaseName)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("JDBCConnector.DatabaseServiceNameOrInstanceDatabase")
+ "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"databasename\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(databaseName)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -772,16 +773,16 @@ public class JDBCConnector extends org.a
     }
 
     // "Credentials" tab
-    if (tabName.equals("Credentials"))
+    if (tabName.equals(Messages.getString("JDBCConnector.Credentials")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>User name:</nobr></td><td
class=\"value\"><input type=\"text\" size=\"32\" name=\"username\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(databaseUser)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("JDBCConnector.UserName")
+ "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"username\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(databaseUser)+"\"/></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(databasePassword)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("JDBCConnector.Password")
+ "</nobr></td><td class=\"value\"><input type=\"password\" size=\"32\"
name=\"password\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(databasePassword)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -845,7 +846,7 @@ public class JDBCConnector extends org.a
     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("JDBCConnector.Parameters")
+ "</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"3\">\n"
     );
     Iterator iter = parameters.listParameters();
@@ -891,8 +892,8 @@ public class JDBCConnector extends org.a
   public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Queries");
-    tabsArray.add("Security");
+    tabsArray.add(Messages.getString("JDBCConnector.Queries"));
+    tabsArray.add(Messages.getString("JDBCConnector.Security"));
 
     out.print(
 "<script type=\"text/javascript\">\n"+
@@ -908,7 +909,7 @@ public class JDBCConnector extends org.a
 "{\n"+
 "  if (editjob.spectoken.value == \"\")\n"+
 "  {\n"+
-"    alert(\"Type in an access token\");\n"+
+"    alert(\"" + Messages.getString("JDBCConnector.TypeInAnAccessToken") + "\");\n"+
 "    editjob.spectoken.focus();\n"+
 "    return;\n"+
 "  }\n"+
@@ -1031,21 +1032,21 @@ public class JDBCConnector extends org.a
 
     // The Queries tab
 
-    if (tabName.equals("Queries"))
+    if (tabName.equals(Messages.getString("JDBCConnector.Queries")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Seeding query:</nobr><br/><nobr>(return
ids that need to be checked)</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("JDBCConnector.SeedingQuery")
+ "</nobr><br/><nobr>" + Messages.getString("JDBCConnector.returnIdsThatNeedToBeChecked")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><textarea name=\"idquery\" cols=\"64\" rows=\"6\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idQuery)+"</textarea></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Version check query:</nobr><br/><nobr>(return
ids and versions for a set of documents;</nobr><br/><nobr>leave blank if
no versioning capability)</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("JDBCConnector.VersionCheckQuery")
+ "</nobr><br/><nobr>" + Messages.getString("JDBCConnector.returnIdsAndVersionsForASetOfDocuments")
+ "</nobr><br/><nobr>" + Messages.getString("JDBCConnector.leaveBlankIfNoVersioningCapability")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><textarea name=\"versionquery\" cols=\"64\" rows=\"6\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(versionQuery)+"</textarea></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Data query:</nobr><br/><nobr>(return
ids, urls, and data for a set of documents)</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("JDBCConnector.DataQuery")
+ "</nobr><br/><nobr>" + Messages.getString("JDBCConnector.returnIdsUrlsAndDataForASetOfDocuments")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><textarea name=\"dataquery\" cols=\"64\" rows=\"6\">"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(dataQuery)+"</textarea></td>\n"+
 "  </tr>\n"+
 "</table>\n"
@@ -1064,7 +1065,7 @@ public class JDBCConnector extends org.a
     // There is no native security, so all we care about are the tokens.
     i = 0;
 
-    if (tabName.equals("Security"))
+    if (tabName.equals(Messages.getString("JDBCConnector.Security")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -1102,7 +1103,7 @@ public class JDBCConnector extends org.a
       {
         out.print(
 "  <tr>\n"+
-"    <td class=\"message\" colspan=\"2\">No access tokens present</td>\n"+
+"    <td class=\"message\" colspan=\"2\">" + Messages.getString("JDBCConnector.NoAccessTokensPresent")
+ "</td>\n"+
 "  </tr>\n"
         );
       }
@@ -1342,7 +1343,7 @@ public class JDBCConnector extends org.a
     else
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\"><nobr>No access tokens specified</nobr></td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\"><nobr>" + Messages.getString("JDBCConnector.NoAccessTokensSpecified")
+ "</nobr></td></tr>\n"
       );
     }
 

Modified: incubator/lcf/branches/CONNECTORS-335/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1222373&r1=1222372&r2=1222373&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
Thu Dec 22 17:51:31 2011
@@ -18,6 +18,7 @@
 */
 package org.apache.manifoldcf.crawler.connectors.livelink;
 
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.interfaces.*;
@@ -1422,9 +1423,9 @@ public class LivelinkConnector extends o
   public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Server");
-    tabsArray.add("Document Access");
-    tabsArray.add("Document View");
+    tabsArray.add(LivelinkConnector.Server);
+    tabsArray.add(Messages.getString("LivelinkConnector.DocumentAccess"));
+    tabsArray.add(Messages.getString("LivelinkConnector.DocumentView"));
     out.print(
 "<script type=\"text/javascript\">\n"+
 "<!--\n"+
@@ -1477,35 +1478,35 @@ public class LivelinkConnector extends o
 "  if (editconnection.servername.value == \"\")\n"+
 "  {\n"+
 "    alert(\"Enter a livelink server name\");\n"+
-"    SelectTab(\"Server\");\n"+
+"    SelectTab(\"" + LivelinkConnector.Server + "\");\n"+
 "    editconnection.servername.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.serverport.value == \"\")\n"+
 "  {\n"+
 "    alert(\"A server port number is required\");\n"+
-"    SelectTab(\"Server\");\n"+
+"    SelectTab(\"" + LivelinkConnector.Server + "\");\n"+
 "    editconnection.serverport.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.ingestcgipath.value == \"\")\n"+
 "  {\n"+
 "    alert(\"Enter the crawl cgi path to livelink\");\n"+
-"    SelectTab(\"Document Access\");\n"+
+"    SelectTab(\"" + Messages.getString("LivelinkConnector.DocumentAccess") + "\");\n"+
 "    editconnection.ingestcgipath.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.ingestcgipath.value.substring(0,1) != \"/\")\n"+
 "  {\n"+
 "    alert(\"The ingest cgi path must begin with a / character\");\n"+
-"    SelectTab(\"Document Access\");\n"+
+"    SelectTab(\"" + Messages.getString("LivelinkConnector.DocumentAccess") + "\");\n"+
 "    editconnection.ingestcgipath.focus();\n"+
 "    return false;\n"+
 "  }\n"+
 "  if (editconnection.viewcgipath.value != \"\" && editconnection.viewcgipath.value.substring(0,1)
!= \"/\")\n"+
 "  {\n"+
 "    alert(\"The view cgi path must be blank, or begin with a / character\");\n"+
-"    SelectTab(\"Document View\");\n"+
+"    SelectTab(\"" + Messages.getString("LivelinkConnector.DocumentView") + "\");\n"+
 "    editconnection.viewcgipath.focus();\n"+
 "    return false;\n"+
 "  }\n"+
@@ -1582,7 +1583,7 @@ public class LivelinkConnector extends o
 "<input name=\"configop\" type=\"hidden\" value=\"Continue\"/>\n"
     );
     // The "Server" tab
-    if (tabName.equals("Server"))
+    if (tabName.equals(LivelinkConnector.Server))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -1625,7 +1626,7 @@ public class LivelinkConnector extends o
 "<input type=\"hidden\" name=\"keystoredata\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(livelinkKeystore)+"\"/>\n"
       );
     }
-    if (tabName.equals("Document Access"))
+    if (tabName.equals(Messages.getString("LivelinkConnector.DocumentAccess")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -1720,7 +1721,7 @@ public class LivelinkConnector extends o
   }
 
     // Document View tab
-    if (tabName.equals("Document View"))
+    if (tabName.equals(Messages.getString("LivelinkConnector.DocumentView")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -1939,10 +1940,10 @@ public class LivelinkConnector extends o
   public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Paths");
-    tabsArray.add("Filters");
-    tabsArray.add("Security");
-    tabsArray.add("Metadata");
+    tabsArray.add(Messages.getString("LivelinkConnector.Paths"));
+    tabsArray.add(Messages.getString("LivelinkConnector.Filters"));
+    tabsArray.add(Messages.getString("LivelinkConnector.Security"));
+    tabsArray.add(Messages.getString("LivelinkConnector.Metadata"));
     out.print(
 "<script type=\"text/javascript\">\n"+
 "<!--\n"+
@@ -2074,7 +2075,7 @@ public class LivelinkConnector extends o
     int k;
 
     // Paths tab
-    if (tabName.equals("Paths"))
+    if (tabName.equals(Messages.getString("LivelinkConnector.Paths")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2214,7 +2215,7 @@ public class LivelinkConnector extends o
     }
 
     // Filter tab
-    if (tabName.equals("Filters"))
+    if (tabName.equals(Messages.getString("LivelinkConnector.Filters")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2322,7 +2323,7 @@ public class LivelinkConnector extends o
       }
     }
 
-    if (tabName.equals("Security"))
+    if (tabName.equals(Messages.getString("LivelinkConnector.Security")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2368,7 +2369,7 @@ public class LivelinkConnector extends o
       {
         out.print(
 "  <tr>\n"+
-"    <td class=\"message\" colspan=\"2\">No access tokens present</td>\n"+
+"    <td class=\"message\" colspan=\"2\">" + Messages.getString("LivelinkConnector.NoAccessTokensPresent")
+ "</td>\n"+
 "  </tr>\n"
         );
       }
@@ -2458,7 +2459,7 @@ public class LivelinkConnector extends o
       }
     }
 
-    if (tabName.equals("Metadata"))
+    if (tabName.equals(Messages.getString("LivelinkConnector.Metadata")))
     {
       out.print(
 "<input type=\"hidden\" name=\"specmappingcount\" value=\""+Integer.toString(matchMap.getMatchCount())+"\"/>\n"+
@@ -3419,7 +3420,7 @@ public class LivelinkConnector extends o
     else
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\">No access tokens specified</td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\">" + Messages.getString("LivelinkConnector.NoAccessTokensSpecified")
+ "</td></tr>\n"
       );
     }
     out.print(

Modified: incubator/lcf/branches/CONNECTORS-335/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java?rev=1222373&r1=1222372&r2=1222373&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
Thu Dec 22 17:51:31 2011
@@ -22,6 +22,7 @@ import com.meridio.www.MeridioDMWS.DmLog
 import com.meridio.www.MeridioDMWS.DmPermission;
 import com.meridio.www.MeridioDMWS.DmSearchScope;
 import com.meridio.www.MeridioDMWS.DmVersionInfo;
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.connectors.meridio.meridiowrapper.DMSearchResults;
@@ -192,6 +193,7 @@ public class MeridioConnector extends or
           params.getParameter("RMWSProxyHost"),
           params.getParameter("RMWSProxyPort"),
           null,
+
           null,
           params.getParameter("UserName"),
           params.getObfuscatedParameter("Password"),
@@ -2506,6 +2508,7 @@ public class MeridioConnector extends or
 "        </input>\n"+
 "      </nobr>\n"+
 "      <br/>\n"
+
         );
       }
       out.print(
@@ -2704,7 +2707,7 @@ public class MeridioConnector extends or
       {
         out.print(
 "  <tr>\n"+
-"    <td class=\"message\" colspan=\"2\">No access tokens present</td>\n"+
+"    <td class=\"message\" colspan=\"2\">" + Messages.getString("MeridioConnector.NoAccessTokensPresent")
+ "</td>\n"+
 "  </tr>\n"
         );
       }
@@ -3515,7 +3518,7 @@ public class MeridioConnector 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("MeridioConnector.NoAccessTokensSpecified")
+ "</td></tr>\n"
       );
     }
     out.print(
@@ -4264,9 +4267,11 @@ public class MeridioConnector extends or
             {
               HashMap categoryMatchMap = (HashMap)customMap.get(new Long(categoryMatch));
               if (categoryMatchMap != null)
+
               {
                 columnName = (String)categoryMatchMap.get(returnMetadata[i].getPropertyName());
               }
+
             }
 
             if (columnName != null)

Modified: incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java?rev=1222373&r1=1222372&r2=1222373&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
Thu Dec 22 17:51:31 2011
@@ -29,6 +29,7 @@ import java.util.TreeMap;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.agents.interfaces.IOutputAddActivity;
 import org.apache.manifoldcf.agents.interfaces.IOutputNotifyActivity;
 import org.apache.manifoldcf.agents.interfaces.IOutputRemoveActivity;
@@ -50,15 +51,15 @@ import org.json.JSONObject;
 
 public class OpenSearchServerConnector extends BaseOutputConnector {
 
-  private final static String OPENSEARCHSERVER_INDEXATION_ACTIVITY = "Indexation";
+  private final static String OPENSEARCHSERVER_INDEXATION_ACTIVITY = "Optimize";
   private final static String OPENSEARCHSERVER_DELETION_ACTIVITY = "Deletion";
-  private final static String OPENSEARCHSERVER_OPTIMIZE_ACTIVITY = "Optimize";
+  private final static String OPENSEARCHSERVER_OPTIMIZE_ACTIVITY = "Indexation";
 
   private final static String[] OPENSEARCHSERVER_ACTIVITIES = {
       OPENSEARCHSERVER_INDEXATION_ACTIVITY, OPENSEARCHSERVER_DELETION_ACTIVITY,
       OPENSEARCHSERVER_OPTIMIZE_ACTIVITY };
 
-  private final static String OPENSEARCHSERVER_TAB_PARAMETER = "Parameters";
+  private final static String OPENSEARCHSERVER_TAB_PARAMETER = Messages.getString("OpenSearchServerConnector.Parameters");
   private final static String OPENSEARCHSERVER_TAB_OPENSEARCHSERVER = "OpenSearchServer";
 
   private String specsCacheOutpuDescription;
@@ -112,7 +113,7 @@ public class OpenSearchServerConnector e
       throws ManifoldCFException, IOException {
     super.outputConfigurationHeader(threadContext, out, parameters, tabsArray);
     tabsArray.add(OPENSEARCHSERVER_TAB_PARAMETER);
-    outputResource("configuration.js", out, null);
+    outputResource(Messages.getString("OpenSearchServerConnector.configurationJs"), out,
null);
   }
 
   @Override
@@ -121,7 +122,7 @@ public class OpenSearchServerConnector e
       throws ManifoldCFException, IOException {
     super.outputConfigurationBody(threadContext, out, parameters, tabName);
     if (OPENSEARCHSERVER_TAB_PARAMETER.equals(tabName)) {
-      outputResource("configuration.html", out, getConfigParameters(parameters));
+      outputResource(Messages.getString("OpenSearchServerConnector.configurationHtml"), out,
getConfigParameters(parameters));
     }
   }
 
@@ -150,7 +151,7 @@ public class OpenSearchServerConnector e
       String tabName) throws ManifoldCFException, IOException {
     super.outputSpecificationBody(out, os, tabName);
     if (OPENSEARCHSERVER_TAB_OPENSEARCHSERVER.equals(tabName)) {
-      outputResource("specifications.html", out, getSpecParameters(os));
+      outputResource(Messages.getString("OpenSearchServerConnector.specificationsHtml"),
out, getSpecParameters(os));
     }
   }
 
@@ -240,13 +241,13 @@ public class OpenSearchServerConnector e
   @Override
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out,
       ConfigParams parameters) throws ManifoldCFException, IOException {
-    outputResource("view.html", out, getConfigParameters(parameters));
+    outputResource(Messages.getString("OpenSearchServerConnector.viewHtml"), out, getConfigParameters(parameters));
   }
 
   @Override
   public void viewSpecification(IHTTPOutput out, OutputSpecification os)
       throws ManifoldCFException, IOException {
-    outputResource("viewSpec.html", out, getSpecParameters(os));
+    outputResource(Messages.getString("OpenSearchServerConnector.viewSpecHtml"), out, getSpecParameters(os));
   }
 
   @Override

Modified: incubator/lcf/branches/CONNECTORS-335/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java?rev=1222373&r1=1222372&r2=1222373&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
(original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
Thu Dec 22 17:51:31 2011
@@ -18,6 +18,7 @@
 */
 package org.apache.manifoldcf.crawler.connectors.rss;
 
+import org.apache.manifoldcf.core.i18n.*;
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.interfaces.*;
@@ -1312,6 +1313,8 @@ public class RSSConnector extends org.ap
         if (Logging.connectors.isDebugEnabled())
           Logging.connectors.debug("RSS: Interpreting '"+urlValue+"' as a document");
 
+
+
         if (isDataIngestable(activities,urlValue))
         {
           // Treat it as an ingestable document.
@@ -1525,6 +1528,7 @@ public class RSSConnector extends org.ap
     {
       String version = versions[i];
       if (version != null)
+
       {
         String urlValue = documentIdentifiers[i];
         cache.deleteData(urlValue);
@@ -1553,10 +1557,10 @@ public class RSSConnector extends org.ap
   public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams
parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Email");
-    tabsArray.add("Robots");
-    tabsArray.add("Bandwidth");
-    tabsArray.add("Proxy");
+    tabsArray.add(Messages.getString("RSSConnector.Email"));
+    tabsArray.add(Messages.getString("RSSConnector.Robots"));
+    tabsArray.add(Messages.getString("RSSConnector.Bandwidth"));
+    tabsArray.add(Messages.getString("RSSConnector.Proxy"));
     out.print(
 "<script type=\"text/javascript\">\n"+
 "<!--\n"+
@@ -1654,13 +1658,13 @@ public class RSSConnector extends org.ap
       proxyAuthPassword = "";
       
     // Email tab
-    if (tabName.equals("Email"))
+    if (tabName.equals(Messages.getString("RSSConnector.Email")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Email address to contact:</nobr></td><td
class=\"value\"><input type=\"text\" size=\"32\" name=\"email\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(email)+"\"/></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.EmailAddressToContact")
+ "</nobr></td><td class=\"value\"><input type=\"text\" size=\"32\" name=\"email\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(email)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
       );
@@ -1673,18 +1677,18 @@ public class RSSConnector extends org.ap
     }
 
     // Robots tab
-    if (tabName.equals("Robots"))
+    if (tabName.equals(Messages.getString("RSSConnector.Robots")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Robots.txt usage:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.RobotsTxtUsage")
+ "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <select name=\"robotsusage\" size=\"3\">\n"+
-"        <option value=\"none\" "+(robotsUsage.equals("none")?"selected=\"selected\"":"")+">Don't
look at robots.txt</option>\n"+
-"        <option value=\"data\" "+(robotsUsage.equals("data")?"selected=\"selected\"":"")+">Obey
robots.txt for data fetches only</option>\n"+
-"        <option value=\"all\" "+(robotsUsage.equals("all")?"selected=\"selected\"":"")+">Obey
robots.txt for all fetches</option>\n"+
+"        <option value=\"none\" "+(robotsUsage.equals("none")?"selected=\"selected\"":"")+">"
+ Messages.getString("RSSConnector.DontLookAtRobotsTxt") + "</option>\n"+
+"        <option value=\"data\" "+(robotsUsage.equals("data")?"selected=\"selected\"":"")+">"
+ Messages.getString("RSSConnector.ObeyRobotsTxtForDataFetchesOnly") + "</option>\n"+
+"        <option value=\"all\" "+(robotsUsage.equals("all")?"selected=\"selected\"":"")+">"
+ Messages.getString("RSSConnector.ObeyRobotsTxtForAllFetches") + "</option>\n"+
 "      </select>\n"+
 "    </td>\n"+
 "  </tr>\n"+
@@ -1699,25 +1703,25 @@ public class RSSConnector extends org.ap
     }
 
     // Bandwidth tab
-    if (tabName.equals("Bandwidth"))
+    if (tabName.equals(Messages.getString("RSSConnector.Bandwidth")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Max KBytes per second per server:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.MaxKBytesPerSecondPerServer")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"6\" name=\"bandwidth\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(bandwidth)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Max connections per server:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.MaxConnectionsPerServer")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"4\" name=\"connections\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connections)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Max fetches per minute per server:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.MaxFetchesPerMinutePerServer")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"4\" name=\"fetches\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(fetches)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Throttle group name:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.ThrottleGroupName")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"32\" name=\"throttlegroup\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(throttleGroup)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
@@ -1734,29 +1738,29 @@ public class RSSConnector extends org.ap
     }
     
     // Proxy tab
-    if (tabName.equals("Proxy"))
+    if (tabName.equals(Messages.getString("RSSConnector.Proxy")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Proxy host:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.ProxyHost")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"40\" name=\"proxyhost\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(proxyHost)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Proxy port:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.ProxyPort")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"5\" name=\"proxyport\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(proxyPort)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Proxy authentication domain:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.ProxyAuthenticationDomain")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"32\" name=\"proxyauthdomain\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(proxyAuthDomain)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Proxy authentication user name:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.ProxyAuthenticationUserName")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"text\" size=\"32\" name=\"proxyauthusername\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(proxyAuthUsername)+"\"/></td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Proxy authentication password:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getString("RSSConnector.ProxyAuthenticationPassword")
+ "</nobr></td>\n"+
 "    <td class=\"value\"><input type=\"password\" size=\"16\" name=\"proxyauthpassword\"
value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(proxyAuthPassword)+"\"/></td>\n"+
 "  </tr>\n"+
 "</table>\n"
@@ -1838,7 +1842,7 @@ public class RSSConnector extends org.ap
     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("RSSConnector.Parameters")
+ "</nobr></td>\n"+
 "    <td class=\"value\" colspan=\"3\">\n"
     );
     Iterator iter = parameters.listParameters();
@@ -1884,13 +1888,13 @@ public class RSSConnector extends org.ap
   public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String>
tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("URLs");
-    tabsArray.add("Canonicalization");
-    tabsArray.add("URL Mappings");
-    tabsArray.add("Time Values");
-    tabsArray.add("Security");
-    tabsArray.add("Metadata");
-    tabsArray.add("Dechromed Content");
+    tabsArray.add(Messages.getString("RSSConnector.URLs"));
+    tabsArray.add(Messages.getString("RSSConnector.Canonicalization"));
+    tabsArray.add(Messages.getString("RSSConnector.URLMappings"));
+    tabsArray.add(Messages.getString("RSSConnector.TimeValues"));
+    tabsArray.add(Messages.getString("RSSConnector.Security"));
+    tabsArray.add(Messages.getString("RSSConnector.Metadata"));
+    tabsArray.add(Messages.getString("RSSConnector.DechromedContent"));
     out.print(
 "<script type=\"text/javascript\">\n"+
 "<!--\n"+
@@ -2066,7 +2070,7 @@ public class RSSConnector extends org.ap
 
     // URLs tab
 
-    if (tabName.equals("URLs"))
+    if (tabName.equals(Messages.getString("RSSConnector.URLs")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2087,7 +2091,7 @@ public class RSSConnector extends org.ap
     }
 
     // Canonicalization tab
-    if (tabName.equals("Canonicalization"))
+    if (tabName.equals(Messages.getString("RSSConnector.Canonicalization")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2242,7 +2246,7 @@ public class RSSConnector extends org.ap
   
     // Mappings tab
 
-    if (tabName.equals("URL Mappings"))
+    if (tabName.equals(Messages.getString("RSSConnector.URLMappings")))
     {
       out.print(
 "<input type=\"hidden\" name=\"rssop\" value=\"\"/>\n"+
@@ -2319,7 +2323,7 @@ public class RSSConnector extends org.ap
     }
 
     // Timeout Value tab
-    if (tabName.equals("Time Values"))
+    if (tabName.equals(Messages.getString("RSSConnector.TimeValues")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2370,7 +2374,7 @@ public class RSSConnector extends org.ap
       else if (sn.getType().equals("chromedmode"))
         chromedMode = sn.getAttributeValue("mode");
     }
-    if (tabName.equals("Dechromed Content"))
+    if (tabName.equals(Messages.getString("RSSConnector.DechromedContent")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2408,7 +2412,7 @@ public class RSSConnector extends org.ap
     // There is no native security, so all we care about are the tokens.
     i = 0;
 
-    if (tabName.equals("Security"))
+    if (tabName.equals(Messages.getString("RSSConnector.Security")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -2446,7 +2450,7 @@ public class RSSConnector extends org.ap
       {
         out.print(
 "  <tr>\n"+
-"    <td class=\"message\" colspan=\"2\">No access tokens present</td>\n"+
+"    <td class=\"message\" colspan=\"2\">" + Messages.getString("RSSConnector.NoAccessTokensPresent")
+ "</td>\n"+
 "  </tr>\n"
         );
       }
@@ -2491,7 +2495,7 @@ public class RSSConnector extends org.ap
     }
 
     // "Metadata" tab
-    if (tabName.equals("Metadata"))
+    if (tabName.equals(Messages.getString("RSSConnector.Metadata")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
@@ -3243,6 +3247,7 @@ public class RSSConnector extends org.ap
 "  <tr>\n"+
 "    <td class=\"description\"><nobr>Bad feed rescan interval (minutes):</nobr></td>\n"+
 "    <td class=\"value\">"+((badFeedRefetchValue==null)?"(Default feed rescan value)":org.apache.manifoldcf.ui.util.Encoder.bodyEscape(badFeedRefetchValue))+"</td>\n"+
+
 "  </tr>\n"+
 "      \n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
@@ -3291,7 +3296,7 @@ public class RSSConnector extends org.ap
     else
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\"><nobr>No access tokens specified</nobr></td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\"><nobr>" + Messages.getString("RSSConnector.NoAccessTokensSpecified")
+ "</nobr></td></tr>\n"
       );
     }
     out.print(
@@ -3308,7 +3313,7 @@ public class RSSConnector extends org.ap
         if (seenAny == false)
         {
           out.print(
-"  <tr><td class=\"description\"><nobr>Metadata:</nobr></td>\n"+
+"  <tr><td class=\"description\"><nobr>" + Messages.getString("RSSConnector.Metadata")
+ "</nobr></td>\n"+
 "    <td class=\"value\">\n"
           );
           seenAny = true;
@@ -3331,7 +3336,7 @@ public class RSSConnector extends org.ap
     else
     {
       out.print(
-"  <tr><td class=\"message\" colspan=\"2\"><nobr>No metadata specified</nobr></td></tr>\n"
+"  <tr><td class=\"message\" colspan=\"2\"><nobr>" + Messages.getString("RSSConnector.NoMetadataSpecified")
+ "</nobr></td></tr>\n"
       );
     }
     out.print(
@@ -5277,6 +5282,7 @@ public class RSSConnector extends org.ap
         if (milTzMap.get(timezone) != null)
           timezone = (String)milTzMap.get(timezone);
       }
+
     }
     else
       timezone = "GMT";



Mime
View raw message