incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1225063 [6/10] - in /incubator/lcf/trunk: ./ connectors/activedirectory/ connectors/activedirectory/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/activedirectory/ connectors/activedirectory/connector/src/main/native...
Date Wed, 28 Dec 2011 00:42:25 GMT
Modified: incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java (original)
+++ incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java Wed Dec 28 00:42:19 2011
@@ -317,10 +317,11 @@ public class WikiConnector extends org.a
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
   @Override
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out,
+    Locale locale, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Server");
+    tabsArray.add(Messages.getString(locale,"WikiConnector.Server"));
 
     out.print(
 "<script type=\"text/javascript\">\n"+
@@ -382,7 +383,8 @@ public class WikiConnector extends org.a
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabName is the current tab name.
   */
-  public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName)
+  public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out,
+    Locale locale, ConfigParams parameters, String tabName)
     throws ManifoldCFException, IOException
   {
     String protocol = parameters.getParameter(WikiConfig.PARAM_PROTOCOL);
@@ -401,12 +403,12 @@ public class WikiConnector extends org.a
     if (path == null)
       path = "/w";
 
-    if (tabName.equals("Server"))
+    if (tabName.equals(Messages.getString(locale,"WikiConnector.Server")))
     {
       out.print(
 "<table class=\"displaytable\">\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Protocol:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.Protocol") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <select name=\"serverprotocol\">\n"+
 "        <option value=\"http\""+(protocol.equals("http")?" selected=\"true\"":"")+">http</option>\n"+
@@ -415,19 +417,19 @@ public class WikiConnector extends org.a
 "    </td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Server name:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.ServerName") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <input name=\"servername\" type=\"text\" size=\"32\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(server)+"\"/>\n"+
 "    </td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Port:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.Port") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <input name=\"serverport\" type=\"text\" size=\"5\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(port)+"\"/>\n"+
 "    </td>\n"+
 "  </tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Path name:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.PathName") + "</nobr></td>\n"+
 "    <td class=\"value\">\n"+
 "      <input name=\"serverpath\" type=\"text\" size=\"16\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(path)+"\"/>\n"+
 "    </td>\n"+
@@ -458,7 +460,8 @@ public class WikiConnector extends org.a
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
   @Override
