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

Fri, 30 Nov 2018 22:24:57 -0800 

Author: kwright
Date: Sat Dec  1 06:24:47 2018
New Revision: 1847879

URL: http://svn.apache.org/viewvc?rev=1847879&view=rev
Log:
Break parameters tab into two for ElasticSearch connector

Added:
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Server.html
   (with props)
Modified:
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.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_Parameters.html
    
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html

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=1847879&r1=1847878&r2=1847879&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
 Sat Dec  1 06:24:47 2018
@@ -76,12 +76,14 @@ public class ElasticSearchConnector exte
   private final static String[] ELASTICSEARCH_ACTIVITIES =
   { ELASTICSEARCH_INDEXATION_ACTIVITY, ELASTICSEARCH_DELETION_ACTIVITY };
 
+  private final static String ELASTICSEARCH_TAB_SERVER = 
"ElasticSearchConnector.Server";
   private final static String ELASTICSEARCH_TAB_PARAMETERS = 
"ElasticSearchConnector.Parameters";
 
   /** Forward to the javascript to check the configuration parameters */
   private static final String EDIT_CONFIG_HEADER_FORWARD = 
"editConfiguration.js";
 
   /** Forward to the HTML template to edit the configuration parameters */
+  private static final String EDIT_CONFIG_FORWARD_SERVER = 
"editConfiguration_Server.html";
   private static final String EDIT_CONFIG_FORWARD_PARAMETERS = 
"editConfiguration_Parameters.html";
 
   /** Forward to the HTML template to view the configuration parameters */
@@ -232,6 +234,7 @@ public class ElasticSearchConnector exte
   {
     super.outputConfigurationHeader(threadContext, out, locale, parameters,
         tabsArray);
+    tabsArray.add(Messages.getString(locale, ELASTICSEARCH_TAB_SERVER));
     tabsArray.add(Messages.getString(locale, ELASTICSEARCH_TAB_PARAMETERS));
     outputResource(EDIT_CONFIG_HEADER_FORWARD, out, locale, null, null, null, 
null);
   }
@@ -244,6 +247,7 @@ public class ElasticSearchConnector exte
     super.outputConfigurationBody(threadContext, out, locale, parameters,
         tabName);
     ElasticSearchConfig config = this.getConfigParameters(parameters);
+    outputResource(EDIT_CONFIG_FORWARD_SERVER, out, locale, config, tabName, 
null, null);
     outputResource(EDIT_CONFIG_FORWARD_PARAMETERS, out, locale, config, 
tabName, null, null);
   }
 

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=1847879&r1=1847878&r2=1847879&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
 Sat Dec  1 06:24:47 2018
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ElasticSearchConnector.Server=Server
 ElasticSearchConnector.Parameters=Parameters
 
 #ElasticSearchConnector.ServerVersion=Server version:

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=1847879&r1=1847878&r2=1847879&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
 Sat Dec  1 06:24:47 2018
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ElasticSearchConnector.Server=Server
 ElasticSearchConnector.Parameters=Parámetros
 
 #ElasticSearchConnector.ServerVersion=Server version:

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=1847879&r1=1847878&r2=1847879&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
 Sat Dec  1 06:24:47 2018
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ElasticSearchConnector.Server=Server
 ElasticSearchConnector.Parameters=Paramètres
 
 ElasticSearchConnector.ServerLocation=Emplacement du serveur

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=1847879&r1=1847878&r2=1847879&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
 Sat Dec  1 06:24:47 2018
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ElasticSearchConnector.Server=Server
 ElasticSearchConnector.Parameters=引数
 
 #ElasticSearchConnector.ServerVersion=Server version:

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=1847879&r1=1847878&r2=1847879&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
 Sat Dec  1 06:24:47 2018
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ElasticSearchConnector.Server=Server
 ElasticSearchConnector.Parameters=参数
 
 #ElasticSearchConnector.ServerVersion=Server version:

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=1847879&r1=1847878&r2=1847879&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
 Sat Dec  1 06:24:47 2018
@@ -53,7 +53,7 @@ function checkConfigForSave() {
   if (editconnection.serverlocation) {
     if (editconnection.serverlocation.value == "") {
       
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation'))");
-      
SelectTab("$Encoder.javascriptBodyEscape($ResourceBundle.getString('ElasticSearchConnector.Parameters'))");
+      
SelectTab("$Encoder.javascriptBodyEscape($ResourceBundle.getString('ElasticSearchConnector.Server'))");
       editconnection.serverlocation.focus();
       return false;
     }

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html?rev=1847879&r1=1847878&r2=1847879&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html
 Sat Dec  1 06:24:47 2018
@@ -19,27 +19,6 @@
 
 <table class="displaytable">
   <tr>
-    <td class="description">
-      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.ServerLocation'))</nobr>
-        
$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.URLColon'))
-    </td>
-    <td class="value"><input name="serverlocation" type="text"
-      value="$Encoder.attributeEscape($SERVERLOCATION)" size="48" />
-    </td>
-  </tr>
-  <tr>
-    <td class="description">
-      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.UserNameColon'))</nobr></td>
-    <td class="value"><input name="username" type="text" 
value="$Encoder.attributeEscape($USERNAME)" size="24" />
-    </td>
-  </tr>
-  <tr>
-    <td class="description">
-      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.PasswordColon'))</nobr></td>
-    <td class="value"><input name="password" type="password" 
value="$Encoder.attributeEscape($PASSWORD)" size="24" />
-    </td>
-  </tr>
-  <tr>
     <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.IndexNameColon'))</nobr></td>
     <td class="value"><input name="indexname" type="text" 
value="$Encoder.attributeEscape($INDEXNAME)" size="24" /></td>
   </tr>
@@ -93,7 +72,6 @@
 </table>
 
 #else
-<input type="hidden" name="serverlocation" 
value="$Encoder.attributeEscape($SERVERLOCATION)" />
 <input type="hidden" name="indexname" 
value="$Encoder.attributeEscape($INDEXNAME)" />
 <input type="hidden" name="indextype" 
value="$Encoder.attributeEscape($INDEXTYPE)" />
 <input type="hidden" name="usemapperattachments_checkbox" value="false"/>

Added: 
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=1847879&view=auto
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Server.html
 (added)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Server.html
 Sat Dec  1 06:24:47 2018
@@ -0,0 +1,49 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+#if($TABNAME == $ResourceBundle.getString('ElasticSearchConnector.Server'))
+
+<table class="displaytable">
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.ServerLocation'))</nobr>
+        
$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.URLColon'))
+    </td>
+    <td class="value"><input name="serverlocation" type="text"
+      value="$Encoder.attributeEscape($SERVERLOCATION)" size="48" />
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.UserNameColon'))</nobr></td>
+    <td class="value"><input name="username" type="text" 
value="$Encoder.attributeEscape($USERNAME)" size="24" />
+    </td>
+  </tr>
+  <tr>
+    <td class="description">
+      
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.PasswordColon'))</nobr></td>
+    <td class="value"><input name="password" type="password" 
value="$Encoder.attributeEscape($PASSWORD)" size="24" />
+    </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)" />
+
+#end

Propchange: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Server.html
------------------------------------------------------------------------------
    svn:eol-style = native

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=1847879&r1=1847878&r2=1847879&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
 Sat Dec  1 06:24:47 2018
@@ -27,8 +27,11 @@
   </tr>
   <tr>
     <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.PasswordColon'))</nobr></td>
-    <td class="value">*******</td>
+    <td class="value">*****</td>
   </tr>
+  
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+
   <tr>
     <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.IndexNameColon'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($INDEXNAME)</td>

Reply via email to