svn commit: r1903752 - in /manifoldcf/trunk: CHANGES.txt connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java

[kwright]

Author: kwright
Date: Mon Aug 29 08:15:33 2022
New Revision: 1903752

URL: http://svn.apache.org/viewvc?rev=1903752&view=rev
Log:
Fix for CONNECTORS-1725 and for CONNECTORS-1726.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1903752&r1=1903751&r2=1903752&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Aug 29 08:15:33 2022
@@ -3,6 +3,12 @@ $Id$
 
 ======================= 2.24-dev =====================
 
+CONNECTORS-1726: Mismatch between form parameters in generic connector.
+(Nguyen Huu)
+
+CONNECTORS-1725: Fix reference to translation string, generic connector.
+(Nguyen Huu)
+
 CONNECTORS-1724: Free up crossthread buffer when error returned in 
GenericConnector.
 (Nguyen Huu)
 

Modified: 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java?rev=1903752&r1=1903751&r2=1903752&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
 (original)
+++ 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
 Mon Aug 29 08:15:33 2022
@@ -509,19 +509,19 @@ public class GenericConnector extends Ba
         + " </tr>\n"
         + " <tr>\n"
         + "  <td class=\"description\"><nobr>" + 
Messages.getBodyString(locale, "generic.ConnectionTimeoutColon") + 
"</nobr></td>\n"
-        + "  <td class=\"value\"><input type=\"text\" size=\"32\" 
name=\"genericConTimeout\" value=\"" + Encoder.attributeEscape(conTimeout) + 
"\"/></td>\n"
+        + "  <td class=\"value\"><input type=\"text\" size=\"32\" 
name=\"genericConnectionTimeout\" value=\"" + 
Encoder.attributeEscape(conTimeout) + "\"/></td>\n"
         + " </tr>\n"
         + " <tr>\n"
         + "  <td class=\"description\"><nobr>" + 
Messages.getBodyString(locale, "generic.SocketTimeoutColon") + "</nobr></td>\n"
-        + "  <td class=\"value\"><input type=\"text\" size=\"32\" 
name=\"genericSoTimeout\" value=\"" + Encoder.attributeEscape(soTimeout) + 
"\"/></td>\n"
+        + "  <td class=\"value\"><input type=\"text\" size=\"32\" 
name=\"genericSocketTimeout\" value=\"" + Encoder.attributeEscape(soTimeout) + 
"\"/></td>\n"
         + " </tr>\n"
         + "</table>\n");
     } else {
       out.print("<input type=\"hidden\" name=\"genericEntryPoint\" value=\"" + 
Encoder.attributeEscape(server) + "\"/>\n");
       out.print("<input type=\"hidden\" name=\"genericLogin\" value=\"" + 
Encoder.attributeEscape(login) + "\"/>\n");
       out.print("<input type=\"hidden\" name=\"genericPassword\" value=\"" + 
Encoder.attributeEscape(password) + "\"/>\n");
-      out.print("<input type=\"hidden\" name=\"genericConTimeout\" value=\"" + 
Encoder.attributeEscape(conTimeout) + "\"/>\n");
-      out.print("<input type=\"hidden\" name=\"genericSoTimeout\" value=\"" + 
Encoder.attributeEscape(soTimeout) + "\"/>\n");
+      out.print("<input type=\"hidden\" name=\"genericConnectionTimeout\" 
value=\"" + Encoder.attributeEscape(conTimeout) + "\"/>\n");
+      out.print("<input type=\"hidden\" name=\"genericSocketTimeout\" 
value=\"" + Encoder.attributeEscape(soTimeout) + "\"/>\n");
     }
   }
 
@@ -532,8 +532,8 @@ public class GenericConnector extends Ba
 
     copyParam(variableContext, parameters, "genericLogin");
     copyParam(variableContext, parameters, "genericEntryPoint");
-    copyParam(variableContext, parameters, "genericConTimeout");
-    copyParam(variableContext, parameters, "genericSoTimeout");
+    copyParam(variableContext, parameters, "genericConnectionTimeout");
+    copyParam(variableContext, parameters, "genericSocketTimeout");
 
     String password = variableContext.getParameter("genericPassword");
     if (password == null) {
@@ -607,7 +607,7 @@ public class GenericConnector extends Ba
       + "function "+seqPrefix+"SpecAddParam(anchorvalue) {\n"
       + "  if (editjob."+seqPrefix+"specparamname.value == \"\")\n"
       + "  {\n"
-      + "    alert(\"" + Messages.getBodyJavascriptString(locale, 
"generic.TypeInParamName") + "\");\n"
+      + "    alert(\"" + Messages.getBodyJavascriptString(locale, 
"generic.TypeInParameterName") + "\");\n"
       + "    editjob."+seqPrefix+"specparamname.focus();\n"
       + "    return;\n"
       + "  }\n"