-  public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
+  public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext,
+    Locale locale, ConfigParams parameters)
     throws ManifoldCFException
   {
     String protocol = variableContext.getParameter("serverprotocol");
@@ -488,7 +491,8 @@ public class WikiConnector extends org.a
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
   @Override
-  public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
+  public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out,
+    Locale locale, ConfigParams parameters)
     throws ManifoldCFException, IOException
   {
     out.print(
@@ -539,10 +543,10 @@ public class WikiConnector extends org.a
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
   @Override
-  public void outputSpecificationHeader(IHTTPOutput out, DocumentSpecification ds, List<String> tabsArray)
+  public void outputSpecificationHeader(IHTTPOutput out, Locale locale, DocumentSpecification ds, List<String> tabsArray)
     throws ManifoldCFException, IOException
   {
-    tabsArray.add("Namespace and Titles");
+    tabsArray.add(Messages.getString(locale,"WikiConnector.NamespaceAndTitles"));
     
     out.print(
 "<script type=\"text/javascript\">\n"+
@@ -583,10 +587,11 @@ public class WikiConnector extends org.a
   *@param tabName is the current tab name.
   */
   @Override
-  public void outputSpecificationBody(IHTTPOutput out, DocumentSpecification ds, String tabName)
+
+  public void outputSpecificationBody(IHTTPOutput out, Locale locale, DocumentSpecification ds, String tabName)
     throws ManifoldCFException, IOException
   {
-    if (tabName.equals("Namespace and Titles"))
+    if (tabName.equals(Messages.getString(locale,"WikiConnector.NamespaceAndTitles")))
     {
       boolean seenAny = false;
       // Output table column headers
@@ -594,13 +599,13 @@ public class WikiConnector extends org.a
 "<table class=\"displaytable\">\n"+
 "  <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
 "  <tr>\n"+
-"    <td class=\"description\"><nobr>Namespaces and titles:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.NamespaceAndTitles2") + "</nobr></td>\n"+
 "    <td class=\"boxcell\">\n"+
 "      <table class=\"formtable\">\n"+
 "        <tr class=\"formheaderrow\">\n"+
 "          <td class=\"formcolumnheader\"></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Namespace</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Title prefix</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.Namespace") + "</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.TitlePrefix") + "</nobr></td>\n"+
 "        </tr>\n"
       );
 
@@ -624,7 +629,7 @@ public class WikiConnector extends org.a
 "              <input type=\"hidden\" name=\""+nsOpName+"\" value=\"\"/>\n"+
 "              <input type=\"hidden\" name=\""+nsNsName+"\" value=\""+((namespace==null)?"":org.apache.manifoldcf.ui.util.Encoder.attributeEscape(namespace))+"\"/>\n"+
 "              <input type=\"hidden\" name=\""+nsTitlePrefix+"\" value=\""+((titlePrefix==null)?"":org.apache.manifoldcf.ui.util.Encoder.attributeEscape(titlePrefix))+"\"/>\n"+
-"              <input type=\"button\" value=\"Delete\" onClick='Javascript:NsDelete("+Integer.toString(k)+")' alt=\""+"Delete namespace/title #"+Integer.toString(k)+"\"/>\n"+
+"              <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"WikiConnector.Delete") + "\" onClick='Javascript:NsDelete("+Integer.toString(k)+")' alt=\""+"Delete namespace/title #"+Integer.toString(k)+"\"/>\n"+
 "            </nobr>\n"+
 "          </td>\n"+
 "          <td class=\"formcolumncell\">\n"+
@@ -646,7 +651,7 @@ public class WikiConnector extends org.a
       if (k == 0)
       {
         out.print(
-"        <tr class=\"formrow\"><td colspan=\"3\" class=\"formmessage\">No specification; all default namespace documents currently included</td></tr>\n"
+"        <tr class=\"formrow\"><td colspan=\"3\" class=\"formmessage\">" + Messages.getBodyString(locale,"WikiConnector.NoSpecification") + "</td></tr>\n"
         );
       }
 
@@ -677,13 +682,13 @@ public class WikiConnector extends org.a
 "              <a name=\""+"ns_"+Integer.toString(k)+"\"/>\n"+
 "              <input type=\"hidden\" name=\"nsop\" value=\"\"/>\n"+
 "              <input type=\"hidden\" name=\"nscount\" value=\""+Integer.toString(k)+"\"/>\n"+
-"              <input type=\"button\" value=\"Add\" onClick='Javascript:NsAdd("+Integer.toString(k)+")' alt=\"Add namespace/prefix\"/>\n"+
+"              <input type=\"button\" value=\"" + Messages.getAttributeString(locale,"WikiConnector.Add") + "\" onClick='Javascript:NsAdd("+Integer.toString(k)+")' alt=\"" + Messages.getAttributeString(locale,"WikiConnector.AddNamespacePrefix") + "\"/>\n"+
 "            </nobr>\n"+
 "          </td>\n"+
 "          <td class=\"formcolumncell\">\n"+
 "            <nobr>\n"+
 "              <select name=\"nsnsname\">\n"+
-"                <option value=\"\" selected=\"true\">-- Use default --</option>\n"
+"                <option value=\"\" selected=\"true\">-- " + Messages.getBodyString(locale,"WikiConnector.UseDefault") + " --</option>\n"
         );
         for (int l = 0 ; l < nameSpaceNames.length ; l++)
         {
@@ -709,7 +714,7 @@ public class WikiConnector extends org.a
       catch (ServiceInterruption e)
       {
         out.print(
-"        <tr class=\"formrow\"><td colspan=\"3\" class=\"formmessage\">Transient error: "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"</td></tr>\n"
+"        <tr class=\"formrow\"><td colspan=\"3\" class=\"formmessage\">" + Messages.getBodyString(locale,"WikiConnector.TransientError") + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"</td></tr>\n"
         );
       }
 
@@ -758,7 +763,7 @@ public class WikiConnector extends org.a
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
   */
   @Override
-  public String processSpecificationPost(IPostParameters variableContext, DocumentSpecification ds)
+  public String processSpecificationPost(IPostParameters variableContext, Locale locale, DocumentSpecification ds)
     throws ManifoldCFException
   {
     String countString = variableContext.getParameter("nscount");
@@ -826,7 +831,7 @@ public class WikiConnector extends org.a
   *@param ds is the current document specification for this job.
   */
   @Override
-  public void viewSpecification(IHTTPOutput out, DocumentSpecification ds)
+  public void viewSpecification(IHTTPOutput out, Locale locale, DocumentSpecification ds)
     throws ManifoldCFException, IOException
   {
     out.print(
@@ -834,12 +839,12 @@ public class WikiConnector extends org.a
 "  <tr>\n"
     );
     out.print(
-"    <td class=\"description\"><nobr>Namespace and title:</nobr></td>\n"+
+"    <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.NamespaceAndTitles2") + "</nobr></td>\n"+
 "    <td class=\"boxcell\">\n"+
 "      <table class=\"formtable\">\n"+
 "        <tr class=\"formheaderrow\">\n"+
-"          <td class=\"formcolumnheader\"><nobr>Namespace</nobr></td>\n"+
-"          <td class=\"formcolumnheader\"><nobr>Title prefix</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.Namespace") + "</nobr></td>\n"+
+"          <td class=\"formcolumnheader\"><nobr>" + Messages.getBodyString(locale,"WikiConnector.TitlePrefix") + "</nobr></td>\n"+
 "        </tr>\n"
     );
 
@@ -871,7 +876,7 @@ public class WikiConnector extends org.a
     
     if (k == 0)
       out.print(
-"        <tr class=\"formrow\"><td class=\"formmessage\" colspan=\"2\">All default namespace documents included</td></tr>\n"
+"        <tr class=\"formrow\"><td class=\"formmessage\" colspan=\"2\">" + Messages.getBodyString(locale,"WikiConnector.AllDefaultNamespaceDocumentsIncluded") + "</td></tr>\n"
       );
     
     out.print(
@@ -2519,6 +2524,7 @@ public class WikiConnector extends org.a
       this.namespaces = namespaces;
     }
 
+
     protected BaseProcessingContext createChild(String namespaceURI, String localName, String qName, Attributes atts)
     {
       return new WikiGetNamespacesQueryContext(theStream,namespaceURI,localName,qName,atts,namespaces);

Modified: incubator/lcf/trunk/connectors/wiki/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/wiki/pom.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/wiki/pom.xml (original)
+++ incubator/lcf/trunk/connectors/wiki/pom.xml Wed Dec 28 00:42:19 2011
@@ -33,11 +33,33 @@
     <testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
     <plugins>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>native2ascii-maven-plugin</artifactId>
+        <version>1.0-alpha-1</version>
+        <configuration>
+            <dest>target/classes</dest>
+            <src>connector/src/main/native2ascii</src>
+        </configuration>
+        <executions>
+            <execution>
+                <id>native2ascii-utf8</id>
+                <goals>
+                    <goal>native2ascii</goal>
+                </goals>
+                <configuration>
+                    <encoding>UTF8</encoding>
+                    <includes>**/*.properties</includes>
+                </configuration>
+            </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>**/*Postgresql*.java</exclude>
+            <exclude>**/*MySQL*.java</exclude>
           </excludes>
           <forkMode>always</forkMode>
           <workingDirectory>target/test-output</workingDirectory>

Modified: incubator/lcf/trunk/framework/agents/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/pom.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/pom.xml (original)
+++ incubator/lcf/trunk/framework/agents/pom.xml Wed Dec 28 00:42:19 2011
@@ -49,6 +49,7 @@
           <excludes>
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*HSQLDBext*.java</exclude>
+            <exclude>**/*MySQL*.java</exclude>
           </excludes>
           <forkMode>always</forkMode>
           <workingDirectory>target/test-output</workingDirectory>

Modified: incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java (original)
+++ incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/IOutputConnector.java Wed Dec 28 00:42:19 2011
@@ -173,10 +173,11 @@ public interface IOutputConnector extend
   * This method is called in the head section of a job page which has selected an output connection of the current type.  Its purpose is to add the required tabs
   * to the list, and to output any javascript methods that might be needed by the job editing HTML.
   *@param out is the output to which any HTML should be sent.
+  *@param locale is the preferred local of the output.
   *@param os is the current output specification for this job.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputSpecificationHeader(IHTTPOutput out, OutputSpecification os, List<String> tabsArray)
+  public void outputSpecificationHeader(IHTTPOutput out, Locale locale, OutputSpecification os, List<String> tabsArray)
     throws ManifoldCFException, IOException;
   
   /** Output the specification body section.
@@ -184,10 +185,11 @@ public interface IOutputConnector extend
   * The coder can presume that the HTML that is output from this configuration will be within appropriate <html>, <body>, and <form> tags.  The name of the
   * form is "editjob".
   *@param out is the output to which any HTML should be sent.
+  *@param locale is the preferred local of the output.
   *@param os is the current output specification for this job.
   *@param tabName is the current tab name.
   */
-  public void outputSpecificationBody(IHTTPOutput out, OutputSpecification os, String tabName)
+  public void outputSpecificationBody(IHTTPOutput out, Locale locale, OutputSpecification os, String tabName)
     throws ManifoldCFException, IOException;
   
   /** Process a specification post.
@@ -195,19 +197,21 @@ public interface IOutputConnector extend
   * posted.  Its purpose is to gather form information and modify the output specification accordingly.
   * The name of the posted form is "editjob".
   *@param variableContext contains the post data, including binary file-upload information.
+  *@param locale is the preferred local of the output.
   *@param os is the current output specification for this job.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
   */
-  public String processSpecificationPost(IPostParameters variableContext, OutputSpecification os)
+  public String processSpecificationPost(IPostParameters variableContext, Locale locale, OutputSpecification os)
     throws ManifoldCFException;
   
   /** View specification.
   * This method is called in the body section of a job's view page.  Its purpose is to present the output specification information to the user.
   * The coder can presume that the HTML that is output from this configuration will be within appropriate <html> and <body> tags.
   *@param out is the output to which any HTML should be sent.
+  *@param locale is the preferred local of the output.
   *@param os is the current output specification for this job.
   */
-  public void viewSpecification(IHTTPOutput out, OutputSpecification os)
+  public void viewSpecification(IHTTPOutput out, Locale locale, OutputSpecification os)
     throws ManifoldCFException, IOException;
   
 }

Modified: incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java (original)
+++ incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/interfaces/OutputConnectorFactory.java Wed Dec 28 00:42:19 2011
@@ -78,47 +78,51 @@ public class OutputConnectorFactory
 
   /** Output the configuration header section.
   */
-  public static void outputConfigurationHeader(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams parameters, ArrayList tabsArray)
+  public static void outputConfigurationHeader(IThreadContext threadContext, String className,
+    IHTTPOutput out, Locale locale, ConfigParams parameters, ArrayList tabsArray)
     throws ManifoldCFException, IOException
   {
     IOutputConnector connector = getConnector(threadContext, className);
     if (connector == null)
       return;
-    connector.outputConfigurationHeader(threadContext,out,parameters,tabsArray);
+    connector.outputConfigurationHeader(threadContext,out,locale,parameters,tabsArray);
   }
 
   /** Output the configuration body section.
   */
-  public static void outputConfigurationBody(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams parameters, String tabName)
+  public static void outputConfigurationBody(IThreadContext threadContext, String className,
+    IHTTPOutput out, Locale locale, ConfigParams parameters, String tabName)
     throws ManifoldCFException, IOException
   {
     IOutputConnector connector = getConnector(threadContext, className);
     if (connector == null)
       return;
-    connector.outputConfigurationBody(threadContext,out,parameters,tabName);
+    connector.outputConfigurationBody(threadContext,out,locale,parameters,tabName);
   }
 
   /** Process configuration post data for a connector.
   */
-  public static String processConfigurationPost(IThreadContext threadContext, String className, IPostParameters variableContext, ConfigParams configParams)
+  public static String processConfigurationPost(IThreadContext threadContext, String className,
+    IPostParameters variableContext, Locale locale, ConfigParams configParams)
     throws ManifoldCFException
   {
     IOutputConnector connector = getConnector(threadContext, className);
     if (connector == null)
       return null;
-    return connector.processConfigurationPost(threadContext,variableContext,configParams);
+    return connector.processConfigurationPost(threadContext,variableContext,locale,configParams);
   }
   
   /** View connector configuration.
   */
-  public static void viewConfiguration(IThreadContext threadContext, String className, IHTTPOutput out, ConfigParams configParams)
+  public static void viewConfiguration(IThreadContext threadContext, String className,
+    IHTTPOutput out, Locale locale, ConfigParams configParams)
     throws ManifoldCFException, IOException
   {
     IOutputConnector connector = getConnector(threadContext, className);
     // We want to be able to view connections even if they have unregistered connectors.
     if (connector == null)
       return;
-    connector.viewConfiguration(threadContext,out,configParams);
+    connector.viewConfiguration(threadContext,out,locale,configParams);
   }
 
   /** Get an output connector instance, without checking for installed connector.

Modified: incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java (original)
+++ incubator/lcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/output/BaseOutputConnector.java Wed Dec 28 00:42:19 2011
@@ -209,7 +209,20 @@ public abstract class BaseOutputConnecto
   // receives a thread context argument for all UI methods, while the second bunch does not need one (since it has already been applied via the connect()
   // method, above).
     
- 
+   /** Output the specification header section.
+  * This method is called in the head section of a job page which has selected an output connection of the current type.  Its purpose is to add the required tabs
+  * to the list, and to output any javascript methods that might be needed by the job editing HTML.
+  *@param out is the output to which any HTML should be sent.
+  *@param locale is the preferred local of the output.
+  *@param os is the current output specification for this job.
+  *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
+  */
+  public void outputSpecificationHeader(IHTTPOutput out, Locale locale, OutputSpecification os, List<String> tabsArray)
+    throws ManifoldCFException, IOException
+  {
+    outputSpecificationHeader(out,os,tabsArray);
+  }
+
   /** Output the specification header section.
   * This method is called in the head section of a job page which has selected an output connection of the current type.  Its purpose is to add the required tabs
   * to the list, and to output any javascript methods that might be needed by the job editing HTML.
@@ -239,6 +252,21 @@ public abstract class BaseOutputConnecto
   * The coder can presume that the HTML that is output from this configuration will be within appropriate <html>, <body>, and <form> tags.  The name of the
   * form is "editjob".
   *@param out is the output to which any HTML should be sent.
+  *@param locale is the preferred local of the output.
+  *@param os is the current output specification for this job.
+  *@param tabName is the current tab name.
+  */
+  public void outputSpecificationBody(IHTTPOutput out, Locale locale, OutputSpecification os, String tabName)
+    throws ManifoldCFException, IOException
+  {
+    outputSpecificationBody(out,os,tabName);
+  }
+
+  /** Output the specification body section.
+  * This method is called in the body section of a job page which has selected an output connection of the current type.  Its purpose is to present the required form elements for editing.
+  * The coder can presume that the HTML that is output from this configuration will be within appropriate <html>, <body>, and <form> tags.  The name of the
+  * form is "editjob".
+  *@param out is the output to which any HTML should be sent.
   *@param os is the current output specification for this job.
   *@param tabName is the current tab name.
   */
@@ -252,6 +280,21 @@ public abstract class BaseOutputConnecto
   * posted.  Its purpose is to gather form information and modify the output specification accordingly.
   * The name of the posted form is "editjob".
   *@param variableContext contains the post data, including binary file-upload information.
+  *@param locale is the preferred local of the output.
+  *@param os is the current output specification for this job.
+  *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
+  */
+  public String processSpecificationPost(IPostParameters variableContext, Locale locale, OutputSpecification os)
+    throws ManifoldCFException
+  {
+    return processSpecificationPost(variableContext,os);
+  }
+
+  /** Process a specification post.
+  * This method is called at the start of job's edit or view page, whenever there is a possibility that form data for a connection has been
+  * posted.  Its purpose is to gather form information and modify the output specification accordingly.
+  * The name of the posted form is "editjob".
+  *@param variableContext contains the post data, including binary file-upload information.
   *@param os is the current output specification for this job.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the job (and cause a redirection to an error page).
   */
@@ -260,7 +303,20 @@ public abstract class BaseOutputConnecto
   {
     return null;
   }
-  
+
+  /** View specification.
+  * This method is called in the body section of a job's view page.  Its purpose is to present the output specification information to the user.
+  * The coder can presume that the HTML that is output from this configuration will be within appropriate <html> and <body> tags.
+  *@param out is the output to which any HTML should be sent.
+  *@param locale is the preferred local of the output.
+  *@param os is the current output specification for this job.
+  */
+  public void viewSpecification(IHTTPOutput out, Locale locale, OutputSpecification os)
+    throws ManifoldCFException, IOException
+  {
+    viewSpecification(out,os);
+  }
+
   /** View specification.
   * This method is called in the body section of a job's view page.  Its purpose is to present the output specification information to the user.
   * The coder can presume that the HTML that is output from this configuration will be within appropriate <html> and <body> tags.

Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Wed Dec 28 00:42:19 2011
@@ -18,13 +18,13 @@
 <project default="all">
 
     <target name="clean">
-        <delete dir="build"/>
-        <delete dir="dist"/>
-        <delete dir="test-output"/>
-        <delete dir="test-output-postgresql"/>
-        <delete dir="test-output-mysql"/>
-        <delete dir="test-output-HSQLDB"/>
-        <delete dir="test-output-HSQLDBext"/>
+      <delete dir="build"/>
+      <delete dir="dist"/>
+      <delete dir="test-output"/>
+      <delete dir="test-output-postgresql"/>
+      <delete dir="test-output-mysql"/>
+      <delete dir="test-output-HSQLDB"/>
+      <delete dir="test-output-HSQLDBext"/>
     </target>
     
     <target name="doc">
@@ -50,10 +50,11 @@
         <javac srcdir="core/src/main/java" destdir="build/core/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
             <classpath>
                 <fileset dir="lib"> 
-                    <include name="*.jar"/> 
+                    <include name="*.jar"/>
                 </fileset>
             </classpath>
         </javac>
+        <native2ascii encoding="UTF-8" src="core/src/main/native2ascii" dest="build/core/classes" includes="**/*.properties" />
     </target>
 
     <target name="compile-ui-core" depends="compile-core">
@@ -198,7 +199,9 @@
 
     <target name="jar-core" depends="compile-core">
         <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-core.jar" basedir="build/core/classes"/>
+        <jar destfile="build/jar/mcf-core.jar">
+          <fileset dir="build/core/classes"/>
+        </jar>
     </target>
 
     <target name="jar-ui-core" depends="compile-ui-core">
@@ -241,6 +244,7 @@
                 <include name="commons-fileupload*.jar"/>
                 <include name="commons-httpclient-mcf.jar"/>
                 <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="jdbcpool-0.99.jar"/>
                 <include name="json.jar"/>
@@ -277,6 +281,7 @@
                 <include name="commons-fileupload*.jar"/>
                 <include name="commons-httpclient-mcf.jar"/>
                 <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="jdbcpool-0.99.jar"/>
                 <include name="json.jar"/>
@@ -319,6 +324,7 @@
                 <include name="commons-fileupload*.jar"/>
                 <include name="commons-httpclient-mcf.jar"/>
                 <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="jdbcpool-0.99.jar"/>
                 <include name="json.jar"/>
@@ -394,6 +400,7 @@
                 <include name="commons-fileupload*.jar"/>
                 <include name="commons-httpclient-mcf.jar"/>
                 <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="jdbcpool-0.99.jar"/>
                 <include name="json.jar"/>
@@ -453,6 +460,7 @@
                 <include name="commons-collections*.jar"/>
                 <include name="commons-httpclient-mcf.jar"/>
                 <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="json.jar"/>
             </fileset>
@@ -479,6 +487,7 @@
                 <include name="commons-fileupload*.jar"/>
                 <include name="commons-httpclient-mcf.jar"/>
                 <include name="commons-io*.jar"/>
+                <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="eclipse*.jar"/>
                 <include name="jasper*.jar"/>
@@ -583,7 +592,10 @@
     
     <target name="jar-core-tests" depends="compile-core-tests">
         <mkdir dir="build/test-jar"/>
-        <jar destfile="build/test-jar/mcf-core-tests.jar" basedir="build/core-tests/classes"/>
+        <jar destfile="build/test-jar/mcf-core-tests.jar">
+          <fileset dir="build/core-tests/classes"/>
+          <!-- fileset dir="core/src/test/resource"/ -->
+        </jar>
     </target>
 
     <target name="jar-agents-tests" depends="compile-agents-tests">
@@ -624,6 +636,24 @@
         </junit>
     </target>
 
+    <target name="run-UI-tests" depends="jar-core-tests">
+        <mkdir dir="test-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="*.jar"/>
+                </fileset>
+                <fileset dir="build/test-jar">
+                    <include name="mcf-core-tests.jar"/>
+                </fileset>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <test name="org.apache.manifoldcf.core.tests.HTMLTester" todir="test-output"/>
+            
+        </junit>
+    </target>
+
     <target name="run-tests" depends="compile-tests,run-script-engine-tests"/>
 
     <target name="run-tests-derby" depends="compile-tests">

Modified: incubator/lcf/trunk/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/pom.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/pom.xml (original)
+++ incubator/lcf/trunk/framework/core/pom.xml Wed Dec 28 00:42:19 2011
@@ -31,6 +31,27 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>native2ascii-maven-plugin</artifactId>
+        <version>1.0-alpha-1</version>
+        <configuration>
+            <dest>target/classes</dest>
+            <src>src/main/native2ascii</src>
+        </configuration>
+        <executions>
+            <execution>
+                <id>native2ascii-utf8</id>
+                <goals>
+                    <goal>native2ascii</goal>
+                </goals>
+                <configuration>
+                    <encoding>UTF8</encoding>
+                    <includes>**/*.properties</includes>
+                </configuration>
+            </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
@@ -55,7 +76,6 @@
     </plugins>
   </build>
 
-
   <dependencies>
     <dependency>
       <groupId>log4j</groupId>

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java Wed Dec 28 00:42:19 2011
@@ -124,6 +124,21 @@ public abstract class BaseConnector impl
   * javascript methods that might be needed by the configuration editing HTML.
   *@param threadContext is the local thread context.
   *@param out is the output to which any HTML should be sent.
+  *@param locale is the locale that the output should use.
+  *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
+  *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
+  */
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters, List<String> tabsArray)
+    throws ManifoldCFException, IOException
+  {
+    outputConfigurationHeader(threadContext,out,parameters,tabsArray);
+  }
+
+  /** Output the configuration header section.
+  * This method is called in the head section of the connector's configuration page.  Its purpose is to add the required tabs to the list, and to output any
+  * javascript methods that might be needed by the configuration editing HTML.
+  *@param threadContext is the local thread context.
+  *@param out is the output to which any HTML should be sent.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
@@ -145,6 +160,22 @@ public abstract class BaseConnector impl
   }
   
   /** Output the configuration body section.
+  * This method is called in the body section of the authority connector's configuration page.  Its purpose is to present the required form elements for editing.
+  * The coder can presume that the HTML that is output from this configuration will be within appropriate <html>, <body>, and <form> tags.  The name of the
+  * form is "editconnection".
+  *@param threadContext is the local thread context.
+  *@param out is the output to which any HTML should be sent.
+  *@param locale is the locale that the output should use.
+  *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
+  *@param tabName is the current tab name.
+  */
+  public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters, String tabName)
+    throws ManifoldCFException, IOException
+  {
+    outputConfigurationBody(threadContext,out,parameters,tabName);
+  }
+
+  /** Output the configuration body section.
   * This method is called in the body section of the connector's configuration page.  Its purpose is to present the required form elements for editing.
   * The coder can presume that the HTML that is output from this configuration will be within appropriate <html>, <body>, and <form> tags.  The name of the
   * form is "editconnection".
@@ -157,7 +188,23 @@ public abstract class BaseConnector impl
     throws ManifoldCFException, IOException
   {
   }
-  
+
+  /** Process a configuration post.
+  * This method is called at the start of the authority connector's configuration page, whenever there is a possibility that form data for a connection has been
+  * posted.  Its purpose is to gather form information and modify the configuration parameters accordingly.
+  * The name of the posted form is "editconnection".
+  *@param threadContext is the local thread context.
+  *@param variableContext is the set of variables available from the post, including binary file post information.
+  *@param locale is the locale that the output should use.
+  *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
+  *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
+  */
+  public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, Locale locale, ConfigParams parameters)
+    throws ManifoldCFException
+  {
+    return processConfigurationPost(threadContext,variableContext,parameters);
+  }
+
   /** Process a configuration post.
   * This method is called at the start of the connector's configuration page, whenever there is a possibility that form data for a connection has been
   * posted.  Its purpose is to gather form information and modify the configuration parameters accordingly.
@@ -172,7 +219,21 @@ public abstract class BaseConnector impl
   {
     return null;
   }
-  
+
+  /** View configuration.
+  * This method is called in the body section of the authority connector's view configuration page.  Its purpose is to present the connection information to the user.
+  * The coder can presume that the HTML that is output from this configuration will be within appropriate <html> and <body> tags.
+  *@param threadContext is the local thread context.
+  *@param out is the output to which any HTML should be sent.
+  *@param locale is the locale that the output should use.
+  *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
+  */
+  public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters)
+    throws ManifoldCFException, IOException
+  {
+    viewConfiguration(threadContext,out,parameters);
+  }
+
   /** View configuration.
   * This method is called in the body section of the connector's view configuration page.  Its purpose is to present the connection information to the user.
   * The coder can presume that the HTML that is output from this configuration will be within appropriate <html> and <body> tags.

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IConnector.java Wed Dec 28 00:42:19 2011
@@ -96,10 +96,11 @@ public interface IConnector
   * javascript methods that might be needed by the configuration editing HTML.
   *@param threadContext is the local thread context.
   *@param out is the output to which any HTML should be sent.
+  *@param locale is the locale that the output should use.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabsArray is an array of tab names.  Add to this array any tab names that are specific to the connector.
   */
