You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/02/16 23:42:54 UTC

svn commit: r1245227 - in /incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main: java/org/apache/manifoldcf/agents/output/elasticsearch/ resources/org/apache/manifoldcf/agents/output/elasticsearch/

Author: kwright
Date: Thu Feb 16 22:42:54 2012
New Revision: 1245227

URL: http://svn.apache.org/viewvc?rev=1245227&view=rev
Log:
Commit latest patch.

Modified:
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_ja_JP.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ja_JP.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_en_US.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_ja_JP.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_en_US.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_ja_JP.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_ja_JP.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html
    incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_ja_JP.html

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java Thu Feb 16 22:42:54 2012
@@ -45,6 +45,11 @@ import org.apache.manifoldcf.core.interf
 import org.json.JSONException;
 import org.json.JSONObject;
 
+/**
+ * This is the "output connector" for elasticsearch.
+ * 
+ * @author Luca Stancapiano
+ */
 public class ElasticSearchConnector extends BaseOutputConnector
 {
 
@@ -108,7 +113,7 @@ public class ElasticSearchConnector exte
   private static void outputResource(String resName, IHTTPOutput out,
       Locale locale, ElasticSearchParam params) throws ManifoldCFException
   {
-    Messages.outputResource(out, locale, resName, (params == null) ? null
+    Messages.outputResourceWithVelocity(out, locale, resName, (params == null) ? null
         : params.buildMap(), false);
   }
 

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java Thu Feb 16 22:42:54 2012
@@ -22,6 +22,9 @@ import java.util.Map;
 
 import org.apache.manifoldcf.agents.output.elasticsearch.ElasticSearchParam.ParameterEnum;
 
+/** 
+ * Parameters data for the elasticsearch output connector.
+*/
 public class ElasticSearchParam extends HashMap<ParameterEnum, String>
 {
 

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java Thu Feb 16 22:42:54 2012
@@ -137,5 +137,13 @@ public class Messages extends org.apache
     outputResource(output, Messages.class, DEFAULT_PATH_NAME, locale,
         resourceKey, substitutionParameters, mapToUpperCase);
   }
+  
+  public static void outputResourceWithVelocity(IHTTPOutput output, Locale locale, String resourceKey,
+      Map<String,String> substitutionParameters, boolean mapToUpperCase)
+      throws ManifoldCFException
+    {
+      outputResourceWithVelocity(output,createVelocityEngine(Messages.class),DEFAULT_PATH_NAME,locale,resourceKey,
+        substitutionParameters,mapToUpperCase);
+    }
 
 }

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html Thu Feb 16 22:42:54 2012
@@ -19,27 +19,27 @@
 	<tr>
 		<td class="description"><nobr>Server Location</nobr> (URL):</td>
 		<td class="value"><input name="serverlocation"
-			value="${SERVERLOCATION:A}" size="48" />
+			value="$SERVERLOCATION_A" size="48" />
 		</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>Index name:</nobr></td>
-		<td class="value"><input name="indexname" value="${INDEXNAME:A}"
+		<td class="value"><input name="indexname" value="$INDEXNAME_A"
 			size="24" /></td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>Index type:</nobr></td>
-		<td class="value"><input name="indextype" value="${INDEXTYPE:A}"
+		<td class="value"><input name="indextype" value="$INDEXTYPE_A"
 			size="24" /></td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>User name:</nobr></td>
-		<td class="value"><input name="username" value="${USERNAME:A}"
+		<td class="value"><input name="username" value="$USERNAME_A"
 			size="24" /></td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>API Key:</nobr></td>
-		<td class="value"><input name="apikey" value="${APIKEY:A}"
+		<td class="value"><input name="apikey" value="$APIKEY_A"
 			size="40" /></td>
 	</tr>
 </table>
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_ja_JP.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_ja_JP.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_ja_JP.html Thu Feb 16 22:42:54 2012
@@ -19,27 +19,27 @@
 	<tr>
 		<td class="description"><nobr>サーバ</nobr>(URL):</td>
 		<td class="value"><input name="serverlocation"
-			value="${SERVERLOCATION:A}" size="48" />
+			value="$SERVERLOCATION:A" size="48" />
 		</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>索引名:</nobr></td>
-		<td class="value"><input name="indexname" value="${INDEXNAME:A}"
+		<td class="value"><input name="indexname" value="$INDEXNAME_A"
 			size="24" /></td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>索引名:</nobr></td>
-		<td class="value"><input name="indextype" value="${INDEXTYPE:A}"
+		<td class="value"><input name="indextype" value="$INDEXTYPE_A"
 			size="24" /></td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>ユーザ名:</nobr></td>
-		<td class="value"><input name="username" value="${USERNAME:A}"
+		<td class="value"><input name="username" value="$USERNAME_A"
 			size="24" /></td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>APIキー:</nobr></td>
-		<td class="value"><input name="apikey" value="${APIKEY:A}"
+		<td class="value"><input name="apikey" value="$APIKEY_A"
 			size="40" /></td>
 	</tr>
 </table>

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html Thu Feb 16 22:42:54 2012
@@ -19,17 +19,17 @@
 	<tr>
 		<td class="description"><nobr>Max file size</nobr> (bytes):</td>
 		<td class="value"><input name="maxfilesize"
-			value="${MAXFILESIZE:A}" size="24" /></td>
+			value="$MAXFILESIZE_A" size="24" /></td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>Allowed MIME Types :</nobr>
 		</td>
-		<td class="value"><textarea rows="10" cols="64" name="mimetypes">${MIMETYPES:B}</textarea>
+		<td class="value"><textarea rows="10" cols="64" name="mimetypes">$MIMETYPES_B</textarea>
 		</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>Allowed file</nobr> extensions:</td>
-		<td class="value"><textarea rows="10" cols="12" name="extensions">${EXTENSIONS:B}</textarea>
+		<td class="value"><textarea rows="10" cols="12" name="extensions">$EXTENSIONS_B</textarea>
 		</td>
 	</tr>
 </table>
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ja_JP.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ja_JP.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ja_JP.html Thu Feb 16 22:42:54 2012
@@ -19,17 +19,17 @@
 	<tr>
 		<td class="description"><nobr>最大ファイルサイズ</nobr> (bytes):</td>
 		<td class="value"><input name="maxfilesize"
-			value="${MAXFILESIZE:A}" size="24" /></td>
+			value="$MAXFILESIZE_A" size="24" /></td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>利用可能なMIMEタイプ:</nobr>
 		</td>
-		<td class="value"><textarea rows="10" cols="64" name="mimetypes">${MIMETYPES:B}</textarea>
+		<td class="value"><textarea rows="10" cols="64" name="mimetypes">$MIMETYPES_B</textarea>
 		</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>利用可能なファイル</nobr> 拡張子:</td>
-		<td class="value"><textarea rows="10" cols="12" name="extensions">${EXTENSIONS:B}</textarea>
+		<td class="value"><textarea rows="10" cols="12" name="extensions">$EXTENSIONS_B</textarea>
 		</td>
 	</tr>
 </table>

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_en_US.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_en_US.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_en_US.html Thu Feb 16 22:42:54 2012
@@ -14,8 +14,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<input type="hidden" name="serverlocation" value="${SERVERLOCATION:A}" />
-<input type="hidden" name="indexname" value="${INDEXNAME:A}" />
-<input type="hidden" name="indextype" value="${INDEXTYPE:A}" />
-<input type="hidden" name="username" value="${USERNAME:A}" />
-<input type="hidden" name="apikey" value="${APIKEY:A}" />
\ No newline at end of file
+<input type="hidden" name="serverlocation" value="$SERVERLOCATION_A" />
+<input type="hidden" name="indexname" value="$INDEXNAME_A" />
+<input type="hidden" name="indextype" value="$INDEXTYPE_A" />
+<input type="hidden" name="username" value="$USERNAME_A" />
+<input type="hidden" name="apikey" value="$APIKEY_A" />
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_ja_JP.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_ja_JP.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_ja_JP.html Thu Feb 16 22:42:54 2012
@@ -14,8 +14,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<input type="hidden" name="serverlocation" value="${SERVERLOCATION:A}" />
-<input type="hidden" name="indexname" value="${INDEXNAME:A}" />
-<input type="hidden" name="indextype" value="${INDEXTYPE:A}" />
-<input type="hidden" name="username" value="${USERNAME:A}" />
-<input type="hidden" name="apikey" value="${APIKEY:A}" />
\ No newline at end of file
+<input type="hidden" name="serverlocation" value="$SERVERLOCATION_A" />
+<input type="hidden" name="indexname" value="$INDEXNAME_A" />
+<input type="hidden" name="indextype" value="$INDEXTYPE_A" />
+<input type="hidden" name="username" value="$USERNAME_A" />
+<input type="hidden" name="apikey" value="$APIKEY_A" />
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_en_US.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_en_US.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_en_US.html Thu Feb 16 22:42:54 2012
@@ -14,6 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<input type="hidden" name="maxfilesize" value="${MAXFILESIZE:A}" />
-<input type="hidden" name="mimetypes" value="${MIMETYPES:B}" />
-<input type="hidden" name="extensions" value="${EXTENSIONS:B}" />
\ No newline at end of file
+<input type="hidden" name="maxfilesize" value="$MAXFILESIZE_A" />
+<input type="hidden" name="mimetypes" value="$MIMETYPES_B" />
+<input type="hidden" name="extensions" value="$EXTENSIONS_B" />
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_ja_JP.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_ja_JP.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_ja_JP.html Thu Feb 16 22:42:54 2012
@@ -14,6 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<input type="hidden" name="maxfilesize" value="${MAXFILESIZE:A}" />
-<input type="hidden" name="mimetypes" value="${MIMETYPES:B}" />
-<input type="hidden" name="extensions" value="${EXTENSIONS:B}" />
\ No newline at end of file
+<input type="hidden" name="maxfilesize" value="$MAXFILESIZE_A" />
+<input type="hidden" name="mimetypes" value="$MIMETYPES_B" />
+<input type="hidden" name="extensions" value="$EXTENSIONS_B" />
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html Thu Feb 16 22:42:54 2012
@@ -18,14 +18,14 @@
 <table class="displaytable">
 	<tr>
 		<td class="description"><nobr>Server Location</nobr> (URL):</td>
-		<td class="value">${SERVERLOCATION:B}</td>
+		<td class="value">$SERVERLOCATION_B</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>User name:</nobr></td>
-		<td class="value">${USERNAME:B}</td>
+		<td class="value">$USERNAME_B</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>API Key:</nobr></td>
-		<td class="value">${APIKEY:B}</td>
+		<td class="value">$APIKEY_B</td>
 	</tr>
 </table>
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_ja_JP.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_ja_JP.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_ja_JP.html Thu Feb 16 22:42:54 2012
@@ -18,14 +18,14 @@
 <table class="displaytable">
 	<tr>
 		<td class="description"><nobr>サーバ</nobr> (URL):</td>
-		<td class="value">${SERVERLOCATION:B}</td>
+		<td class="value">$SERVERLOCATION_B</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>ユーザ名:</nobr></td>
-		<td class="value">${USERNAME:B}</td>
+		<td class="value">$USERNAME_B</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>APIキー:</nobr></td>
-		<td class="value">${APIKEY:B}</td>
+		<td class="value">$APIKEY_B</td>
 	</tr>
 </table>

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html Thu Feb 16 22:42:54 2012
@@ -18,14 +18,14 @@
 <table class="displaytable">
 	<tr>
 		<td class="description"><nobr>Max file size</nobr> (bytes):</td>
-		<td class="value">${MAXFILESIZE:B}</td>
+		<td class="value">$MAXFILESIZE_B</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>Allowed MIME types:</nobr></td>
-		<td class="value">${MIMETYPES:B}</td>
+		<td class="value">$MIMETYPES_B</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>Allowed file</nobr> extensions:</td>
-		<td class="value">${EXTENSIONS:B}</td>
+		<td class="value">$EXTENSIONS_B</td>
 	</tr>
 </table>
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_ja_JP.html?rev=1245227&r1=1245226&r2=1245227&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_ja_JP.html (original)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_ja_JP.html Thu Feb 16 22:42:54 2012
@@ -18,14 +18,14 @@
 <table class="displaytable">
 	<tr>
 		<td class="description"><nobr>最大ファイルサイズ</nobr> (バイト:):</td>
-		<td class="value">${MAXFILESIZE:B}</td>
+		<td class="value">$MAXFILESIZE_B</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>利用可能なMIMEタイプ:</nobr></td>
-		<td class="value">${MIMETYPES:B}</td>
+		<td class="value">$MIMETYPES_B</td>
 	</tr>
 	<tr>
 		<td class="description"><nobr>利用可能なファイル</nobr> 拡張子:</td>
-		<td class="value">${EXTENSIONS:B}</td>
+		<td class="value">$EXTENSIONS_B</td>
 	</tr>
 </table>