svn commit: r1903770 - in /manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf: authorities/authorities/generic/GenericAuthority.java crawler/connectors/generic/GenericConnector.java

[kwright]

Author: kwright
Date: Tue Aug 30 06:51:21 2022
New Revision: 1903770

URL: http://svn.apache.org/viewvc?rev=1903770&view=rev
Log:
Fix for CONNECTORS-1727 and CONNECTORS-1728.

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

Modified: 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java?rev=1903770&r1=1903769&r2=1903770&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
 (original)
+++ 
manifoldcf/trunk/connectors/generic/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/generic/GenericAuthority.java
 Tue Aug 30 06:51:21 2022
@@ -397,11 +397,11 @@ public class GenericAuthority extends or
         + " </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=\"genericConnectorTimeout\" 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"
         + " <tr>\n"
         + "  <td class=\"description\"><nobr>" + 
Messages.getBodyString(locale, "generic.ResponseLifetimeColon") + 
"</nobr></td>\n"
@@ -412,8 +412,8 @@ public class GenericAuthority extends or
       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=\"genericConnectorTimeout\" 
value=\"" + Encoder.attributeEscape(conTimeout) + "\"/>\n");
+      out.print("<input type=\"hidden\" name=\"genericSocketTimeout\" 
value=\"" + Encoder.attributeEscape(soTimeout) + "\"/>\n");
       out.print("<input type=\"hidden\" name=\"genericResponseLifetime\" 
value=\"" + Encoder.attributeEscape(respLifetime) + "\"/>\n");
     }
   }
@@ -425,8 +425,8 @@ public class GenericAuthority extends or
 
     copyParam(variableContext, parameters, "genericLogin");
     copyParam(variableContext, parameters, "genericEntryPoint");
-    copyParam(variableContext, parameters, "genericConTimeout");
-    copyParam(variableContext, parameters, "genericSoTimeout");
+    copyParam(variableContext, parameters, "genericConnectorTimeout");
+    copyParam(variableContext, parameters, "genericSocketTimeout");
     copyParam(variableContext, parameters, "genericResponseLifetime");
 
     String password = variableContext.getParameter("genericPassword");

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=1903770&r1=1903769&r2=1903770&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
 Tue Aug 30 06:51:21 2022
@@ -1205,7 +1205,7 @@ public class GenericConnector extends Ba
         HttpResponse response = client.execute(method);
         try {
           if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
-            exception = new ManifoldCFException("addSeedDocuments error - 
interface returned incorrect return code for: " + url + " - " + 
response.getStatusLine().toString());
+            exception = new ManifoldCFException("getDocumentVersions error - 
interface returned incorrect return code for: " + url + " - " + 
response.getStatusLine().toString());
             return;
           }
           JAXBContext context;