-  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, List<String> tabsArray)
+  public void outputConfigurationHeader(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters, List<String> tabsArray)
     throws ManifoldCFException, IOException;
   
   /** Output the configuration body section.
@@ -108,10 +109,11 @@ public interface IConnector
   * form is "editconnection".
   *@param threadContext is the local thread context.
   *@param out is the output to which any HTML should be sent.
+  *@param locale is the locale that the output should use.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@param tabName is the current tab name.
   */
-  public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters, String tabName)
+  public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters, String tabName)
     throws ManifoldCFException, IOException;
   
   /** Process a configuration post.
@@ -120,10 +122,11 @@ public interface IConnector
   * The name of the posted form is "editconnection".
   *@param threadContext is the local thread context.
   *@param variableContext is the set of variables available from the post, including binary file post information.
+  *@param locale is the locale that the output should use.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   *@return null if all is well, or a string error message if there is an error that should prevent saving of the connection (and cause a redirection to an error page).
   */
-  public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
+  public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, Locale locale, ConfigParams parameters)
     throws ManifoldCFException;
   
   /** View configuration.
@@ -131,9 +134,10 @@ public interface IConnector
   * The coder can presume that the HTML that is output from this configuration will be within appropriate <html> and <body> tags.
   *@param threadContext is the local thread context.
   *@param out is the output to which any HTML should be sent.
+  *@param locale is the locale that the output should use.
   *@param parameters are the configuration parameters, as they currently exist, for this connection being configured.
   */
