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/03/04 19:37:49 UTC

svn commit: r1296851 - in /incubator/lcf/trunk/connectors/opensearchserver/connector/src/main: java/org/apache/manifoldcf/agents/output/opensearchserver/ native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/ resources/org/apache/manifoldcf...

Author: kwright
Date: Sun Mar  4 18:37:48 2012
New Revision: 1296851

URL: http://svn.apache.org/viewvc?rev=1296851&view=rev
Log:
Revamp CMIS use of Velocity.  Part of CONNECTORS-420.

Added:
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html
      - copied, changed from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.js
      - copied, changed from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification.html
      - copied, changed from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification.js
      - copied unchanged from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification_en_US.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/hiddenConfiguration.html
      - copied unchanged from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/hiddenConfiguration_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/hiddenSpecification.html
      - copied unchanged from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/hiddenSpecification_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html
      - copied, changed from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification.html
      - copied, changed from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification_en_US.html
Removed:
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_ja_JP.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification_en_US.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification_ja_JP.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification_ja_JP.js
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/hiddenConfiguration_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/hiddenConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/hiddenSpecification_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/hiddenSpecification_ja_JP.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification_en_US.html
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification_ja_JP.html
Modified:
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties
    incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_ja_JP.properties

Modified: incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java?rev=1296851&r1=1296850&r2=1296851&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java Sun Mar  4 18:37:48 2012
@@ -60,8 +60,9 @@ public class OpenSearchServerConnector e
       OPENSEARCHSERVER_INDEXATION_ACTIVITY, OPENSEARCHSERVER_DELETION_ACTIVITY,
       OPENSEARCHSERVER_OPTIMIZE_ACTIVITY };
 
-  private final static String OPENSEARCHSERVER_TAB_OPENSEARCHSERVER = "OpenSearchServer";
-
+  private final static String OPENSEARCHSERVER_TAB_MESSAGE = "OpenSearchServerConnector.OpenSearchServer";
+  private final static String PARAMETERS_TAB_MESSAGE = "OpenSearchServerConnector.Parameters";
+      
   /** Forward to the HTML template for rendering hidden fields when the Server tab is not selected */
   private static final String HIDDEN_CONFIG_FORWARD = "hiddenConfiguration.html";
   
@@ -117,7 +118,7 @@ public class OpenSearchServerConnector e
       IHTTPOutput out, Locale locale, ConfigParams parameters, List<String> tabsArray)
       throws ManifoldCFException, IOException {
     super.outputConfigurationHeader(threadContext, out, locale, parameters, tabsArray);
-    tabsArray.add(Messages.getString(locale,"OpenSearchServerConnector.Parameters"));
+    tabsArray.add(Messages.getString(locale,PARAMETERS_TAB_MESSAGE));
     outputResource(EDIT_CONFIG_HEADER_FORWARD, out, locale, null);
   }
 
