You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by ri...@apache.org on 2012/04/17 16:28:14 UTC
svn commit: r1327112 - in /incubator/lcf/trunk: ./
connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/
connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/
connectors/filenet/c...
Author: ridder
Date: Tue Apr 17 14:28:14 2012
New Revision: 1327112
URL: http://svn.apache.org/viewvc?rev=1327112&view=rev
Log:
CONNECTORS-435: Replace incorrect Messages.getString() calls in the main UI with correct ones.
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java
incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1327112&r1=1327111&r2=1327112&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Tue Apr 17 14:28:14 2012
@@ -3,6 +3,10 @@ $Id$
======================= 0.6-dev =====================
+CONNECTORS-435: Replace incorrect Messages.getString() calls in the main
+UI with correct ones.
+(Erlend Garåsen, Karl Wright)
+
CONNECTORS-460: Add multi-domain-controller support to the
Active Directory authority.
(Colin Anderson, Karl Wright)
Modified: incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java?rev=1327112&r1=1327111&r2=1327112&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java (original)
+++ incubator/lcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisAuthorityConnector.java Tue Apr 17 14:28:14 2012
@@ -162,10 +162,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>" + Messages.getString(locale,"CmisAuthorityConnector.Endpoint") + "</nobr></td>" +
+ out.print("<tr><td class=\"description\"><nobr>" + Messages.getBodyString(locale,"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>" + Messages.getString(locale,"CmisAuthorityConnector.RepositoryID") + "</nobr></td>" +
+ out.print("<tr><td class=\"description\"><nobr>" + Messages.getBodyString(locale,"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 +182,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>" + Messages.getString(locale,"CmisAuthorityConnector.UserMapping") + "</nobr></td>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"CmisAuthorityConnector.UserMapping") + "</nobr></td>\n"+
" <td class=\"value\">\n"+
" <input type=\"text\" size=\"32\" name=\""+CONFIG_PARAM_USERNAME_REGEXP+"\" value=\""+
Encoder.attributeEscape(usernameRegexp)+"\"/> ==> \n"+
@@ -233,15 +233,15 @@ public class CmisAuthorityConnector exte
out.print("<script type=\"text/javascript\">\n" + "<!--\n"
+ "function checkConfig()\n" + "{\n"
+ " if (editconnection.endpoint.value == \"\")\n" + " {\n"
- + " alert(\"" + Messages.getString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
+ + " alert(\"" + Messages.getBodyJavascriptString(locale,"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(\"" + Messages.getString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
+ + " alert(\"" + Messages.getBodyJavascriptString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
+ " editconnection.endpoint.focus();\n" + " return false;\n"
+ " }\n" + " if (editconnection.repositoryId.value == \"\")\n" + " {\n"
- + " alert(\"" + Messages.getString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
+ + " alert(\"" + Messages.getBodyJavascriptString(locale,"CmisAuthorityConnector.TheEndpointMustBeNotNull") + "\");\n"
+ " editconnection.repositoryId.focus();\n" + " return false;\n"
+ " }\n" + " return true;\n" + "}\n" + "\n" + "//-->\n"
+ "</script>\n");
@@ -315,7 +315,7 @@ public class CmisAuthorityConnector exte
Locale locale, ConfigParams parameters) throws ManifoldCFException, IOException {
out.print("<table class=\"displaytable\">\n"
+ " <tr>\n"
- + " <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getString(locale,"CmisAuthorityConnector.Parameters") + "</nobr></td>\n"
+ + " <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getBodyString(locale,"CmisAuthorityConnector.Parameters") + "</nobr></td>\n"
+ " <td class=\"value\" colspan=\"3\">\n");
Iterator iter = parameters.listParameters();
while (iter.hasNext()) {
Modified: incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java?rev=1327112&r1=1327111&r2=1327112&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java (original)
+++ incubator/lcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java Tue Apr 17 14:28:14 2012
@@ -1240,7 +1240,7 @@ public class AuthorityConnector extends
{
IKeystoreManager kmanager = KeystoreManagerFactory.make("",value);
out.print(
-" <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"=<"+Integer.toString(kmanager.getContents().length)+" " + Messages.getString(locale,"DCTM.certificate") + "></nobr><br/>\n"
+" <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(param)+"=<"+Integer.toString(kmanager.getContents().length)+" " + Messages.getBodyString(locale,"DCTM.certificate") + "></nobr><br/>\n"
);
}
else
Modified: incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1327112&r1=1327111&r2=1327112&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java (original)
+++ incubator/lcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Tue Apr 17 14:28:14 2012
@@ -1878,7 +1878,7 @@ public class FilenetConnector extends or
"{\n"+
" if (editjob.pathaddon.value == \"\")\n"+
" {\n"+
-" alert(" + Messages.getString(locale,"FilenetConnector.SelectAFolderFirst") + ");\n"+
+" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFolderFirst") + ");\n"+
" editjob.pathaddon.focus();\n"+
" return;\n"+
" }\n"+
@@ -1889,13 +1889,13 @@ public class FilenetConnector extends or
"{\n"+
" if (eval(\"editjob.matchfield_\"+docclass+\".value\") == \"\")\n"+
" {\n"+
-" alert(" + Messages.getString(locale,"FilenetConnector.SelectAFieldFirst") + ");\n"+
+" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFieldFirst") + ");\n"+
" eval(\"editjob.matchfield_\"+docclass+\".focus()\");\n"+
" return;\n"+
" }\n"+
" if (eval(\"editjob.matchtype_\"+docclass+\".value\") == \"\")\n"+
" {\n"+
-" alert(" + Messages.getString(locale,"FilenetConnector.SelectAMatchType") + ");\n"+
+" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAMatchType") + ");\n"+
" eval(\"editjob.matchtype_\"+docclass+\".focus()\");\n"+
" return;\n"+
" }\n"+
@@ -1907,7 +1907,7 @@ public class FilenetConnector extends or
"{\n"+
" if (editjob.spectoken.value == \"\")\n"+
" {\n"+
-" alert(" + Messages.getString(locale,"FilenetConnector.NullTokensNotAllowed") + ");\n"+
+" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.NullTokensNotAllowed") + ");\n"+
" editjob.spectoken.focus();\n"+
" return;\n"+
" }\n"+
@@ -2228,7 +2228,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=\"" + Messages.getAttributeString(locale,"FilenetConnector.Add") + "\" alt=\"" + Messages.getString(locale,"FilenetConnector.AddMatchFor") +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.getAttributeString(locale,"FilenetConnector.Add") + "\" alt=\"" + Messages.getAttributeString(locale,"FilenetConnector.AddMatchFor") +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"+
@@ -2248,9 +2248,9 @@ public class FilenetConnector extends or
" </td>\n"+
" <td class=\"value\">\n"+
" <select name=\"matchtype_"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(documentClass)+"\">\n"+
-" <option value=\"=\">" + Messages.getString(locale,"FilenetConnector.Equals") + "</option>\n"+
-" <option value=\"!=\">" + Messages.getString(locale,"FilenetConnector.NotEquals") + "</option>\n"+
-" <option value=\"LIKE\">" + Messages.getString(locale,"FilenetConnector.Like") + "</option>\n"+
+" <option value=\"=\">" + Messages.getBodyString(locale,"FilenetConnector.Equals") + "</option>\n"+
+" <option value=\"!=\">" + Messages.getBodyString(locale,"FilenetConnector.NotEquals") + "</option>\n"+
+" <option value=\"LIKE\">" + Messages.getBodyString(locale,"FilenetConnector.Like") + "</option>\n"+
" </select>\n"+
" </td>\n"+
" <td class=\"value\">\n"+
@@ -2480,8 +2480,8 @@ public class FilenetConnector extends or
" <tr>\n"+
" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"FilenetConnector.Security2") + "</nobr></td>\n"+
" <td class=\"value\" colspan=\"1\">\n"+
-" <input type=\"radio\" name=\"specsecurity\" value=\"on\" "+((securityOn)?"checked=\"true\"":"")+" />" + Messages.getString(locale,"FilenetConnector.Enabled") +
-" <input type=\"radio\" name=\"specsecurity\" value=\"off\" "+((securityOn==false)?"checked=\"true\"":"")+" />" + Messages.getString(locale,"FilenetConnector.Disabled") +
+" <input type=\"radio\" name=\"specsecurity\" value=\"on\" "+((securityOn)?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"FilenetConnector.Enabled") +
+" <input type=\"radio\" name=\"specsecurity\" value=\"off\" "+((securityOn==false)?"checked=\"true\"":"")+" />" + Messages.getBodyString(locale,"FilenetConnector.Disabled") +
" </td>\n"+
" </tr>\n"+
" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"
@@ -2503,7 +2503,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=\"" + Messages.getAttributeString(locale,"FilenetConnector.Delete") + "\" alt=\""+ Messages.getString(locale,"FilenetConnector.DeleteAccessToken")+Integer.toString(k)+"\" onClick='Javascript:SpecOp(\""+accessOpName+"\",\"Delete\",\"token_"+Integer.toString(k)+"\")'/>\n"+
+" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"FilenetConnector.Delete") + "\" alt=\""+ Messages.getAttributeString(locale,"FilenetConnector.DeleteAccessToken")+Integer.toString(k)+"\" onClick='Javascript:SpecOp(\""+accessOpName+"\",\"Delete\",\"token_"+Integer.toString(k)+"\")'/>\n"+
" </a>\n"+
" </td>\n"+
" <td class=\"value\">\n"+
@@ -2529,7 +2529,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=\"" + Messages.getAttributeString(locale,"FilenetConnector.Add") + "\" alt=\"" + Messages.getString(locale,"FilenetConnector.AddAccessToken") + "\" onClick='Javascript:SpecAddToken(\"token_"+Integer.toString(k+1)+"\")'/>\n"+
+" <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"FilenetConnector.Add") + "\" alt=\"" + Messages.getAttributeString(locale,"FilenetConnector.AddAccessToken") + "\" onClick='Javascript:SpecAddToken(\"token_"+Integer.toString(k+1)+"\")'/>\n"+
" </a>\n"+
" </td>\n"+
" <td class=\"value\">\n"+
@@ -2939,7 +2939,7 @@ public class FilenetConnector extends or
if (q == 0)
{
out.print(
-" <nobr>(" + Messages.getString(locale,"FilenetConnector.AllDocumentsInClass") + "\""+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(docclass)+"\")</nobr>\n"
+" <nobr>(" + Messages.getBodyString(locale,"FilenetConnector.AllDocumentsInClass") + "\""+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(docclass)+"\")</nobr>\n"
);
}
out.print(
Modified: incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1327112&r1=1327111&r2=1327112&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ incubator/lcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java Tue Apr 17 14:28:14 2012
@@ -470,13 +470,13 @@ public class LivelinkAuthority extends o
"{\n"+
" if (editconnection.serverport.value != \"\" && !isInteger(editconnection.serverport.value))\n"+
" {\n"+
-" alert(" + Messages.getString(locale,"LivelinkConnector.AValidNumberIsRequired") + ");\n"+
+" alert(" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.AValidNumberIsRequired") + ");\n"+
" editconnection.serverport.focus();\n"+
" return false;\n"+
" }\n"+
" if (editconnection.usernameregexp.value != \"\" && !isRegularExpression(editconnection.usernameregexp.value))\n"+
" {\n"+
-" alert(" + Messages.getString(locale,"LivelinkConnector.UserNameRegularExpressionMustBeValidRegularExpression") + ");\n"+
+" alert(" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.UserNameRegularExpressionMustBeValidRegularExpression") + ");\n"+
" editconnection.usernameregexp.focus();\n"+
" return false;\n"+
" }\n"+
@@ -487,22 +487,22 @@ public class LivelinkAuthority extends o
"{\n"+
" if (editconnection.servername.value == \"\")\n"+
" {\n"+
-" alert(" + Messages.getString(locale,"LivelinkConnector.EnterALivelinkServerName") + ");\n"+
-" SelectTab(" + Messages.getString(locale,"LivelinkConnector.Server") + ");\n"+
+" alert(" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.EnterALivelinkServerName") + ");\n"+
+" SelectTab(" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.Server") + ");\n"+
" editconnection.servername.focus();\n"+
" return false;\n"+
" }\n"+
" if (editconnection.serverport.value == \"\")\n"+
" {\n"+
-" alert(" + Messages.getString(locale,"LivelinkConnector.AServerPortNumberIsRequired") + ");\n"+
-" SelectTab(" + Messages.getString(locale,"LivelinkConnector.Server") + ");\n"+
+" alert(" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.AServerPortNumberIsRequired") + ");\n"+
+" SelectTab(" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.Server") + ");\n"+
" editconnection.serverport.focus();\n"+
" return false;\n"+
" }\n"+
" if (editconnection.usernameregexp.value == \"\")\n"+
" {\n"+
-" alert(" + Messages.getString(locale,"LivelinkConnector.UserNameRegularExpressionCannotBeNull") + ");\n"+
-" SelectTab(" + Messages.getString(locale,"LivelinkConnector.UserMapping") + ");\n"+
+" alert(" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.UserNameRegularExpressionCannotBeNull") + ");\n"+
+" SelectTab(" + Messages.getBodyJavascriptString(locale,"LivelinkConnector.UserMapping") + ");\n"+
" editconnection.usernameregexp.focus();\n"+
" return false;\n"+
" }\n"+
@@ -568,19 +568,19 @@ public class LivelinkAuthority extends o
"<table class=\"displaytable\">\n"+
" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
" <tr>\n"+
-" <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.ServerName") + "</nobr></td>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.ServerName") + "</nobr></td>\n"+
" <td class=\"value\"><input type=\"text\" size=\"64\" name=\"servername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverName)+"\"/></td>\n"+
" </tr>\n"+
" <tr>\n"+
-" <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.ServerPort") + "</nobr></td>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.ServerPort") + "</nobr></td>\n"+
" <td class=\"value\"><input type=\"text\" size=\"5\" name=\"serverport\" value=\""+serverPort+"\"/></td>\n"+
" </tr>\n"+
" <tr>\n"+
-" <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.ServerUserName") + "</nobr></td>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.ServerUserName") + "</nobr></td>\n"+
" <td class=\"value\"><input type=\"text\" size=\"32\" name=\"serverusername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverUserName)+"\"/></td>\n"+
" </tr>\n"+
" <tr>\n"+
-" <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.ServerPassword") + "</nobr></td>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.ServerPassword") + "</nobr></td>\n"+
" <td class=\"value\"><input type=\"password\" size=\"32\" name=\"serverpassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverPassword)+"\"/></td>\n"+
" </tr>\n"+
"</table>\n"
@@ -604,11 +604,11 @@ public class LivelinkAuthority extends o
"<table class=\"displaytable\">\n"+
" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
" <tr>\n"+
-" <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.UserNameRegularExpression") + "</nobr></td>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.UserNameRegularExpression") + "</nobr></td>\n"+
" <td class=\"value\"><input type=\"text\" size=\"40\" name=\"usernameregexp\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(usernameRegexp)+"\"/></td>\n"+
" </tr>\n"+
" <tr>\n"+
-" <td class=\"description\"><nobr>" + Messages.getString(locale,"LivelinkConnector.LivelinkUserExpression") + "</nobr></td>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.LivelinkUserExpression") + "</nobr></td>\n"+
" <td class=\"value\"><input type=\"text\" size=\"40\" name=\"livelinkuserexpr\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(livelinkUserExpr)+"\"/></td>\n"+
" </tr>\n"+
"</table>\n"
@@ -679,7 +679,7 @@ public class LivelinkAuthority extends o
out.print(
"<table class=\"displaytable\">\n"+
" <tr>\n"+
-" <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getString(locale,"LivelinkConnector.Parameters") + "</nobr></td>\n"+
+" <td class=\"description\" colspan=\"1\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.Parameters") + "</nobr></td>\n"+
" <td class=\"value\" colspan=\"3\">\n"
);
Iterator iter = parameters.listParameters();
Modified: incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java?rev=1327112&r1=1327111&r2=1327112&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java (original)
+++ incubator/lcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java Tue Apr 17 14:28:14 2012
@@ -770,7 +770,7 @@ public class MeridioAuthority extends or
" if (editconnection.metacartawsServerPort.value != \"\" && !isInteger(editconnection.metacartawsServerPort.value))\n"+
" {\n"+
" alert(\"" + Messages.getBodyJavascriptString(locale,"MeridioConnector.PleaseSupplyAUserServicePortNumber") + "\");\n"+
-" SelectTab(\"" + Messages.getString(locale,"MeridioConnector.UserServiceServer") + "\");\n"+
+" SelectTab(\"" + Messages.getBodyJavascriptString(locale,"MeridioConnector.UserServiceServer") + "\");\n"+
" editconnection.metacartawsServerPort.focus();\n"+
" return false;\n"+
" }\n"+