-  public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, ConfigParams parameters)
+  public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters)
     throws ManifoldCFException, IOException;
 
 }
\ No newline at end of file

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFResourceLoader.java?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFResourceLoader.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFResourceLoader.java Wed Dec 28 00:42:19 2011
@@ -138,7 +138,7 @@ public class ManifoldCFResourceLoader
     }
     return classLoader;
   }
-
+  
   /** Get the specified class using the proper classloader.
   *@param cname is the fully-qualified class name.
   */

Propchange: incubator/lcf/trunk/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/Javascript.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 28 00:42:19 2011
@@ -9,3 +9,4 @@
 /incubator/lcf/branches/CONNECTORS-240/legacy-tests/Javascript.py:1163953-1166425
 /incubator/lcf/branches/CONNECTORS-256/legacy-tests/Javascript.py:1172846-1182809
 /incubator/lcf/branches/CONNECTORS-32/legacy-tests/Javascript.py:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/Javascript.py:1224860-1225060

Propchange: incubator/lcf/trunk/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/VirtualBrowser.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 28 00:42:19 2011
@@ -9,3 +9,4 @@
 /incubator/lcf/branches/CONNECTORS-240/legacy-tests/VirtualBrowser.py:1163953-1166425
 /incubator/lcf/branches/CONNECTORS-256/legacy-tests/VirtualBrowser.py:1172846-1182809
 /incubator/lcf/branches/CONNECTORS-32/legacy-tests/VirtualBrowser.py:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/VirtualBrowser.py:1224860-1225060

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml Wed Dec 28 00:42:19 2011
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!DOCTYPE web-app
-	PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-	"http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
@@ -21,7 +17,10 @@
  limitations under the License.
 -->
 
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+  http://java.sun.com/xml.ns/javaee/web-app_2_5.xsd" version="2.5">
   <display-name>ManifoldCF Crawler Interface</display-name>
 
   <description>ManifoldCF Crawler Interface</description>