@@ -127,7 +128,7 @@ public class OpenSearchServerConnector e
       throws ManifoldCFException, IOException {
     super.outputConfigurationBody(threadContext, out, locale, parameters, tabName);
     OpenSearchServerConfig config = this.getConfigParameters(parameters);
-    if (Messages.getString(locale,"OpenSearchServerConnector.Parameters").equals(tabName)) {
+    if (Messages.getString(locale,PARAMETERS_TAB_MESSAGE).equals(tabName)) {
       outputResource(EDIT_CONFIG_FORWARD, out, locale, config);
     } else {
       outputResource(HIDDEN_CONFIG_FORWARD, out, locale, config);
@@ -139,7 +140,7 @@ public class OpenSearchServerConnector e
       Locale locale, OutputSpecification os, List<String> tabsArray)
       throws ManifoldCFException, IOException {
     super.outputSpecificationHeader(out, locale, os, tabsArray);
-    tabsArray.add(OPENSEARCHSERVER_TAB_OPENSEARCHSERVER);
+    tabsArray.add(Messages.getString(locale,OPENSEARCHSERVER_TAB_MESSAGE));
     outputResource(EDIT_SPEC_HEADER_FORWARD, out, locale, null);
   }
 
@@ -160,7 +161,7 @@ public class OpenSearchServerConnector e
       String tabName) throws ManifoldCFException, IOException {
     super.outputSpecificationBody(out, locale, os, tabName);
     OpenSearchServerSpecs specs = getSpecParameters(os);
-    if (OPENSEARCHSERVER_TAB_OPENSEARCHSERVER.equals(tabName)) {
+    if (Messages.getString(locale,OPENSEARCHSERVER_TAB_MESSAGE).equals(tabName)) {
       outputResource(EDIT_SPEC_FORWARD, out, locale, specs);
     } else {
       outputResource(HIDDEN_SPEC_FORWARD, out, locale, specs);

Modified: incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties?rev=1296851&r1=1296850&r2=1296851&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties Sun Mar  4 18:37:48 2012
@@ -13,13 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OpenSearchServerConnector.configurationJs=configuration.js
-OpenSearchServerConnector.configurationHtml=configuration.html
-OpenSearchServerConnector.specificationsHtml=specifications.html
-OpenSearchServerConnector.viewHtml=view.html
-OpenSearchServerConnector.viewSpecHtml=viewSpec.html
 OpenSearchServerConnector.Parameters=Parameters
-OpenSearchServerConnector.Optimize=Optimize
-OpenSearchServerConnector.Deletion=Deletion
-OpenSearchServerConnector.Indexation=Indexation
 
+OpenSearchServerConnector.ServerLocation=Server location
+OpenSearchServerConnector.URLColon=(URL):
+OpenSearchServerConnector.ServerLocationColon=Server location:
+OpenSearchServerConnector.IndexNameColon=Index name:
+OpenSearchServerConnector.UserNameColon=User name:
+OpenSearchServerConnector.APIKeyColon=API key:
+
+OpenSearchServerConnector.PleaseSupplyValidLocation=Please supply a valid OpenSearchServer server location
+OpenSearchServerConnector.PleaseSupplyValidIndexName=Please supply a valid index name
+
+OpenSearchServerConnector.OpenSearchServer=OpenSearchServer
+
+OpenSearchServerConnector.MaxFileSizeBytesColon=Max file size (bytes):
+OpenSearchServerConnector.AllowedMIMETypesColon=Allowed MIME types:
+OpenSearchServerConnector.AllowedFileExtensionsColon=Allowed file extensions:

Modified: incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_ja_JP.properties?rev=1296851&r1=1296850&r2=1296851&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_ja_JP.properties (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_ja_JP.properties Sun Mar  4 18:37:48 2012
@@ -13,13 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OpenSearchServerConnector.configurationJs=configuration_ja.js
-OpenSearchServerConnector.configurationHtml=configuration_ja.html
-OpenSearchServerConnector.specificationsHtml=specifications_ja.html
-OpenSearchServerConnector.viewHtml=view_ja.html
-OpenSearchServerConnector.viewSpecHtml=viewSpec_ja.html
 OpenSearchServerConnector.Parameters=引数
-OpenSearchServerConnector.Optimize=Optimize
-OpenSearchServerConnector.Deletion=Deletion
-OpenSearchServerConnector.Indexation=Indexation
 
+OpenSearchServerConnector.ServerLocation=サーバ
+OpenSearchServerConnector.URLColon=(URL):
+OpenSearchServerConnector.ServerLocationColon=サーバ:
+OpenSearchServerConnector.IndexNameColon=索引名：
+OpenSearchServerConnector.UserNameColon=ユーザ名：
+OpenSearchServerConnector.APIKeyColon=APIキー：
+
+OpenSearchServerConnector.PleaseSupplyValidLocation=正しいOpenSearchServerサーバURLを入力してください
+OpenSearchServerConnector.PleaseSupplyValidIndexName=正しい索引名を入力してください
+
+OpenSearchServerConnector.OpenSearchServer=OpenSearchServer
+
+OpenSearchServerConnector.MaxFileSizeBytesColon=最大ファイルサイズ (バイト：):
+OpenSearchServerConnector.AllowedMIMETypesColon=利用可能なMIMEタイプ：
+OpenSearchServerConnector.AllowedFileExtensionsColon=利用可能なファイル拡張子：

Copied: incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html (from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.html)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html?p2=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html&p1=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.html&r1=1296396&r2=1296851&rev=1296851&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.html (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html Sun Mar  4 18:37:48 2012
@@ -16,25 +16,28 @@
 -->
 
 <table class="displaytable">
-	<tr>
-		<td class="description"><nobr>Server Location</nobr> (URL):</td>
-		<td class="value"><input name="serverlocation"
-			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"
-			size="24" /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>User name:</nobr></td>
-		<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"
-			size="40" /></td>
-	</tr>
-</table>
\ No newline at end of file
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.ServerLocation'))</nobr>
+        $Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.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('OpenSearchServerConnector.IndexNameColon'))</nobr></td>
+    <td class="value"><input name="indexname" type="text" value="$Encoder.attributeEscape($INDEXNAME)"
+      size="24" /></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.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('OpenSearchServerConnector.APIKeyColon'))</nobr></td>
+    <td class="value"><input name="apikey" type="text" value="$Encoder.attributeEscape($APIKEY)"
+      size="40" /></td>
+  </tr>
+</table>

Copied: incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.js (from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.js)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.js?p2=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.js&p1=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.js&r1=1296396&r2=1296851&rev=1296851&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration_en_US.js (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.js Sun Mar  4 18:37:48 2012
@@ -18,25 +18,41 @@
 <script type="text/javascript">
 <!--
 function checkConfig() {
-	if (editconnection.serverlocation) {
-		if (editconnection.serverlocation.value == "") {
-			alert("Please supply a valid OpenSearchServer server location");
-			editconnection.serverlocation.focus();
-			return false;
-		}
-	}
-	if (editconnection.indexname) {
-		if (editconnection.indexname.value == "") {
-			alert("Please supply a valid index name");
-			editconnection.indexname.focus();
-			return false;
-		}
-	}
-	return true;
+  if (editconnection.serverlocation) {
+    if (editconnection.serverlocation.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('OpenSearchServerConnector.PleaseSupplyValidLocation'))");
+      editconnection.serverlocation.focus();
+      return false;
+    }
+  }
+  if (editconnection.indexname) {
+    if (editconnection.indexname.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('OpenSearchServerConnector.PleaseSupplyValidIndexName'))");
+      editconnection.indexname.focus();
+      return false;
+    }
+  }
+  return true;
 }
 
 function checkConfigForSave() {
-	return checkConfig();
+  if (editconnection.serverlocation) {
+    if (editconnection.serverlocation.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('OpenSearchServerConnector.PleaseSupplyValidLocation'))");
+      SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('OpenSearchServerConnector.OpenSearchServer'))");
+      editconnection.serverlocation.focus();
+      return false;
+    }
+  }
+  if (editconnection.indexname) {
+    if (editconnection.indexname.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('OpenSearchServerConnector.PleaseSupplyValidIndexName'))");
+      SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('OpenSearchServerConnector.OpenSearchServer'))");
+      editconnection.indexname.focus();
+      return false;
+    }
+  }
+  return true;
 }
 //-->
 </script>
