svn commit: r1904741 - in /manifoldcf/trunk: ./ connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsear...

Thu, 20 Oct 2022 05:56:33 -0700 

Author: kwright
Date: Thu Oct 20 12:56:27 2022
New Revision: 1904741

URL: http://svn.apache.org/viewvc?rev=1904741&view=rev
Log:
CONNECTORS-1738: Add timeout and connection timeout configurability to ES 
connector

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_es_ES.properties
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_fr_FR.properties
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_zh_CN.properties
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Server.html
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Oct 20 12:56:27 2022
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.24-dev =====================
 
+CONNECTORS-1738: Add connection-specific timeouts to ES connector.
+(Nguyen Huu)
+
 CONNECTORS-1737: Add support for proxies in Confluence V6 connector.
 (Nguyen Huu)
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java
 Thu Oct 20 12:56:27 2022
@@ -56,7 +56,9 @@ public class ElasticSearchConfig extends
     ParameterEnum.CREATEDDATEATTRIBUTENAME,
     ParameterEnum.MODIFIEDDATEATTRIBUTENAME,
     ParameterEnum.INDEXINGDATEATTRIBUTENAME,
-    ParameterEnum.MIMETYPEATTRIBUTENAME
+    ParameterEnum.MIMETYPEATTRIBUTENAME,
+    ParameterEnum.ELASTICSEARCH_SOCKET_TIMEOUT,
+    ParameterEnum.ELASTICSEARCH_CONNECTION_TIMEOUT
   };
 
   /** Build a set of ElasticSearchParameters by reading ConfigParams. If the
@@ -235,6 +237,16 @@ public class ElasticSearchConfig extends
     return KeystoreManagerFactory.make("", packedKeystore);
   }
   
+  final public String getElasticSearchSocketTimeout()
+  {
+    return get(ParameterEnum.ELASTICSEARCH_SOCKET_TIMEOUT);
+  }
+
+  final public String getElasticSearchConnectionTimeout()
+  {
+    return get(ParameterEnum.ELASTICSEARCH_CONNECTION_TIMEOUT);
+  }  
+
   final public String getIndexName()
   {
     return get(ParameterEnum.INDEXNAME);

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
 Thu Oct 20 12:56:27 2022
@@ -67,6 +67,7 @@ import org.apache.manifoldcf.core.interf
 import org.apache.manifoldcf.core.interfaces.IThreadContext;
 import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
 import org.apache.manifoldcf.core.system.ManifoldCF;
+import org.apache.manifoldcf.crawler.system.Logging;
 import org.apache.manifoldcf.core.interfaces.VersionContext;
 import org.apache.manifoldcf.connectorcommon.interfaces.IKeystoreManager;
 import org.apache.manifoldcf.connectorcommon.common.InterruptibleSocketFactory;
@@ -133,6 +134,17 @@ public class ElasticSearchConnector exte
       final String userName = config.getUserName();
       final String password = config.getPassword();
 
+      try {
+       socketTimeout = 
Integer.parseInt(config.getElasticSearchSocketTimeout());
+      } catch (NumberFormatException e) {
+        Logging.connectors.warn("An error occurred when parser the value of 
ElasticSearch socket timeout. Setting to default: 900000 (millisecond).");
+      }
+      try {
+       connectionTimeout = 
Integer.parseInt(config.getElasticSearchConnectionTimeout());
+      } catch (NumberFormatException e) {
+        Logging.connectors.warn("An error occurred when parser the value of 
ElasticSearch connection timeout. Setting to default: 60000 (millisecond).");
+      }
+
       final Credentials credentials;
       if (userName != null && userName.length() > 0)
         credentials = new UsernamePasswordCredentials(userName, password);

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
 Thu Oct 20 12:56:27 2022
@@ -56,7 +56,9 @@ public class ElasticSearchParam extends
     INDEXINGDATEATTRIBUTENAME("indexed"),
     MIMETYPEATTRIBUTENAME("mime-type"),
     
-    FIELDLIST("");
+    FIELDLIST(""),
+    ELASTICSEARCH_SOCKET_TIMEOUT("900000"),
+    ELASTICSEARCH_CONNECTION_TIMEOUT("60000");
 
     final protected String defaultValue;
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
 Thu Oct 20 12:56:27 2022
@@ -40,12 +40,16 @@ ElasticSearchConnector.CreatedDateAttrib
 ElasticSearchConnector.ModifiedDateAttributeNameColon=Modified date field name:
 ElasticSearchConnector.IndexingDateAttributeNameColon=Indexing date field name:
 ElasticSearchConnector.MimeTypeAttributeNameColon=Mime type field name:
+ElasticSearchConnector.SocketTimeoutColon=Socket timeout:
+ElasticSearchConnector.ConnectionTimeoutColon=Connection timeout:
 
 ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation=Please supply a 
valid ElasticSearch server location
 ElasticSearchConnector.ChooseACertificateFile=Please choose a certificate file
 ElasticSearchConnector.PleaseSupplyValidIndexName=Please supply a valid index 
name
 ElasticSearchConnector.PleaseSupplyValidIndexType=Please supply a valid index 
type
 
ElasticSearchConnector.ContentAttributeNameRequiredUnlessMapperAttachments=Content
 field name required unless using mapper attachments
+ElasticSearchConnector.SocketTimeoutMustBeAnInteger=ElasticSearch socket 
timeout must be an integer
+ElasticSearchConnector.ConnectionTimeoutMustBeAnInteger=ElasticSearch 
connection timeout must be an integer
 
 ElasticSearchConnector.ElasticSearch=ElasticSearch
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_es_ES.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_es_ES.properties?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_es_ES.properties
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_es_ES.properties
 Thu Oct 20 12:56:27 2022
@@ -40,11 +40,15 @@ ElasticSearchConnector.CreatedDateAttrib
 ElasticSearchConnector.ModifiedDateAttributeNameColon=Modified date field name:
 ElasticSearchConnector.IndexingDateAttributeNameColon=Indexing date field name:
 ElasticSearchConnector.MimeTypeAttributeNameColon=Mime type field name:
+ElasticSearchConnector.SocketTimeoutColon=Socket timeout:
+ElasticSearchConnector.ConnectionTimeoutColon=Connection timeout:
 
 ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation=Por favor 
suministre una posición de servidor válida elástica de búsqueda
 ElasticSearchConnector.ChooseACertificateFile=Please choose a certificate file
 ElasticSearchConnector.PleaseSupplyValidIndexName=Por favor proporcione un 
nombre de índice válido
 ElasticSearchConnector.PleaseSupplyValidIndexType=Por favor, facilite un tipo 
de índice válido
+ElasticSearchConnector.SocketTimeoutMustBeAnInteger=Búsqueda elástica socket 
timeout debe ser un entero
+ElasticSearchConnector.ConnectionTimeoutMustBeAnInteger=Búsqueda elástica 
connection timeout debe ser un entero
 
 ElasticSearchConnector.ContentAttributeNameRequiredUnlessMapperAttachments=Se 
requiere un nombre de campo de contenido, a menos que utilicen archivos 
adjuntos mapa
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_fr_FR.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_fr_FR.properties?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_fr_FR.properties
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_fr_FR.properties
 Thu Oct 20 12:56:27 2022
@@ -32,11 +32,15 @@ ElasticSearchConnector.IndexTypeColon=Ty
 ElasticSearchConnector.UseIngestAttachmentColon=Use ingest-attachment:
 ElasticSearchConnector.PipelineNameRequiredIfIngestAttachment=Pipeline field 
name required if using ingest attachment
 
ElasticSearchConnector.CannotUseBothOfIngestAttachmentAndMapperAttachments=Cannot
 use both ingest attachment and mapper attachments
+ElasticSearchConnector.SocketTimeoutColon=Socket timeout:
+ElasticSearchConnector.ConnectionTimeoutColon=Connection timeout:
 
 ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation=Veuillez fournir 
en emplacement valide pour le serveur Elasticsearch
 ElasticSearchConnector.ChooseACertificateFile=Please choose a certificate file
 ElasticSearchConnector.PleaseSupplyValidIndexName=Veuillez fournir un nom 
valide pour l'index
 ElasticSearchConnector.PleaseSupplyValidIndexType=Veuillez fournir un type 
d'index valide
+ElasticSearchConnector.SocketTimeoutMustBeAnInteger=ElasticSearch socket 
timeout doit 黎re un entier
+ElasticSearchConnector.ConnectionTimeoutMustBeAnInteger=ElasticSearch 
connection timeout doit 黎re un entier
 
 ElasticSearchConnector.ElasticSearch=ElasticSearch
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
 Thu Oct 20 12:56:27 2022
@@ -40,6 +40,8 @@ ElasticSearchConnector.CreatedDateAttrib
 
ElasticSearchConnector.ModifiedDateAttributeNameColon=更新日フィールド名:
 
ElasticSearchConnector.IndexingDateAttributeNameColon=インデックス作成日フィールド名:
 ElasticSearchConnector.MimeTypeAttributeNameColon=Mime 
タイプフィールド名:
+ElasticSearchConnector.SocketTimeoutColon=Socket timeout:
+ElasticSearchConnector.ConnectionTimeoutColon=Connection timeout:
 
 
ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation=正しいElasticSearchサーバURLをå
…¥åŠ›ã—てください
 
ElasticSearchConnector.ChooseACertificateFile=証明書ファイルを選択してくã
 ã•ã„
@@ -48,6 +50,8 @@ ElasticSearchConnector.PleaseSupplyValid
 
ElasticSearchConnector.PipelineNameRequiredIfIngestAttachment=ingest-attachment 
を使用する場合はパイプラインフィールド名が必要です
 
ElasticSearchConnector.ContentAttributeNameRequiredUnlessMapperAttachments=mapper-attachments
 を使用しない場合はコンテントフィールド名が必要です
 
ElasticSearchConnector.CannotUseBothOfIngestAttachmentAndMapperAttachments=ingest
 attachment と mapper attachments は両方同時に使えません
+ElasticSearchConnector.SocketTimeoutMustBeAnInteger=ElasticSearch socket 
timeout must be an integer
+ElasticSearchConnector.ConnectionTimeoutMustBeAnInteger=ElasticSearch 
connection timeout must be an integer
 
 ElasticSearchConnector.ElasticSearch=ElasticSearch
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_zh_CN.properties?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_zh_CN.properties
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_zh_CN.properties
 Thu Oct 20 12:56:27 2022
@@ -40,12 +40,16 @@ ElasticSearchConnector.CreatedDateAttrib
 ElasticSearchConnector.ModifiedDateAttributeNameColon=Modified date field name:
 ElasticSearchConnector.IndexingDateAttributeNameColon=Indexing date field name:
 ElasticSearchConnector.MimeTypeAttributeNameColon=Mime type field name:
+ElasticSearchConnector.SocketTimeoutColon=Socket timeout:
+ElasticSearchConnector.ConnectionTimeoutColon=Connection timeout:
 
 ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation=请输å…
¥æœ‰æ•ˆçš„Elasticsearch服务器URL
 ElasticSearchConnector.ChooseACertificateFile=Please choose a certificate file
 ElasticSearchConnector.PleaseSupplyValidIndexName=请输入有效的索引名
 ElasticSearchConnector.PleaseSupplyValidIndexType=请输å…
¥æœ‰æ•ˆçš„索引类型
 
ElasticSearchConnector.ContentAttributeNameRequiredUnlessMapperAttachments=Content
 field name required unless using mapper attachments
+ElasticSearchConnector.SocketTimeoutMustBeAnInteger=ElasticSearch socket 
timeout must be an integer
+ElasticSearchConnector.ConnectionTimeoutMustBeAnInteger=ElasticSearch 
connection timeout must be an integer
 
 ElasticSearchConnector.ElasticSearch=Elasticsearch
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js
 Thu Oct 20 12:56:27 2022
@@ -60,6 +60,18 @@ function checkConfig() {
       return false;
     }
   }
+  if (editconnection.elasticsearch_socket_timeout.value == "" || 
!isInteger(editconnection.elasticsearch_socket_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.SocketTimeoutMustBeAnInteger'))");
+    editconnection.elasticsearch_socket_timeout.focus();
+    return false;
+  }
+  if (editconnection.elasticsearch_connection_timeout.value == "" || 
!isInteger(editconnection.elasticsearch_connection_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.ConnectionTimeoutMustBeAnInteger'))");
+    editconnection.elasticsearch_connection_timeout.focus();
+    return false;
+  }
   return true;
 }
 
@@ -109,6 +121,20 @@ function checkConfigForSave() {
       return false;
     }
   }
+  if (editconnection.elasticsearch_socket_timeout.value == "" || 
!isInteger(editconnection.elasticsearch_socket_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.SocketTimeoutMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.Server'))");
+    editconnection.elasticsearch_socket_timeout.focus();
+    return false;
+  }
+  if (editconnection.elasticsearch_connection_timeout.value == "" || 
!isInteger(editconnection.elasticsearch_connection_timeout.value))
+  {
+    
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.ConnectionTimeoutMustBeAnInteger'))");
+    
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.Server'))");
+    editconnection.elasticsearch_connection_timeout.focus();
+    return false;
+  }
   return true;
 }
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Server.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Server.html?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Server.html
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Server.html
 Thu Oct 20 12:56:27 2022
@@ -71,11 +71,30 @@
     </td>
   </tr>
 
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.SocketTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="elasticsearch_socket_timeout" 
name="elasticsearch_socket_timeout" 
value="$Encoder.attributeEscape($ELASTICSEARCH_SOCKET_TIMEOUT)" />
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.ConnectionTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <input size="32" type="text" id="elasticsearch_connection_timeout" 
name="elasticsearch_connection_timeout" 
value="$Encoder.attributeEscape($ELASTICSEARCH_CONNECTION_TIMEOUT)" />
+    </td>
+  </tr>
+
 </table>
 
 #else
 <input type="hidden" name="serverlocation" 
value="$Encoder.attributeEscape($SERVERLOCATION)" />
 <input type="hidden" name="username" 
value="$Encoder.attributeEscape($USERNAME)" />
 <input type="hidden" name="password" 
value="$Encoder.attributeEscape($PASSWORD)" />
+<input type="hidden" name="elasticsearch_socket_timeout" 
value="$Encoder.attributeEscape($ELASTICSEARCH_SOCKET_TIMEOUT)" />
+<input type="hidden" name="elasticsearch_connection_timeout" 
value="$Encoder.attributeEscape($ELASTICSEARCH_CONNECTION_TIMEOUT)" />
 
 #end

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html?rev=1904741&r1=1904740&r2=1904741&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html
 Thu Oct 20 12:56:27 2022
@@ -51,6 +51,23 @@
     </td>
   </tr>
 
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.SocketTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($ELASTICSEARCH_SOCKET_TIMEOUT)</nobr>
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.ConnectionTimeoutColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($ELASTICSEARCH_CONNECTION_TIMEOUT)</nobr>
+    </td>
+  </tr>
+
   <tr><td class="separator" colspan="2"><hr/></td></tr>
 
   <tr>

Reply via email to