@@ -49,5 +48,16 @@
 	<taglib-uri>http://java.sun.com/jstl/sql</taglib-uri>
 	<taglib-location>/WEB-INF/jsp/sql.tld</taglib-location>
   </taglib>
-
+  <context-param>
+	<param-name>javax.servlet.jsp.jstl.fmt.locale</param-name>
+	<param-value>ja_JP</param-value>
+  </context-param>
+  <context-param>
+	<param-name>javax.servlet.jsp.jstl.fmt.fallbackLocale</param-name>
+	<param-value>ja_JP</param-value>
+  </context-param>
+  <context-param>
+	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+	<param-value>messages</param-value>
+  </context-param>
 </web-app>

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminDefaults.jsp Wed Dec 28 00:42:19 2011
@@ -1,5 +1,6 @@
 <%@ page language="java" %>
 <%@ page import="org.apache.manifoldcf.core.interfaces.*" %>
+<%@ page import="org.apache.manifoldcf.ui.i18n.*" %>
 <%@ page import="org.apache.manifoldcf.agents.interfaces.*" %>
 <%@ page import="org.apache.manifoldcf.authorities.interfaces.*" %>
 <%@ page import="org.apache.manifoldcf.crawler.interfaces.*" %>
@@ -49,4 +50,3 @@
 		threadContext.save("__WRAPPER__",variableContext);
 	}
 %>