\ No newline at end of file

Copied: incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification.html (from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification_en_US.html)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification.html?p2=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification.html&p1=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification_en_US.html&r1=1296396&r2=1296851&rev=1296851&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification_en_US.html (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editSpecification.html Sun Mar  4 18:37:48 2012
@@ -16,20 +16,25 @@
 -->
 
 <table class="displaytable">
-	<tr>
-		<td class="description"><nobr>Max file size</nobr> (bytes):</td>
-		<td class="value"><input name="maxfilesize"
-			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>
-	</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>
-	</tr>
-</table>
\ No newline at end of file
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.MaxFileSizeBytesColon'))</nobr>
+    </td>
+    <td class="value"><input name="maxfilesize" type="text"
+      value="$Encoder.attributeEscape($MAXFILESIZE)" size="24" /></td>
+  </tr>
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.AllowedMIMETypesColon'))</nobr>
+    </td>
+    <td class="value">
+      <textarea rows="10" cols="64" name="mimetypes">$Encoder.bodyEscape($MIMETYPES)</textarea>
+    </td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.AllowedFileExtensionsColon'))</nobr></td>
+    <td class="value">
+      <textarea rows="10" cols="12" name="extensions">$Encoder.bodyEscape($EXTENSIONS)</textarea>
+    </td>
+  </tr>
+</table>

Copied: incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html (from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration_en_US.html)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html?p2=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html&p1=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration_en_US.html&r1=1296396&r2=1296851&rev=1296851&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration_en_US.html (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html Sun Mar  4 18:37:48 2012
@@ -16,20 +16,20 @@
 -->
 
 <table class="displaytable">
-	<tr>
-		<td class="description"><nobr>Server Location</nobr> (URL):</td>
-		<td class="value">$SERVERLOCATION_B</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>Index name:</nobr></td>
-		<td class="value">$INDEXNAME_B</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>User name:</nobr></td>
-		<td class="value">$USERNAME_B</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>API Key:</nobr></td>
-		<td class="value">$APIKEY_B</td>
-	</tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.ServerLocationColon'))</nobr> (URL):</td>
+    <td class="value">$Encoder.bodyEscape($SERVERLOCATION)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.IndexNameColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($INDEXNAME)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.UserNameColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($USERNAME)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.APIKeyColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($APIKEY)</td>
+  </tr>
 </table>
\ No newline at end of file

Copied: incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification.html (from r1296396, incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification_en_US.html)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification.html?p2=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification.html&p1=incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification_en_US.html&r1=1296396&r2=1296851&rev=1296851&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification_en_US.html (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewSpecification.html Sun Mar  4 18:37:48 2012
@@ -16,16 +16,16 @@
 -->
 
 <table class="displaytable">
-	<tr>
-		<td class="description"><nobr>Max file size</nobr> (bytes):</td>
-		<td class="value">$MAXFILESIZE_B</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>Allowed MIME types:</nobr></td>
-		<td class="value">$MIMETYPES_B</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>Allowed file</nobr> extensions:</td>
-		<td class="value">$EXTENSIONS_B</td>
-	</tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.MaxFileSizeBytesColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($MAXFILESIZE)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.AllowedMIMETypesColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($MIMETYPES)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.AllowedFileExtensionsColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($EXTENSIONS)</td>
+  </tr>
 </table>
\ No newline at end of file