-

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp Wed Dec 28 00:42:19 2011
@@ -30,6 +30,7 @@ response.setContentType("text/html;chars
 <%@ page language="java" %>
 <%@ page import="org.apache.manifoldcf.core.interfaces.*" %>
 <%@ page import="org.apache.manifoldcf.core.util.*" %>
+<%@ page import="org.apache.manifoldcf.ui.i18n.*" %>
 <%@ page import="org.apache.manifoldcf.agents.interfaces.*" %>
 <%@ page import="org.apache.manifoldcf.crawler.interfaces.*" %>
 <%@ page import="org.apache.manifoldcf.authorities.interfaces.*" %>

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/banner.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/banner.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/banner.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/banner.jsp Wed Dec 28 00:42:19 2011
@@ -33,7 +33,7 @@
           <td>
 	    <table class="headertable">
 		<tr><td class="headerdate"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(dateString)%></td></tr>
-	          <tr><td class="header">Document Ingestion</td></tr>
+	          <tr><td class="header"><%=Messages.getString(pageContext.getRequest().getLocale(),"banner.DocumentIngestion")%></td></tr>
 	    </table>
 	</td>
     </tr>

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp Wed Dec 28 00:42:19 2011
@@ -33,7 +33,7 @@ boolean maintenanceUnderway = org.apache
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		Apache ManifoldCF: Document Status
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.ApacheManifoldCFDocumentStatus")%>
 	</title>
 
 	<script type="text/javascript">
@@ -119,7 +119,7 @@ boolean maintenanceUnderway = org.apache
       <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
       <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
        <td class="window">
-	<p class="windowtitle">Document Status</p>
+	<p class="windowtitle"><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentStatus")%></p>
 <%
 if (maintenanceUnderway == false)
 {
@@ -265,9 +265,9 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1">Connection:</td><td class="value" colspan="1">
+				<td class="description" colspan="1"><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Connection")%></td><td class="value" colspan="1">
 					<select name="statusconnection" size="3">
-						<option <%=(statusConnection.length()==0)?"selected=\"selected\"":""%> value="">-- Not specified --</option>
+						<option <%=(statusConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.NotSpecified")%> --</option>
 <%
 	int i = 0;
 	while (i < connList.length)
@@ -288,7 +288,7 @@ if (maintenanceUnderway == false)
 	if (eligibleList != null)
 	{
 %>
-				<td class="description" colspan="1">Jobs:</td><td class="value" colspan="1">
+				<td class="description" colspan="1"><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Jobs")%></td><td class="value" colspan="1">
 					<select multiple="true" name="statusjobs" size="3">
 <%
 	    i = 0;
@@ -319,35 +319,35 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description">Time offset from now (minutes):</td>
+				<td class="description"><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.TimeOffsetFromNowMinutes")%></td>
 				<td class="value" colspan="3">
 					<input name="statusscheduleoffset" type="text" size="6" value=""/>
 				</td>
 			</tr>
 			<tr>
-				<td class="description">Document state:</td>
+				<td class="description"><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
 				<td class="value" colspan="3">
 					<input name="statusdocumentstates_posted" type="hidden" value="true"/>
 					<select name="statusdocumentstates" multiple="true" size="3">
-						<option <%=((matchingStatesHash.get(new Integer(IJobManager.DOCSTATE_NEVERPROCESSED))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATE_NEVERPROCESSED)%>'>Documents that have never been processed</option>
-						<option <%=((matchingStatesHash.get(new Integer(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED)%>'>Documents processed at least once</option>
+						<option <%=((matchingStatesHash.get(new Integer(IJobManager.DOCSTATE_NEVERPROCESSED))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATE_NEVERPROCESSED)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsThatHaveNeverBeenProcessed")%></option>
+						<option <%=((matchingStatesHash.get(new Integer(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsProcessedAtLeastOnce")%></option>
 					</select>
 				</td>
 			</tr>
 			<tr>
-				<td class="description">Document status:</td>
+				<td class="description"><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
 				<td class="value" colspan="3">
 					<input name="statusdocumentstatuses_posted" type="hidden" value="true"/>
 					<select name="statusdocumentstatuses" multiple="true" size="3">
-						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_INACTIVE))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_INACTIVE)%>'>Documents that are no longer active</option>
-						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_PROCESSING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_PROCESSING)%>'>Documents currently in progress</option>
-						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_EXPIRING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_EXPIRING)%>'>Documents currently being expired</option>
-						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_DELETING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_DELETING)%>'>Documents currently being deleted</option>
-						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_READYFORPROCESSING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_READYFORPROCESSING)%>'>Documents currently available for processing</option>
-						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_READYFOREXPIRATION))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_READYFOREXPIRATION)%>'>Documents currently available for expiration</option>
-						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_WAITINGFORPROCESSING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFORPROCESSING)%>'>Documents not yet processable</option>
-						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION)%>'>Documents not yet expirable</option>
-						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_WAITINGFOREVER))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREVER)%>'>Documents waiting forever</option>
+						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_INACTIVE))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_INACTIVE)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsThatAreNoLongerActive")%></option>
+						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_PROCESSING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_PROCESSING)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyInProgress")%></option>
+						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_EXPIRING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_EXPIRING)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyBeingExpired")%></option>
+						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_DELETING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_DELETING)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyBeingDeleted")%></option>
+						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_READYFORPROCESSING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_READYFORPROCESSING)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyAvailableForProcessing")%></option>
+						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_READYFOREXPIRATION))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_READYFOREXPIRATION)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyAvailableForExpiration")%></option>
+						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_WAITINGFORPROCESSING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFORPROCESSING)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsNotYetProcessable")%></option>
+						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREXPIRATION)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsNotYetExpirable")%></option>
+						<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_WAITINGFOREVER))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_WAITINGFOREVER)%>'><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsWaitingForever")%></option>
 					</select>
 				</td>
 			</tr>
@@ -355,7 +355,7 @@ if (maintenanceUnderway == false)
 				<td class="separator" colspan="4"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description"><nobr>Document identifier match:</nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.DocumentIdentifierMatch")%></nobr></td>
 				<td class="value" colspan="3"><input type="text" name="statusidentifiermatch" size="40" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(identifierMatch)%>'/></td>
 			</tr>
 			<tr>
@@ -367,13 +367,13 @@ if (maintenanceUnderway == false)
 	if (statusConnection.length() > 0 && statusJobIdentifiers.length > 0)
 	{
 %>
-					<a name="MainButton"><input type="button" value="Go" onClick="javascript:Go()" alt="Execute this query"/></a>
+					<a name="MainButton"><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Go")%>" onClick="javascript:Go()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%>"/></a>
 <%
 	}
 	else
 	{
 %>
-					<a name="MainButton"><input type="button" value="Continue" onClick="javascript:Continue()" alt="Continue"/></a>
+					<a name="MainButton"><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>"/></a>
 <%
 	}
 %>
@@ -438,14 +438,14 @@ if (maintenanceUnderway == false)
 
 		<table class="displaytable">
 		    <tr class="headerrow">
-			<td class="reportcolumnheader"><nobr>Identifier</nobr></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("job");'><nobr>Job</nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("state");'><nobr>State</nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("status");'><nobr>Status</nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("scheduled");'><nobr>Scheduled</nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("action");'><nobr>Scheduled Action</nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("retrycount");'><nobr>Retry Count</nobr></a></td>
-			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("retrylimit");'><nobr>Retry Limit</nobr></a></td>
+			<td class="reportcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Identifier")%></nobr></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("job");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Job")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("state");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.State")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("status");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Status")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("scheduled");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Scheduled")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("action");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.ScheduledAction")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("retrycount");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.RetryCount")%></nobr></a></td>
+			<td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("retrylimit");'><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.RetryLimit")%></nobr></a></td>
 		    </tr>
 <%
 		zz = 0;
@@ -513,7 +513,7 @@ if (maintenanceUnderway == false)
 		if (startRow == 0)
 		{
 %>
-				Previous
+				<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%>
 <%
 		}
 		else
@@ -528,7 +528,7 @@ if (maintenanceUnderway == false)
 		if (hasMoreRows == false)
 		{
 %>
-				Next
+				<%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Next")%>
 <%
 		}
 		else
@@ -540,8 +540,8 @@ if (maintenanceUnderway == false)
 %>
 				</nobr>
 			</td>
-			<td class="description"><nobr>Rows:</nobr></td><td class="value"><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></td>
-			<td class="description"><nobr>Rows per page:</nobr></td>
+			<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.Rows")%></nobr></td><td class="value"><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></td>
+			<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.RowsPerPage")%></nobr></td>
 			<td class="value">
 				<input type="text" name="rowcount" size="5" value='<%=Integer.toString(rowCount)%>'/>
 			</td>
@@ -556,14 +556,14 @@ if (maintenanceUnderway == false)
 	    else
 	    {
 %>
-		<table class="displaytable"><tr><td class="message">Please select at least one job</td></tr></table>
+		<table class="displaytable"><tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectAtLeastOneJob")%></td></tr></table>
 <%
 	    }
 	}
 	else
 	{
 %>
-		<table class="displaytable"><tr><td class="message">Please select a connection</td></tr></table>
+		<table class="displaytable"><tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectaConnection")%></td></tr></table>
 <%
 	}
 %>
@@ -575,7 +575,7 @@ else
 %>
 		<table class="displaytable">
 			<tr><td class="separator" colspan="1"><hr/></td></tr>
-			<tr><td class="message">This page is unavailable due to maintenance operations.  Please try again later.</td></tr>
+			<tr><td class="message"><%=Messages.getString(pageContext.getRequest().getLocale(),"documentstatus.PleaseTryAgainLater")%></td></tr>
 		</table>
 <%
 }

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp Wed Dec 28 00:42:19 2011
@@ -36,7 +36,7 @@
 	// Figure out what the current tab name is.
 	String tabName = variableContext.getParameter("tabname");
 	if (tabName == null || tabName.length() == 0)
-		tabName = "Name";
+		tabName = Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name");
 
 	String connectionName = null;
 	IAuthorityConnection connection = (IAuthorityConnection)threadContext.get("ConnectionObject");
@@ -79,10 +79,10 @@
 	ArrayList tabsArray = new ArrayList();
 
 	// Set up the predefined tabs
-	tabsArray.add("Name");
-	tabsArray.add("Type");
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type"));
 	if (className.length() > 0)
-		tabsArray.add("Throttling");
+		tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Throttling"));
 
 %>
 
@@ -93,7 +93,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		Apache ManifoldCF: Edit Authority
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ApacheManifoldCFEditAuthority")%>
 	</title>
 
 	<script type="text/javascript">
@@ -141,7 +141,7 @@
 			if (editconnection.connname.value == "")
 			{
 				alert("Connection must have a name");
-				SelectTab("Name");
+				SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name"));
 				document.editconnection.connname.focus();
 				return;
 			}
@@ -211,7 +211,7 @@
 	//-->
 	</script>
 <%
-	AuthorityConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),parameters,tabsArray);
+	AuthorityConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),parameters,tabsArray);
 
 	// Get connectors, since this will be needed to determine what to display.
 	IResultSet set = connectorManager.getConnectors();
@@ -270,13 +270,13 @@
 	  if (description.length() > 0)
 	  {
 %>
-			  <nobr>Edit authority '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
+			  <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.EditAuthority")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
 <%
 	  }
 	  else
 	  {
 %>
-		          <nobr>Edit an Authority</nobr>
+		          <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.EditAnAuthority")%></nobr>
 <%
 	  }
 %>
@@ -288,13 +288,13 @@
 <%
 
 	  // Name tab
-	  if (tabName.equals("Name"))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name")))
 	  {
 %>
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr>Name:</nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name")%></nobr></td><td class="value" colspan="4">
 <%
 	    // If the connection doesn't exist yet, we are allowed to change the name.
 	    if (connection == null)
@@ -314,7 +314,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr>Description:</nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Description")%></nobr></td><td class="value" colspan="4">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -332,13 +332,13 @@
 
 
 	  // "Type" tab
-	  if (tabName.equals("Type"))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
 	  {
 %>
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr>Connection type:</nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ConnectionType")%></nobr></td><td class="value" colspan="4">
 <%
 	    if (className.length() > 0)
 	    {
@@ -395,13 +395,13 @@
 
 
 	  // The "Throttling" tab
-	  if (tabName.equals("Throttling"))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Throttling")))
 	  {
 %>
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr>Max connections</nobr><br/><nobr>(per JVM):</nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.MaxConnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.PerJVM")%></nobr></td>
 				<td class="value" colspan="4"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 		    </table>
@@ -416,7 +416,7 @@
 	  }
 
 	  if (className.length() > 0)
-		AuthorityConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),parameters,tabName);
+		AuthorityConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),parameters,tabName);
 %>
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="4"><hr/></td></tr>
@@ -425,20 +425,20 @@
 	  if (className.length() > 0)
 	  {
 %>
-			    <input type="button" value="Save" onClick="javascript:Save()" alt="Save this authority connection"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.SaveThisAuthorityConnection")%>"/>
 <%
 	  }
 	  else
 	  {
-		if (tabName.equals("Type"))
+		if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
 		{
 %>
-			    <input type="button" value="Continue" onClick="javascript:Continue()" alt="Continue to next page"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.ContinueToNextPage")%>"/>
 <%
 		}
 	  }
 %>
-			    &nbsp;<input type="button" value="Cancel" onClick="javascript:Cancel()" alt="Cancel authority editing"/></nobr></td>
+			    &nbsp;<input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editauthority.CancelAuthorityEditing")%>"/></nobr></td>
 			</tr>
 		    </table>
 		</td>

Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp?rev=1225063&r1=1225062&r2=1225063&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp (original)
+++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/editconnection.jsp Wed Dec 28 00:42:19 2011
@@ -37,7 +37,7 @@
 	// Figure out what the current tab name is.
 	String tabName = variableContext.getParameter("tabname");
 	if (tabName == null || tabName.length() == 0)
-		tabName = "Name";
+		tabName = Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name");
 
 	String connectionName = null;
 	IRepositoryConnection connection = (IRepositoryConnection)threadContext.get("ConnectionObject");
@@ -96,10 +96,10 @@
 	ArrayList tabsArray = new ArrayList();
 
 	// Set up the predefined tabs
-	tabsArray.add("Name");
-	tabsArray.add("Type");
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name"));
+	tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Type"));
 	if (className.length() > 0)
-		tabsArray.add("Throttling");
+		tabsArray.add(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Throttling"));
 
 %>
 
@@ -110,7 +110,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
 	<title>
-		Apache ManifoldCF: Edit Connection
+		<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ApacheManifoldCFEditConnection")%>
 	</title>
 
 	<script type="text/javascript">
@@ -159,7 +159,7 @@
 			if (editconnection.connname.value == "")
 			{
 				alert("Connection must have a name");
-				SelectTab("Name");
+				SelectTab(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name"));
 				document.editconnection.connname.focus();
 				return;
 			}
@@ -254,7 +254,7 @@
 	//-->
 	</script>
 <%
-	RepositoryConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),parameters,tabsArray);
+	RepositoryConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),parameters,tabsArray);
 %>
 
 </head>
@@ -310,13 +310,13 @@
 	  if (description.length() > 0)
 	  {
 %>
-			  <nobr>Edit connection '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
+			  <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.EditConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
 <%
 	  }
 	  else
 	  {
 %>
-		          <nobr>Edit a Connection</nobr>
+		          <nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.EditAConnection")%></nobr>
 <%
 	  }
 %>
@@ -327,13 +327,13 @@
 <%
 
 	  // Name tab
-	  if (tabName.equals("Name"))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name")))
 	  {
 %>
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr>Name:</nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Name")%></nobr></td><td class="value" colspan="4">
 <%
 	    // If the connection doesn't exist yet, we are allowed to change the name.
 	    if (connection == null)
@@ -353,7 +353,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr>Description:</nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Description")%></nobr></td><td class="value" colspan="4">
 					<input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 				</td>
 			</tr>
@@ -371,13 +371,13 @@
 
 
 	  // "Type" tab
-	  if (tabName.equals("Type"))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Type")))
 	  {
 %>
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="5"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr>Connection type:</nobr></td><td class="value" colspan="4">
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ConnectionType")%></nobr></td><td class="value" colspan="4">
 <%
 	    if (className.length() > 0)
 	    {
@@ -422,14 +422,14 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="description"><nobr>Authority:</nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Authority")%></nobr></td>
 				<td class="value" colspan="4">
 <%
 	    IAuthorityConnection[] set2 = authConnectionManager.getAllConnections();
 	    int i = 0;
 %>
 					<select name="authorityname" size="1">
-						<option value="_none_" <%=(authorityName==null)?"selected=\"selected\"":""%>>None (global authority)</option>
+						<option value="_none_" <%=(authorityName==null)?"selected=\"selected\"":""%>><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.GlobalAuthority")%></option>
 <%
 	    while (i < set2.length)
 	    {
@@ -464,29 +464,29 @@
 %>
 		    <input type="hidden" name="throttlecount" value='<%=Integer.toString(throttles.size())%>'/>
 <%
-	  if (tabName.equals("Throttling"))
+	  if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Throttling")))
 	  {
 %>
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="2"><hr/></td></tr>
 			<tr>
-				<td class="description"><nobr>Max connections</nobr><br/><nobr>(per JVM):</nobr></td>
+				<td class="description"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Maxconnections")%></nobr><br/><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.PerJVM")%></nobr></td>
 				<td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="2"><hr/></td>
 			</tr>
 			<tr>
-				<td class="description" colspan="1"><nobr>Throttling:</nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Throttling")%></nobr></td>
 				<td class="boxcell" colspan="4">
 					<input type="hidden" name="throttleop" value="Continue"/>
 					<input type="hidden" name="throttlenumber" value=""/>
 					<table class="formtable">
 					    <tr class="formheaderrow">
 						<td class="formcolumnheader"></td>
-						<td class="formcolumnheader"><nobr>Bin regular expression</nobr></td>
-						<td class="formcolumnheader"><nobr>Description</nobr></td>
-						<td class="formcolumnheader"><nobr>Max avg fetches/min</nobr></td>
+						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.BinRegularExpression")%></nobr></td>
+						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Description2")%></nobr></td>
+						<td class="formcolumnheader"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.MaxAvgFetchesMin")%></nobr></td>
 					    </tr>
 <%
 		int k = 0;
@@ -525,13 +525,13 @@
 		if (k == 0)
 		{
 %>
-					    <tr class="formrow"><td colspan="4" class="formcolumnmessage"><nobr>No throttling specified</nobr></td></tr>
+					    <tr class="formrow"><td colspan="4" class="formcolumnmessage"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.NoThrottlingSpecified")%></nobr></td></tr>
 <%
 		}
 %>
 					    <tr class="formrow"><td colspan="4" class="formseparator"><hr/></td></tr>
 					    <tr class="formrow">
-						<td class="formcolumncell"><input type="button" value="Add" alt="Add throttle" onclick="javascript:AddThrottle();"/></td>
+						<td class="formcolumncell"><input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Add")%>" alt="Add throttle" onclick="javascript:AddThrottle();"/></td>
 						<td class="formcolumncell"><input type="text" name="throttle" size="30" value=""/></td>
 						<td class="formcolumncell"><input type="text" name="throttledesc" size="30" value=""/></td>
 						<td class="formcolumncell"><input type="text" name="throttlevalue" size="5" value=""/></td>
@@ -567,7 +567,7 @@
 	  }
 
 	  if (className.length() > 0)
-		RepositoryConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),parameters,tabName);
+		RepositoryConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),parameters,tabName);
 %>
 		    <table class="displaytable">
 			<tr><td class="separator" colspan="4"><hr/></td></tr>
@@ -576,20 +576,20 @@
 	  if (className.length() > 0)
 	  {
 %>
-			    <input type="button" value="Save" onClick="javascript:Save()" alt="Save this connection"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.SaveThisAuthorityConnection")%>"/>
 <%
 	  }
 	  else
 	  {
-		if (tabName.equals("Type"))
+		if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Type")))
 		{
 %>
-			    <input type="button" value="Continue" onClick="javascript:Continue()" alt="Continue to next page"/>
+			    <input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.ContinueToNextPage")%>"/>
 <%
 		}
 	  }
 %>
-			    &nbsp;<input type="button" value="Cancel" onClick="javascript:Cancel()" alt="Cancel connection editing"/></nobr></td>
+			    &nbsp;<input type="button" value="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getString(pageContext.getRequest().getLocale(),"editconnection.CancelConnectionEditing")%>"/></nobr></td>
 			</tr>
 		    </table>
 		</td>



Mime
View raw message