geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r609207 [4/8] - in /geronimo/server/trunk/plugins/console: console-base-portlets/src/main/resources/ console-base-portlets/src/main/webapp/WEB-INF/view/ajax/ console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ console-base-portlet...
Date Sat, 05 Jan 2008 20:22:38 GMT
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp Sat Jan  5 12:22:33 2008
@@ -15,6 +15,8 @@
    limitations under the License.
 --%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 <script type='text/javascript' src='/console/dwr/interface/ProgressMonitor.js'></script>
 <script type='text/javascript' src='/console/dwr/engine.js'></script>
@@ -55,7 +57,7 @@
 
 function <portlet:namespace/>startProgress()
 {
-    document.getElementById('<portlet:namespace/>progressMeterMainMessage').innerHTML = 'Processing...';
+    document.getElementById('<portlet:namespace/>progressMeterMainMessage').innerHTML = '<fmt:message key="ajax.progressbar.processing"/>';
     document.getElementById('<portlet:namespace/>progressMeter').style.display = 'block';
     metadata = {};
     metadata.errorHandler=<portlet:namespace/>onError;

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ajpPort.jsp Sat Jan  5 12:22:33 2008
@@ -16,8 +16,10 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<p><b>Apache mod_jk</b> -- AJP Port</p>
+<p><fmt:message key="apache.jk.ajpPort.title"/></p>
 
 <!-- FORM TO COLLECT DATA FOR THIS PAGE -->
 <form name="<portlet:namespace/>ApacheForm" action="<portlet:actionURL/>">
@@ -36,22 +38,21 @@
     <table border="0">
         <!-- ENTRY FIELD: AJP Port -->
         <tr>
-            <th><div align="right">Network Port for AJP:</div></th>
+            <th><div align="right"><fmt:message key="apache.jk.ajpPort.networkPort"/>:</div></th>
             <td><input name="addAjpPort" type="text" size="5" maxlength="5"
                        value="${model.addAjpPort}"/></td>
         </tr>
         <tr>
             <td></td>
-            <td><tt>mod_jk</tt> talks to the Geronimo web container using a protocol called
-              AJP.  Currently, you do not have an AJP protocol listener configured for the
-              web container.  Select a network port here, and an AJP protocol listener will
-              be added for you.</td>
+            <td>
+            <fmt:message key="apache.jk.ajpPort.networkPortExplanation"/>
+            </td>
         </tr>
 
         <!-- SUBMIT BUTTON -->
         <tr>
             <td></td>
-            <td><input type="submit" value="Next"/></td>
+            <td><input type="submit" value="<fmt:message key="consolebase.common.next"/>"/></td>
         </tr>
     </table>
 </form>
@@ -60,4 +61,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/config.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/config.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/config.jsp Sat Jan  5 12:22:33 2008
@@ -16,8 +16,10 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<p><b>Apache mod_jk</b> -- Basic Configuration</p>
+<p><fmt:message key="apache.jk.config.title"/></p>
 
 <!-- FORM TO COLLECT DATA FOR THIS PAGE -->
 <form name="<portlet:namespace/>ApacheForm" action="<portlet:actionURL/>">
@@ -34,7 +36,7 @@
     <table border="0">
         <!-- ENTRY FIELD: OS -->
         <tr>
-            <th><div align="right">Operating System:</div></th>
+            <th><div align="right"><fmt:message key="apache.jk.config.operatingSystem"/>:</div></th>
             <td>
                 <select name="os">
                     <option></option>
@@ -50,44 +52,36 @@
         </tr>
         <tr>
             <td></td>
-            <td>The process for installing <tt>mod_jk</tt> depends on the operating system. For some,
-                we can provide specific guidance. For others, you'll have to install <tt>mod_jk</tt>
-                on your own.
+            <td><fmt:message key="apache.jk.config.operatingSystemExplanation"/>            
             </td>
         </tr>
 
         <!-- ENTRY FIELD: workers.properties path -->
         <tr>
-            <th><div align="right">Path to <tt>workers.properties</tt>:</div></th>
+            <th><div align="right"><fmt:message key="apache.jk.config.pathToProperties"/>:</div></th>
             <td><input name="workersPath" type="text" size="30" maxlength="255"
                        value="${model.workersPath}"/></td>
         </tr>
         <tr>
             <td></td>
-            <td><tt>mod_jk</tt> requires a file called <tt>workers.properties</tt> to specify which
-              app servers can be contacted on which network ports, etc.  This tool will generate the
-              contents for the <tt>workers.properties</tt> file, but it also needs to point to this
-              file in the Apache configuration data, so we need to know where you plan to put this
-              file.</td>
+            <td><fmt:message key="apache.jk.config.pathToPropertiesExplanation"/></td>
         </tr>
 
         <!-- ENTRY FIELD: log file path -->
         <tr>
-            <th><div align="right"><tt>mod_jk</tt> log file location:</div></th>
+            <th><div align="right"><fmt:message key="apache.jk.config.logFileLocation"/>:</div></th>
             <td><input name="logFilePath" type="text" size="30" maxlength="255"
                        value="${model.logFilePath}"/></td>
         </tr>
         <tr>
             <td></td>
-            <td><tt>mod_jk</tt> writes to a log file in a location you choose.  The log file
-              location needs to be set in the Apache configuration.  Please select the location
-              where the <tt>mod_jk</tt> log file should be written.</td>
+            <td><fmt:message key="apache.jk.config.logFileLoctionExplanation"/></td>
         </tr>
 
         <!-- SUBMIT BUTTON -->
         <tr>
             <td></td>
-            <td><input type="submit" value="Next"/></td>
+            <td><input type="submit" value='<fmt:message key="consolebase.common.next"/>'/></td>
         </tr>
     </table>
 </form>
@@ -96,4 +90,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/index.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/index.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/index.jsp Sat Jan  5 12:22:33 2008
@@ -16,28 +16,11 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<p>This tool walks you through the process of configuring access to Geronimo
-   through the Apache 2 HTTP server using the <tt>mod_jk</tt> Apache module.
-   There are several steps needed to do this:</p>
-<ol>
-    <li>Configure the Geronimo web container to support the AJP protocol</li>
-    <li>Install the <tt>mod_jk.so</tt> Apache module (compiling it if necessary)</li>
-    <li>Create a <tt>workers.properties</tt> configuration file to point Apache to the
-       Geronimo AJP connector</li>
-    <li>Add Apache configuration information indicating which URLs should be sent to
-       Geronimo and whether Apache should serve static content (leaving only
-       dynamic content within the web application to Geronimo)</li>
-</ol>
-<p>By answering a few questions here, we can give you specific guidance and generate
-  configuration information you can use.</p>
-<p>Notes:</p>
-<ul>
-    <li>Geronimo does not remember previous settings generated using this tool;
-        you'll need to reenter all the data each time, or just paste the new
-        information into your existing configuration files.</li>
-    <li>Any web applications to be exposed via Apache must be running when you
-        run this tool, and of course must be running to be accessed from Apache.</li>
-</ul>
-
-<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /></portlet:actionURL>">Get Started</a>
+<p><fmt:message key="apache.jk.index.frag1"/></p>
+<fmt:message key="apache.jk.index.severalSteps"/>
+<p><fmt:message key="apache.jk.index.frag2"/></p>
+<fmt:message key="apache.jk.index.notes"/>
+<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /></portlet:actionURL>"><fmt:message key="apache.jk.index.getStarted"/></a>
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/results.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/results.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/results.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/results.jsp Sat Jan  5 12:22:33 2008
@@ -17,6 +17,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 <input type="hidden" name="mode" value="results-after"/>
@@ -24,89 +26,71 @@
 <input type="hidden" name="addAjpPort" value="${model.addAjpPort}"/>
 <input type="hidden" name="workersPath" value="${model.workersPath}"/>
 <input type="hidden" name="logFilePath" value="${model.logFilePath}"/>
+<p><fmt:message key="apache.jk.results.title"/></p>
 
+<p><fmt:message key="apache.jk.results.summary"/></p>
 
-<p><b>Apache mod_jk</b> -- Configuration Results</p>
+<h2><fmt:message key="apache.jk.results.step1"/></h2>
 
-<p>This page lists the things you must do to enable <tt>mod_jk</tt> in Apache
-    and configure it to talk to Geronimo.</p>
-
-<h2>Step 1: Configure Geronimo for AJP</h2>
 
 <c:choose>
     <c:when test="${empty model.addAjpPort}">
-        <p>This Geronimo configuration already has an AJP listener running on port ${ajpPort}.
-            Nothing further needs to be done here.</p>
+        <p><fmt:message key="apache.jk.results.alreadyHasAJPListener"><fmt:param value="${ajpPort}"/></fmt:message>
+        </p>
     </c:when>
     <c:otherwise>
-        <p>An AJP listener was added on port ${ajpPort}.  Nothing further needs to be done here.</p>
+        <p><fmt:message key="apache.jk.results.anAJPLisstnerAdded"><fmt:param value="${ajpPort}"/></fmt:message>
+        </p>
     </c:otherwise>
 </c:choose>
-
-<h2>Step 2: Install <tt>mod_jk</tt></h2>
-
+<h2><fmt:message key="apache.jk.results.step2"/></h2>
 <c:choose>
     <c:when test="${model.os != '' && model.os != 'Other'}">
-        <p>On ${model.os}, you can install <tt>mod_jk</tt> using an RPM.  This does
-        not activate it in Apache, but it at least installs the binary in the right
-        location.  To install, find the following RPM on your install media and
-        run a command like this:</p>
+        <p>
+    <fmt:message key="apache.jk.results.step2_installUsingRPM">
+    <fmt:param value="${model.os}" />
+    </fmt:message>
+    </p>
         <pre>
 rpm -Uvh <c:choose><c:when test="${model.os == 'Fedora Core 4'}">mod_jk-1.2.6-3jpp_4fc.i586.rpm</c:when><c:when test="${model.os == 'SuSE Pro 9.0'}">apache2-jakarta-tomcat-connectors-4.1.27-32.i586.rpm</c:when><c:when test="${model.os == 'SuSE Pro 9.1'}">apache2-jakarta-tomcat-connectors-5.0.19-13.i586.rpm</c:when><c:when test="${model.os == 'SuSE Pro 9.2'}">mod_jk-ap20-4.1.30-3.i586.rpm</c:when><c:when test="${model.os == 'SuSE Pro 9.3'}">mod_jk-ap20-4.1.30-3.i586.rpm</c:when><c:when test="${model.os == 'SuSE Linux 10.0'}">mod_jk-ap20-4.1.30-3.i586.rpm</c:when></c:choose>
         </pre>
-        <p>Once the <tt>mod_jk</tt> RPM is installed, you can activate it by
+        <p><fmt:message key="apache.jk.results.canActivateIt"/>        
    <c:choose>
      <c:when test="${fn:startsWith(model.os, 'SuSE')}">
-          editing <tt>/etc/sysconfig/apache2</tt> and adding <tt>jk</tt> to the value configured for
-          <tt>APACHE_MODULES</tt> and then running (as root) <tt>SuSEconfig</tt> followed by
-          <tt>rcapache2 start</tt> (or <tt>rcapache2 restart</tt>).
+      <fmt:message key="apache.jk.results.howToActivateifOsSuSE"/>
      </c:when>
      <c:otherwise>
-          adding the following line to <tt>/etc/httpd/conf/httpd.conf</tt>:</p>
-<pre>
-LoadModule jk_module modules/mod_jk.so
-</pre>
-        <p>Then you can start Apache by running <tt>service httpd start</tt> (or <tt>service httpd restart</tt>).
+     <fmt:message key="apache.jk.results.howToActivateOthers"/>
      </c:otherwise>
    </c:choose>
         </p>
     </c:when><c:otherwise>
-        <p>Based on your operating system selection, I don't have specific instructions
-            to install <tt>mod_jk</tt>.  You may be able to get a binary release from
-            <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/</a>.
-            Otherwise, you'll have to build from source.</p>
-        <p>To enable <tt>mod_jk</tt> in Apache, you typically need to install the <tt>.so</tt> (Linux/UNIX/Mac OS X)
-          or <tt>.dll</tt> (Windows) and then add a line to the <tt>httpd.conf</tt> file like this:</p>
-<pre>
-LoadModule jk_module modules/mod_jk.so
-</pre>
-        <p>Finally, start or restart Apache.</p>
+    <fmt:message key="apache.jk.results.noInstructionsToInstall"/>
     </c:otherwise>
 </c:choose>
-
-<h2>Step 3: Create a <tt>workers.properties</tt> file</h2>
-
-<p>You've decided to save this file at <tt>${model.workersPath}</tt>.  Please save the following content
-  to that file.</p>
+<h2><fmt:message key="apache.jk.results.step3"/></h2>
+<p>
+<fmt:message key="apache.jk.results.saveFollowingToFile">
+    <fmt:param value="${model.workersPath}" />
+    </fmt:message>
+</p>
 <pre>
 worker.list=geronimo_ajp13
 worker.geronimo_ajp13.port=${ajpPort}
 worker.geronimo_ajp13.host=localhost
 worker.geronimo_ajp13.type=ajp13
 </pre>
+<h2><fmt:message key="apache.jk.results.step4"/></h2>
 
-<h2>Step 4: Apache Configuration</h2>
+<p><fmt:message key="apache.jk.results.followingInfoToConfig"/></p>
 
-<p>The following information needs to go into your Apache Configuration.</p>
 
 <c:choose>
   <c:when test="${fn:startsWith(model.os, 'SuSE')}">
-       <p>For SuSE, this should be saved to a file in the Apache conf.d directory, e.g.
-         write this content to <tt>/etc/apache2/conf.d/geronimo-jk.conf</tt></p>
+  <p><fmt:message key="apache.jk.results.saveWhereIfSuSE"/></p>
   </c:when>
   <c:otherwise>
-      <p>This information should be added to the Apache configuration file.  This is often
-      at a location such as <tt>/etc/httpd/conf/httpd.conf</tt></p>
+  <p><fmt:message key="apache.jk.results.saveWhereOthwise"/></p>
   </c:otherwise>
 </c:choose>
 
@@ -129,13 +113,12 @@
 </c:if></c:if></c:forEach>
 &lt;/IfModule&gt;
 </pre>
-
-<h2>Step 5: Restart Apache</h2>
-
-<p>With those steps completed, Apache should be ready to go!  Start Geronimo and restart Apache
-and try accessing a Geronimo web application through an Apache URL.  If there are any problems,
-check the Apache error log, and the mod_jk error log (at <tt>${model.logFilePath}</tt>).</p>
-
+<h2><fmt:message key="apache.jk.results.step5"/></h2>
+<p>
+<fmt:message key="apache.jk.results.step5Content">
+<fmt:param  value="${model.logFilePath}" />
+</fmt:message>
+</p>
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Done</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.done"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/webApps.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/webApps.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/webApps.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/webApps.jsp Sat Jan  5 12:22:33 2008
@@ -16,20 +16,12 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<p><b>Apache mod_jk</b> -- Web App Selection</p>
+<p><fmt:message key="apache.jk.webApps.title"/></p>
+<fmt:message key="apache.jk.webApps.select"/>
 
-<p>For each web application <i>currently running</i> in Geronimo, select:</p>
-<dl>
-  <dt><b>Through Apache</b></dt>
-  <dd>Whether the web application should be exposed through Apache</dd>
-  <dt><b>Static Content</b></dt>
-  <dd>Whether Apache should serve static content for the web application (instead of all
-    content being handled by Geronimo)</dd>
-  <dt><b>Dynamic Paths</b></dt>
-  <dd>If Apache is serving static content, which URL paths should be passed to Geronimo
-      (e.g. <tt>/servlet/*</tt> or <tt>*.jsp</tt>)</dd>
-</dl>
 
 <!-- FORM TO COLLECT DATA FOR THIS PAGE -->
 <form name="<portlet:namespace/>ApacheForm" action="<portlet:actionURL/>" method="POST">
@@ -47,10 +39,10 @@
 </c:forEach>
     <table border="0">
         <tr>
-            <th>Web Application</th>
-            <th>Through Apache</th>
-            <th>Static Content</th>
-            <th>Dynamic Paths</th>
+            <th><fmt:message key="apache.jk.webApps.webApplication"/></th>
+            <th><fmt:message key="apache.jk.webApps.throughApache"/></th>
+            <th><fmt:message key="apache.jk.webApps.staticContent"/></th>
+            <th><fmt:message key="apache.jk.webApps.dynamicPaths"/></th>
         </tr>
       <c:forEach var="web" items="${model.webApps}" varStatus="status">
       <c:if test="${web.running}">
@@ -67,7 +59,7 @@
         <!-- SUBMIT BUTTON -->
         <tr>
             <td></td>
-            <td colspan="3"><input type="submit" value="Finish"/></td>
+            <td colspan="3"><input type="submit" value='<fmt:message key="consolebase.common.finish"/>'/></td>
         </tr>
     </table>
 </form>
@@ -76,4 +68,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/caDetails.jsp Sat Jan  5 12:22:33 2008
@@ -16,56 +16,55 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-
-<p><b>Certification Authority Details</b></p>
-
-<p>This screen shows the details of CA's certificate and keypair.  <i>Highest Serial Number</i> shows
-the highest of serial number of any certificate issued by this CA.  <i>Certificate Text</i> shows the CA's
-certificate in base64 encoded form.  This text can be used by the certificate requestors to designate
-this CA as a trusted CA in their software.</p>
-
+<p><b><fmt:message key="ca.caDetails.title"/></b></p>
+<p>
+<fmt:message key="ca.caDetails.summary"/>
+</p>
 <jsp:include page="_header.jsp" />
 
 <c:if test="${empty(caLocked) || !caLocked}">
   <table border="0">
     <tr>
-        <th colspan="2" align="left" class="DarkBackground">Certificate Details</th>
+        <th colspan="2" align="left" class="DarkBackground"><fmt:message key="ca.common.certificateDetails"/>
+       </th>
     </tr>
     <tr>
-        <th class="LightBackground" align="right">Version:</th>
+        <th class="LightBackground" align="right"><fmt:message key="consolebase.common.version"/>:</th>
         <td class="LightBackground">${cert.version}</td>
     </tr>
     <tr>
-        <th class="MediumBackground" align="right">Subject:</th>
+        <th class="MediumBackground" align="right"><fmt:message key="ca.common.subject"/>:</th>
         <td class="MediumBackground">${cert.subjectDN.name}</td>
     </tr>
     <tr>
-        <th class="LightBackground" align="right">Issuer:</th>
+        <th class="LightBackground" align="right"><fmt:message key="ca.common.issuer"/>:</th>
         <td class="LightBackground">${cert.issuerDN.name}</td>
     </tr>
     <tr>
-        <th class="MediumBackground" align="right">Serial Number:</th>
+        <th class="MediumBackground" align="right"><fmt:message key="ca.common.serialNumber"/>:</th>
         <td class="MediumBackground">${cert.serialNumber}</td>
     </tr>
     <tr>
-        <th class="LightBackground" align="right">Valid From:</th>
+        <th class="LightBackground" align="right"><fmt:message key="ca.common.validFrom"/>:</th>
         <td class="LightBackground">${cert.notBefore}</td>
     </tr>
     <tr>
-        <th class="MediumBackground" align="right">Valid To:</th>
+        <th class="MediumBackground" align="right"><fmt:message key="ca.common.validTo"/>:</th>
         <td class="MediumBackground">${cert.notAfter}</td>
     </tr>
     <tr>
-        <th class="LightBackground" align="right">Signature Alg:</th>
+        <th class="LightBackground" align="right"><fmt:message key="ca.common.signatureAlg"/>:</th>
         <td class="LightBackground">${cert.sigAlgName}</td>
     </tr>
     <tr>
-        <th class="MediumBackground" align="right">Public Key Alg:</th>
+        <th class="MediumBackground" align="right"><fmt:message key="ca.common.publicKeyAlg"/>:</th>
         <td class="MediumBackground">${cert.publicKey.algorithm}</td>
     </tr>
     <tr>
-        <th class="LightBackground" align="right">Key Size:</th>
+        <th class="LightBackground" align="right"><fmt:message key="ca.common.keySize"/>:</th>
         <td class="LightBackground">${keySize}</td>
     </tr>
   <c:set var="backgroundClass" value='LightBackground'/> <!-- This should be set from the row above. -->
@@ -79,7 +78,7 @@
         </c:otherwise>
     </c:choose>
     <tr>
-        <th class="${backgroundClass}" align="right">critical ext: </th>
+        <th class="${backgroundClass}" align="right"><fmt:message key="ca.common.criticalExt"/>: </th>
         <td class="${backgroundClass}">${extoid}</td>
     </tr>
   </c:forEach>
@@ -93,7 +92,7 @@
         </c:otherwise>
     </c:choose>
     <tr>
-        <th class="${backgroundClass}" align="right">non-critical ext: </th>
+        <th class="${backgroundClass}" align="right"><fmt:message key="ca.common.nonCriticalExt"/>: </th>
         <td class="${backgroundClass}">${extoid}</td>
     </tr>
   </c:forEach>
@@ -106,7 +105,7 @@
         </c:otherwise>
     </c:choose>
     <tr>
-        <th class="${backgroundClass}" align="right">Finger prints:</th>
+        <th class="${backgroundClass}" align="right"><fmt:message key="ca.common.fingerPrints"/>:</th>
         <td class="${backgroundClass}">
   <c:forEach items="${fingerPrints}" var="fp">
             ${fp.key} = &nbsp; ${fp.value} <br/>
@@ -115,12 +114,12 @@
     </tr>
     <tr><td>&nbsp;</td></tr>
     <tr>
-        <th align="right">Highest Serial Number:</th>
+        <th align="right"><fmt:message key="ca.common.highestSerialNumber"/>:</th>
         <td>${highestSerial}</td>
     </tr>
     <tr><td>&nbsp;</td></tr>
     <tr>
-        <th colspan="2" align="left">Base64 encoded Certificate Text</th>
+        <th colspan="2" align="left"><fmt:message key="ca.common.base64EncodedCertText"/></th>
     </tr>
     <tr>
         <td colspan="2"><form><textarea rows="15" cols="80" READONLY>${certText}</textarea></form></td>
@@ -129,4 +128,4 @@
 </c:if>
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Back to CA home</a></p>
+            </portlet:actionURL>"><fmt:message key="ca.common.backToCAHome"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/certReqDetails.jsp Sat Jan  5 12:22:33 2008
@@ -16,6 +16,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -37,14 +39,10 @@
     return true;
 }
 </script>
-
-<b>Issue New Certificate</b> - Step 2: Review Request and enter Certificate details
-
-<p> This screen shows the details of the Certficate Signing Request (CSR) and allows you to input
-the validity period and signature algorithm for the certificate to be issued.  The certificate
-serial number is automatically generated by incrementing the serial number of the last certificate
-issued.  The next screen will allow you to review & confirm these details and issue a certificate.</p>
-
+<fmt:message key="ca.certReqDetails.title"/>
+<p>
+<fmt:message key="ca.certReqDetails.summary"/>
+</p>
 <jsp:include page="_header.jsp" />
 
 <form name="<portlet:namespace/>certReqDetailsForm" action="<portlet:actionURL/>">
@@ -53,16 +51,17 @@
     <input type="hidden" name="requestId" value="${requestId}"/>
     <table border="0">
         <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Requestor Details</th>
+            <th class="DarkBackground" colspan="2" align="left"><fmt:message key="ca.common.certRequestorDetails"/>
+            </th>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Subject:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.subject"/>:</th>
             <td class="LightBackground">
                 <input type="hidden" name="subject" value="${subject}" /> ${subject}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Public Key:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.publicKey"/>:</th>
             <td class="MediumBackground">
                 <input type="hidden" name="publickey" value="${publickey}" /><pre>${publickey}</pre>
             </td>
@@ -71,28 +70,28 @@
     </table>
     <table border="0">
         <tr>
-            <th colspan="2" align="left">Details of the Certificate to be issued</th>
+            <th colspan="2" align="left"><fmt:message key="ca.common.detailsOfCert"/></th>
         </tr>
         <tr>
-            <th align="right">Certificate Serial No.:</th>
+            <th align="right"><fmt:message key="ca.common.certSerialNo"/>:</th>
             <td>
                 <input type="text" name="sNo" size="20" maxlength="200" value="${sNo}" READONLY/>
             </td>
         </tr>
         <tr>
-            <th align="right">Valid From Date (mm/dd/yyyy):</th>
+            <th align="right"><fmt:message key="ca.common.validFromDate"/> (mm/dd/yyyy):</th>
             <td>
                 <input type="text" name="validFrom" size="20" maxlength="200" value="${validFrom}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">Valid To Date (mm/dd/yyyy):</th>
+            <th align="right"><fmt:message key="ca.common.validToDate"/> (mm/dd/yyyy):</th>
             <td>
                 <input type="text" name="validTo" size="20" maxlength="200" value="${validTo}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">Signature Algorithm:</th>
+            <th align="right"><fmt:message key="ca.common.signatureAlgorithm"/>:</th>
             <td>
                 <select name="algorithm">
                     <option <c:if test="${algorithm eq 'MD2withRSA'}">selected</c:if> >MD2withRSA</option>
@@ -102,10 +101,10 @@
             </td>
         </tr>
     </table>
-    <input type="submit" value="Review Client Cert Details" onClick="return <portlet:namespace/>validateForm();"/>
+    <input type="submit" value='<fmt:message key="ca.common.reviewClientCertDetails"/>' onClick="return <portlet:namespace/>validateForm();"/>
     <input type="reset" name="reset" value="Reset">
 </form>
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before"/>
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCA.jsp Sat Jan  5 12:22:33 2008
@@ -16,14 +16,13 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-
-<b>Setup Certification Authority</b> - Step 2: Review and Confirm CA details
-
-<p>This screen lets you review the CA details entered in the previous screen.  If you need to modify any
-information shown here, please go back to the previous screen.  Upon clicking the <i>Setup Certification Authority</i>
-button, a keypair and a self-signed certificate will be generated and stored in a keystore.  CA's certificate serial
-number is stored in a text file and the number is incremented each time a CSR is processed by the CA.</p>
+<fmt:message key="ca.confirmCA.title"/>
+<p>
+<fmt:message key="ca.confirmCA.summary"/>
+</p>
 
 <jsp:include page="_header.jsp" />
 
@@ -31,105 +30,106 @@
     <input type="hidden" name="mode" value="confirmCA-after" />
     <table border="0">
         <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certification Authority's Identity</th>
+            <th class="DarkBackground" colspan="2" align="left"><fmt:message key="ca.common.certAuthorityIdentity"/>
+            </th>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Common Name (CN):</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.commonName"/> (CN):</th>
             <td class="LightBackground">
                 <input type="hidden" name="caCN" value="${caCN}" /> ${caCN}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Division/Business Unit (OU):</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.Division_BusinessUnit"/> (OU):</th>
             <td class="MediumBackground">
                 <input type="hidden" name="caOU" value="${caOU}" /> ${caOU}
             </td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Company/Organization (O):</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.company_Organization"/> (O):</th>
             <td class="LightBackground">
                 <input type="hidden" name="caO" value="${caO}" /> ${caO}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">City/Locality (L):</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.city_Locality"/> (L):</th>
             <td class="MediumBackground">
                 <input type="hidden" name="caL" value="${caL}" /> ${caL}
             </td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">State/Province (ST):</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.state_Province"/> (ST):</th>
             <td class="LightBackground">
                 <input type="hidden" name="caST" value="${caST}" /> ${caST}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Country Code (2 char) (C):</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.countryCode"/>(2 char) (C):</th>
             <td class="MediumBackground">
                 <input type="hidden" name="caC" value="${caC}" /> ${caC}
             </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
-            <th class="DarkBackground" colspan="2" align="left">Key Details</th>
+            <th class="DarkBackground" colspan="2" align="left"><fmt:message key="ca.common.keyDetails"/></th>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Alias for CA's keypair:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.aliasForCAKeypair"/>:</th>
             <td class="LightBackground">
                 <input type="hidden" name="alias" value="${alias}" /> ${alias}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Key Algorithm:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.keyAlgorithm"/>:</th>
             <td class="MediumBackground">
                 <input type="hidden" name="keyAlgorithm" value="${keyAlgorithm}" /> ${keyAlgorithm}
             </td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Key Size:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.keySize"/>:</th>
             <td class="LightBackground">
                 <input type="hidden" name="keySize" value="${keySize}" /> ${keySize}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Password:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="consolebase.common.password"/>:</th>
             <td class="MediumBackground">
                 <input type="hidden" name="password" value="${password}" /> ********
             </td>
         </tr>
         <tr><td>&nbsp</td></tr>
         <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Details</th>
+            <th class="DarkBackground" colspan="2" align="left"><fmt:message key="ca.common.certificateDetails"/></th>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Certificate Serial Number:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.certSerialNumber"/>:</th>
             <td class="LightBackground">
                 <input type="hidden" name="sNo" value="${sNo}" /> ${sNo}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Valid From Date(mm/dd/yyyy):</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.validFromDate"/>(mm/dd/yyyy):</th>
             <td class="MediumBackground">
                 <input type="hidden" name="validFrom" value="${validFrom}" /> ${validFrom}
             </td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Valid To Date(mm/dd/yyyy):</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.validToDate"/>(mm/dd/yyyy):</th>
             <td class="LightBackground">
                 <input type="hidden" name="validTo" value="${validTo}" /> ${validTo}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Signature Algorithm:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.signatureAlgorithm"/>:</th>
             <td class="MediumBackground">
                 <input type="hidden" name="algorithm" value="${algorithm}" /> ${algorithm}
             </td>
         </tr>
     </table>
-    <input type="submit" value="Setup Certification Authority" />
+    <input type="submit" value='<fmt:message key="ca.common.setupCertAuthority"/>' />
 </form>
 
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmCertReq.jsp Sat Jan  5 12:22:33 2008
@@ -16,12 +16,12 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
+<b><fmt:message key="ca.confirmCertReq.confirmCertRequest"/>Confirm Certificate Request</b>
 
-<b>Confirm Certificate Request</b>
-
-<p> This screen shows the details of the Certficate Signing Request (CSR) and allows you to approve the request.
-Once the request is approved, it will be considered for issue of a certificate.</p>
+<p><fmt:message key="ca.confirmCertReq.summary"/></p>
 
 <jsp:include page="_header.jsp" />
 
@@ -30,26 +30,26 @@
     <input type="hidden" name="requestId" value="${requestId}"/>
     <table border="0">
         <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Requestor Details</th>
+            <th class="DarkBackground" colspan="2" align="left"><fmt:message key="ca.common.certRequestorDetails"/></th>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Subject:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.subject"/>:</th>
             <td class="LightBackground">
                 ${subject}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Public Key:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.publicKey"/>:</th>
             <td class="MediumBackground">
                 <pre>${publickey}</pre>
             </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
     </table>
-    <input type="submit" name="approve" value="Approve CSR"/>
-    <input type="submit" name="reject" value="Reject CSR">
+    <input type="submit" name="approve" value='<fmt:message key="ca.common.publicKey"/>'/>
+    <input type="submit" name="reject" value='<fmt:message key="ca.common.publicKey"/>'>
 </form>
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before"/>
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/confirmClientCert.jsp Sat Jan  5 12:22:33 2008
@@ -16,13 +16,14 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
+<fmt:message key="ca.confirmClientCert.title"/>
+<p>
+<fmt:message key="ca.confirmClientCert.summary"/>
+</p>
 
-<b>Issue New Certificate</b> - Step 3: Confirm and Issue Certificate
-
-<p> This screen shows the CSR details and the certificate details entered in the previous screen.  Upon clicking
-the <i>Issue Certificate</i> button, a certificate will be issued and stored.  The next screen will show the
-details of the certificate issued.</p>
 
 <jsp:include page="_header.jsp" />
 
@@ -32,16 +33,16 @@
     <input type="hidden" name="requestId" value="${requestId}"/>
     <table border="0">
         <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Requestor Details</th>
+            <th class="DarkBackground" colspan="2" align="left"><fmt:message key="ca.common.certRequestorDetails"/></th>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Subject:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.subject"/>:</th>
             <td class="LightBackground">
                 <input type="hidden" name="subject" value="${subject}" /> ${subject}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Public Key:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.publicKey"/>:</th>
             <td class="MediumBackground">
                 <input type="hidden" name="publickey" value="${publickey}" /><pre> ${publickey} </pre>
             </td>
@@ -50,28 +51,28 @@
     </table>
     <table border="0">
         <tr>
-            <th class="DarkBackground" colspan="2" align="left">Details of the Certificate to be issued</th>
+            <th class="DarkBackground" colspan="2" align="left"><fmt:message key="ca.common.detailsOfCert"/></th>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Certificate Serial Number:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.certSerialNumber"/>:</th>
             <td class="LightBackground">
                 <input type="hidden" name="sNo" value="${sNo}" /> ${sNo}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Valid From Date (mm/dd/yyyy):</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.validFromDate"/> (mm/dd/yyyy):</th>
             <td class="MediumBackground">
                 <input type="hidden" name="validFrom" value="${validFrom}" /> ${validFrom}
             </td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Valid To Date (mm/dd/yyyy):</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.validToDate"/> (mm/dd/yyyy):</th>
             <td class="LightBackground">
                 <input type="hidden" name="validTo" value="${validTo}" /> ${validTo}
             </td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Signature Algorithm:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.signatureAlgorithm"/>:</th>
             <td class="MediumBackground">
                 <input type="hidden" name="algorithm" value="${algorithm}" /> ${algorithm}
             </td>
@@ -82,4 +83,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before"/>
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/index.jsp Sat Jan  5 12:22:33 2008
@@ -17,55 +17,69 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-
-<p>This portlet allows you to setup a Certification Authority (CA) and issue certificates in reply to
-Certificate Signing Requests (CSRs).  <i>Setup Certification Authority</i> function allows to initialize
-the CA by providing CA Identity details, algorithm parameters for CA's key pair and self-signed certificate
-and a password to protect the CA's private key.  This password is to be used to unlock the CA to access CA
-functions.
-Once the CA is initialized, CSRs can be processed using <i>Issue New Certificate</i> function.  Previously
-issued certificates can be viewed using <i>View Issued Certificate</i> function.
+<p>
+<fmt:message key="ca.index.title"/>
 </p>
 
+
 <jsp:include page="_header.jsp" />
 
 <c:choose>
   <c:when test="${caNotSetup}">
     <!-- CA needs initialization -->
-    <p>CA is not running or the CA may not have been initialized.  Please initialize the CA using the link provided below.
+    <p>
+    <fmt:message key="ca.index.CANotInitialized"/>
+    
     <table border="0">
       <tr>
-        <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="setupCA-before" /></portlet:actionURL>">Setup Certification Authority</a> </td>
+        <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="setupCA-before" /></portlet:actionURL>">
+        <fmt:message key="ca.common.setupCertAuthority"/>
+        </a> </td>
       </tr>
     </table>
   </c:when>
   <c:otherwise>
     <!-- CA is ready for use -->
-    <p>CA has been initialized.
+    <p><fmt:message key="ca.index.CAInitialized"/>
     <c:choose>
       <c:when test="${caLocked}">
-        But, the CA is locked.  Please unlock the CA to access CA functions.
+        <fmt:message key="ca.index.CALocked"/>
         <table border="0">
         <tr>
-          <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="unlockCA-before" /></portlet:actionURL>">Unlock CA</a> </td>
+          <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="unlockCA-before" /></portlet:actionURL>">
+          <fmt:message key="ca.common.unlockCA"/>
+          </a> </td>
         </tr>
         </table>
       </c:when>
       <c:otherwise>
-        CA functions can be accessed using the links provided below.
+      <fmt:message key="ca.index.CAFunctionsAccessed"/>        
         <table border="0">
         <tr>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="lock" value="lock" /></portlet:actionURL>">Lock CA</a> &nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="caDetails-before" /></portlet:actionURL>">View CA Details</a> &nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="publish" value="publish" /></portlet:actionURL>">Publish CA Certificate</a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="lock" value="lock" /></portlet:actionURL>">
+           <fmt:message key="ca.common.lockCA"/>
+           </a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="caDetails-before" /></portlet:actionURL>">
+          <fmt:message key="ca.common.viewCADetails"/>
+          </a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-after" /><portlet:param name="publish" value="publish" /></portlet:actionURL>">
+          <fmt:message key="ca.index.publishCACert"/>
+          </a> &nbsp;</td>
           <td>&nbsp;</td>
         </tr>
         <tr>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsVerify-before" /></portlet:actionURL>">Requests to be verified</a>&nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsIssue-before" /></portlet:actionURL>">Requests to be fulfilled</a>&nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="processCSR-before" /></portlet:actionURL>">Issue New Certificate</a> &nbsp;</td>
-          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="viewCert-before" /></portlet:actionURL>">View Issued Certificate</a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsVerify-before" /></portlet:actionURL>">
+          <fmt:message key="ca.index.requestsToBeVerified"/></a>&nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="listRequestsIssue-before" /></portlet:actionURL>">
+          <fmt:message key="ca.index.requestsToBeFulfilled"/></a>&nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="processCSR-before" /></portlet:actionURL>">
+          <fmt:message key="ca.common.issueNewCert"/></a> &nbsp;</td>
+          <td>&nbsp;<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="viewCert-before" /></portlet:actionURL>">
+          <fmt:message key="ca.common.viewIssuedCert"/>
+          </a> &nbsp;</td>
         </tr>
         </table>
       </c:otherwise>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsIssue.jsp Sat Jan  5 12:22:33 2008
@@ -16,17 +16,21 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<b>Certificate Requests awaiting fulfillment</b>
+<b><fmt:message key="ca.listRequestsIssue.certRequestsAwaiting"/>
+</b>
 
-<p> This screen shows the certificate requests waiting to be fulfilled.</p>
+<p><fmt:message key="ca.listRequestsIssue.certRequestsAwaitingExp"/>
+</p>
 
 <jsp:include page="_header.jsp" />
 
 <table border="0">
     <tr>
-        <th class="DarkBackground" align="left">Certificate Requests</th>
+        <th class="DarkBackground" align="left"><fmt:message key="ca.common.certRequests"/></th>
     </tr>
   <c:choose>
     <c:when test="${!empty(csrIds)}">
@@ -52,11 +56,11 @@
     </c:when>
     <c:otherwise>
         <tr>
-          <td>There are no requests.</td>
+          <td><fmt:message key="ca.common.noRequests"/></td>
         </tr>
     </c:otherwise>
   </c:choose>
 </table>
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Back to CA home</a></p>
+            </portlet:actionURL>"><fmt:message key="ca.common.backToCAHome"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/listRequestsVerify.jsp Sat Jan  5 12:22:33 2008
@@ -16,17 +16,20 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<b>Certificate Requests awaiting verification</b>
+<b><fmt:message key="ca.listRequestsVerify.certRequestsAwaitingVerify"/></b>
 
-<p> This screen shows the certificate requests waiting for verification.</p>
+<p> <fmt:message key="ca.listRequestsVerify.certRequestsAwaitingVerifyExp"/>
+</p>
 
 <jsp:include page="_header.jsp" />
 
 <table border="0">
     <tr>
-        <th class="DarkBackground" align="left">Certificate Requests</th>
+        <th class="DarkBackground" align="left"><fmt:message key="ca.common.certRequests"/></th>
     </tr>
   <c:choose>
     <c:when test="${!empty(csrIds)}">
@@ -52,11 +55,11 @@
       </c:when>
     <c:otherwise>
         <tr>
-          <td>There are no requests.</td>
+          <td><fmt:message key="ca.common.noRequests"/></td>
         </tr>
     </c:otherwise>
   </c:choose>
 </table>
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Back to CA home</a></p>
+            </portlet:actionURL>"><fmt:message key="ca.common.backToCAHome"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/processCSR.jsp Sat Jan  5 12:22:33 2008
@@ -16,6 +16,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -28,13 +30,12 @@
     return true;
 }
 </script>
+<fmt:message key="ca.processCSR.title"/>
 
-<b>Issue New Certificate</b> - Step 1: Process Certificate Signing Request (CSR)
+<p>
+<fmt:message key="ca.processCSR.summary"/>
+</p>
 
-<p>This screen lets you process Certificate Signing Request (CSR) text and view the details
-of the requestor.  Paste the content of CSR text file you received from the requestor and click on
-<i>Process CSR</i> button.  The next screen will show the details of the requestor and allow you
-to input information required to issue a certificate.</p>
 
 <jsp:include page="_header.jsp" />
 
@@ -42,20 +43,20 @@
     <input type="hidden" name="mode" value="processCSR-after" />
     <table border="0">
         <tr>
-            <th colspan="2" align="left">CSR Text</th>
+            <th colspan="2" align="left"><fmt:message key="ca.common.CSRText"/></th>
         </tr>
         <tr>
             <td colspan="2">
                 <textarea rows="20" cols="80" name="pkcs10certreq">
-                ...paste pkcs10 encoded certificate request here...
+                <fmt:message key="ca.processCSR.pastePkcs10here"/>                
                 </textarea>
             </td>
         </tr>
     </table>
-    <input type="submit" value="Process CSR" onClick="return <portlet:namespace/>validateForm();"/>
-    <input type="reset" name="reset" value="Reset">
+    <input type="submit" value='<fmt:message key="ca.common.processCSR"/>' onClick="return <portlet:namespace/>validateForm();"/>
+    <input type="reset" name="reset" value='<fmt:message key="consolebase.common.reset"/>'>
 </form>
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before"/>
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/setupCA.jsp Sat Jan  5 12:22:33 2008
@@ -16,6 +16,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -51,13 +53,13 @@
     return true;
 }
 </script>
+<fmt:message key="ca.setupCA.title"/>
+
+<p>
+<fmt:message key="ca.setupCA.summary"/>
+</p>
 
-<b>Setup Certification Authority</b> - Step 1: Enter CA details
 
-<p>On this screen you can enter the Certification Authority (CA) details, algorithm parameters
-for CA's keypair, algorithm for CA's self signed certificate and a password to protect
-the CA's private key. The next screen will let you review this information before
-generating the CA's keypair and self-signed certificate.</p>
 
 <jsp:include page="_header.jsp"/>
 
@@ -65,57 +67,57 @@
     <input type="hidden" name="mode" value="setupCA-after"/>
     <table border="0">
         <tr>
-            <th colspan="2" align="left">Certification Authority's Identity</th>
+            <th colspan="2" align="left"><fmt:message key="ca.common.certAuthorityIdentity"/></th>
         </tr>
         <tr>
-            <th align="right">Common Name (CN):</th>
+            <th align="right"><fmt:message key="ca.common.commonName"/> (CN):</th>
             <td>
                 <input type="text" name="caCN" size="20" maxlength="200" value="${caCN}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">Division/Business Unit (OU):</th>
+            <th align="right"><fmt:message key="ca.common.Division_BusinessUnit"/> (OU):</th>
             <td>
                 <input type="text" name="caOU" size="20" maxlength="200" value="${caOU}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">Company/Organization (O):</th>
+            <th align="right"><fmt:message key="ca.common.company_Organization"/> (O):</th>
             <td>
                 <input type="text" name="caO" size="20" maxlength="200" value="${caO}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">City/Locality (L):</th>
+            <th align="right"><fmt:message key="ca.common.city_Locality"/> (L):</th>
             <td>
                 <input type="text" name="caL" size="20" maxlength="200" value="${caL}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">State/Province (ST):</th>
+            <th align="right"><fmt:message key="ca.common.state_Province"/> (ST):</th>
             <td>
                 <input type="text" name="caST" size="20" maxlength="200" value="${caST}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">Country Code (2 char) (C):</th>
+            <th align="right"><fmt:message key="ca.common.countryCode"/> (2 char) (C):</th>
             <td>
                 <input type="text" name="caC" size="3" maxlength="2" value="${caC}"/>
             </td>
         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
-            <th colspan="2" align="left">Key Details</th>
+            <th colspan="2" align="left"><fmt:message key="ca.common.keyDetails"/></th>
         </tr>
         <tr>
-            <th align="right">Alias:</th>
+            <th align="right"><fmt:message key="consolebase.common.alias"/>:</th>
             <td>
                 <input type="text" name="alias" size="20" maxlength="100" value="${alias}"/>
             </td>
         </tr>
 
         <tr>
-            <th align="right">Key Algorithm:</th>
+            <th align="right"><fmt:message key="ca.common.keyAlgorithm"/>:</th>
             <td>
                 <select name="keyAlgorithm">
                     <option <c:if test="${keyAlgorithm eq 'RSA' || keyAlgorithm eq '' || empty(keyAlgorithm)}">selected</c:if> >RSA</option>
@@ -123,7 +125,7 @@
             </td>
         </tr>
         <tr>
-            <th align="right">Key Size:</th>
+            <th align="right"><fmt:message key="ca.common.keySize"/>:</th>
             <td>
                 <select name="keySize">
                     <option <c:if test="${keySize eq '512'}">selected</c:if> >512</option>
@@ -133,41 +135,41 @@
             </td>
         </tr>
         <tr>
-            <th align="right">Password:</th>
+            <th align="right"><fmt:message key="consolebase.common.password"/>:</th>
             <td>
                 <input type="password" name="password" size="20" maxlength="200"/>
             </td>
         </tr>
         <tr>
-            <th align="right">Confirm Password:</th>
+            <th align="right"><fmt:message key="consolebase.common.confirmPassword"/>:</th>
             <td>
                 <input type="password" name="confirm" size="20" maxlength="200"/>
             </td>
         </tr>
         <tr><td>&nbsp</td></tr>
         <tr>
-            <th colspan="2" align="left">Certificate Details</th>
+            <th colspan="2" align="left"><fmt:message key="ca.common.certificateDetails"/></th>
         </tr>
         <tr>
-            <th align="right">Certificate Serial Number:</th>
+            <th align="right"><fmt:message key="ca.common.certSerialNumber"/>:</th>
             <td>
                 <input type="text" name="sNo" size="20" maxlength="200" value="${sNo}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">Valid From Date(mm/dd/yyyy):</th>
+            <th align="right"><fmt:message key="ca.common.validFromDate"/>(mm/dd/yyyy):</th>
             <td>
                 <input type="text" name="validFrom" size="20" maxlength="200" value="${validFrom}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">Valid To Date(mm/dd/yyyy):</th>
+            <th align="right"><fmt:message key="ca.common.validToDate"/>(mm/dd/yyyy):</th>
             <td>
                 <input type="text" name="validTo" size="20" maxlength="200" value="${validTo}"/>
             </td>
         </tr>
         <tr>
-            <th align="right">Signature Algorithm:</th>
+            <th align="right"><fmt:message key="ca.common.signatureAlgorithm"/>:</th>
             <td>
                 <select name="algorithm">
                     <option <c:if test="${algorithm eq 'MD2withRSA'}">selected</c:if> >MD2withRSA</option>
@@ -177,10 +179,10 @@
             </td>
         </tr>
     </table>
-    <input type="submit" value="Review CA Details" onClick="return <portlet:namespace/>validateForm();"/>
-    <input type="reset" name="reset" value="Reset">
+    <input type="submit" value='<fmt:message key="ca.common.reviewCADetails"/>' onClick="return <portlet:namespace/>validateForm();"/>
+    <input type="reset" name="reset" value='<fmt:message key="consolebase.common.reset"/>'>
 </form>
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before"/>
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/unlockCA.jsp Sat Jan  5 12:22:33 2008
@@ -16,6 +16,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -28,23 +30,24 @@
     return true;
 }
 </script>
-<b>Unlock Certification Authority</b>
+<b><fmt:message key="ca.common.unlockCertAuthority"/></b>
+
+<p><fmt:message key="ca.unlockCA.summary"/>
+</p>
 
-<p> This screen lets you unlock the CA by providing the password used to protect
-the CA's private key.  Once unlocked, the CA functions will be available.</p>
 
 <jsp:include page="_header.jsp" />
 
 <form name="<portlet:namespace/>UnlockCAForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="unlockCA-after" />
-    <b>Enter the CA's private key password:</b>
+    <b><fmt:message key="ca.unlockCA.enterCAPrivateKeyPassword"/>:</b>
     <input type="password" name="password" size="20" maxlength="200" />
     <br />
 
-    <input type="submit" value="Unlock Certification Authority" onClick="return <portlet:namespace/>validateForm();"/>
-    <input type="reset" name="reset" value="Reset">
+    <input type="submit" value='<fmt:message key="ca.common.unlockCertAuthority"/>' onClick="return <portlet:namespace/>validateForm();"/>
+    <input type="reset" name="reset" value='<fmt:message key="consolebase.common.reset"/>'>
 </form>
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp Sat Jan  5 12:22:33 2008
@@ -16,6 +16,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -31,69 +33,71 @@
 }
 </script>
 
-<b>View Certificate</b>
+<b><fmt:message key="ca.common.title"/></b>
 
 <jsp:include page="_header.jsp" />
 
 <c:choose>
   <c:when test="${empty(sNo)}">
     <!-- No serial number was received to show a certificate -->
-    <p>Enter the serial number of the certificate to be viewed and click on <i>View Certificate</i> button.</p>
+    <p>
+    <fmt:message key="ca.viewCertificate.enterSerialNumber"/>
+    </p>
     <form name="<portlet:namespace/>sNoForm" action="<portlet:actionURL/>">
       <input type="hidden" name="mode" value="viewCert-before" />
       <table border="0">
         <tr>
-            <th align="right">Certificate Serial Number.:</th>
+            <th align="right"><fmt:message key="ca.common.certSerialNo"/>:</th>
             <td>
                 <input type="text" name="sNo" size="20" maxlength="200" />
             </td>
         </tr>
       </table>
-      <input type="submit" value="View Certificate" onClick="return <portlet:namespace/>validateForm();"/>
-      <input type="reset" name="reset" value="Reset">
+      <input type="submit"value='<fmt:message key="ca.common.title"/>' onClick="return <portlet:namespace/>validateForm();"/>
+      <input type="reset" name="reset" value='<fmt:message key="consolebase.common.reset"/>'>
     </form>
   </c:when>
   <c:otherwise>
-    <p> This screen shows the details of a certificate issued by the CA.  The base64 encoded certificate text
-    should be sent to the requestor as a reply to their Certificate Signing Request (CSR).</p>
+    <p> 
+     <fmt:message key="ca.viewCertificate.screenShows"/></p>
     <table border="0">
         <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Details</th>
+            <th class="DarkBackground" colspan="2" align="left"><fmt:message key="ca.common.certificateDetails"/></th>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Version:</th>
+            <th class="LightBackground" align="right"><fmt:message key="consolebase.common.version"/>:</th>
             <td class="LightBackground">${cert.version}</td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Subject:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.subject"/>:</th>
             <td class="MediumBackground">${cert.subjectDN.name}</td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Issuer:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.issuer"/>:</th>
             <td class="LightBackground">${cert.issuerDN.name}</td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Serial Number:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.serialNumber"/>:</th>
             <td class="MediumBackground">${cert.serialNumber}</td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Valid From:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.validFrom"/>:</th>
             <td class="LightBackground">${cert.notBefore}</td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Valid To:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.validTo"/>:</th>
             <td class="MediumBackground">${cert.notAfter}</td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Signature Alg:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.signatureAlg"/>:</th>
             <td class="LightBackground">${cert.sigAlgName}</td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Public Key Alg:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="ca.common.publicKeyAlg"/>:</th>
             <td class="MediumBackground">${cert.publicKey.algorithm}</td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Key Size:</th>
+            <th class="LightBackground" align="right"><fmt:message key="ca.common.keySize"/>:</th>
             <td class="LightBackground">${keySize}</td>
         </tr>
   <c:set var="backgroundClass" value='LightBackground'/> <!-- This should be set from the row above. -->
@@ -107,7 +111,7 @@
             </c:otherwise>
         </c:choose>
         <tr>
-            <th class="${backgroundClass}" align="right">critical ext: </th>
+            <th class="${backgroundClass}" align="right"><fmt:message key="ca.common.criticalExt"/>: </th>
             <td class="${backgroundClass}">${extoid}</td>
         </tr>
   </c:forEach>
@@ -121,7 +125,7 @@
             </c:otherwise>
         </c:choose>
         <tr>
-            <th class="${backgroundClass}" align="right">non-critical ext: </th>
+            <th class="${backgroundClass}" align="right"><fmt:message key="ca.common.nonCriticalExt"/>: </th>
             <td class="${backgroundClass}">${extoid}</td>
         </tr>
   </c:forEach>
@@ -143,7 +147,7 @@
         </tr>
         <tr><td>&nbsp;</td></tr>
         <tr>
-            <th colspan="2" align="left">Base64 encoded Certificate Text</th>
+            <th colspan="2" align="left"><fmt:message key="ca.common.base64EncodedCertText"/></th>
         </tr>
         <tr>
             <td colspan="2">
@@ -162,6 +166,6 @@
   <c:otherwise>
     <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Back to CA home</a></p>
+            </portlet:actionURL>"><fmt:message key="ca.common.backToCAHome"/></a></p>
   </c:otherwise>
 </c:choose>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp Sat Jan  5 12:22:33 2008
@@ -18,37 +18,40 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<h2>Add Plugin Repository</h2>
+<h2>
+<fmt:message key="car.addRepository.title" />
+</h2>
 
 <c:if test="${!empty repositories}">
-<p>The currently available plugin repositories are:</p>
+<p><fmt:message key="car.addRepository.currentlyPluginRepositories" />:</p>
 <ul>
   <c:forEach var="repo" items="${repositories}">
     <li><tt>${repo}</tt></li>
   </c:forEach>
 </ul>
 </c:if>
+<p>
+<fmt:message key="car.addRepository.howToAddPluginRepositories" />
+</p>
 
-<p>To add a new plugin repository to this list, enter the URL to the repository.  The
-repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory
-listing the available plugins in the repository.</p>
-
-<p>You can also download running configurations from another Geronimo server
-just as if you're browsing and installing third-party plugins.
- If you want to point to a remote Geronimo server, enter a URL such as
-<tt>http://geronimo-server:8080/console/maven-repo/</tt></p>
+
+<p>
+<fmt:message key="car.addRepository.downloadRunningCongfig" />
+</p>
 
 <form name="<portlet:namespace/>PluginForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="addRepository-after" />
-    <b>New Repository:</b> <input type="text" name="newRepository" size="40" maxlength="200" />
+    <b><fmt:message key="car.common.newRepository" />:</b> <input type="text" name="newRepository" size="40" maxlength="200" />
     <br />
     <c:if test="${!empty repoError}">
       <p><font color="red">${repoError}</font></p>
     </c:if>
     <br />
-    <input type="submit" value="Add Repository" />
+    <input type="submit" value='<fmt:message key="car.common.addRepository" />' />
 </form>
 
-<p><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-before" /></portlet:actionURL>">Cancel</a></p>
+<p><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-before" /></portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp Sat Jan  5 12:22:33 2008
@@ -18,14 +18,20 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<p><b>Export Plugin</b> -- Save to Disk</p>
+<p><fmt:message key="car.confirmExport.title" /></p>
 
-<p>Use the button below to save the plugin "${name}" to disk.</p>
+<p>
+<fmt:message key="car.confirmExport.useBtnBelow" >
+<fmt:param  value="${name}"/>
+</fmt:message>
+</p>
 
 <%-- todo: calculate the /console prefix somehow --%>
 <form action="/console/forwards/car-export" method="GET">
     <input type="hidden" name="configId" value="${configId}" />
-    <input type="submit" value="Export Plugin" />
+    <input type="submit" value='<fmt:message key="car.common.exportPlugin" />' />
 </form>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/download.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/download.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/download.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/download.jsp Sat Jan  5 12:22:33 2008
@@ -17,12 +17,21 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<p>Processing ${configId}...</p>
+<p>
+<fmt:message key="car.download.processing" >
+<fmt:param  value="${configId}"/>
+</fmt:message>
+</p>
+
+<p>
+<fmt:message key="car.download.foundDependencies" />
+</p>
+
 
-<p>This plugin has the following dependencies.  Any missing dependencies
-    will be downloaded and installed automatically if you proceed.</p>
 <ul>
 <c:forEach var="dependency" items="${dependencies}">
     <li>${dependency.groupId}/${dependency.artifactId}/${dependency.type}/${dependency.version}</li>
@@ -42,6 +51,6 @@
     <input type="hidden" name="proceed" value="true" />
 </td>
 <td valign="top">
-<input type="submit" value="Cancel" onclick="history.go(-1); return false;" />
+<input type="submit" value="<fmt:message key="consolebase.common.cancel"/>" onclick="history.go(-1); return false;" />
 </td></tr></table>
 </form>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/downloadStatus.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/downloadStatus.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/downloadStatus.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/downloadStatus.jsp Sat Jan  5 12:22:33 2008
@@ -17,11 +17,18 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<p>Processing ${configId}...</p>
+<p>
+<fmt:message key="car.downloadStatus.processing" >
+<fmt:param  value="${configId}"/>
+</fmt:message>
+</p>
 
-<form name="ContinueForm" action="<portlet:actionURL/>">
+
+<form name="<portlet:namespace/>ContinueForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="downloadStatus-after" />
     <input type="hidden" name="configId" value="${configId}" />
     <input type="hidden" name="repository" value="${repository}" />
@@ -36,5 +43,6 @@
     <portlet:namespace/>startProgress();
 </script>
 <%--
-<p><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-before" /></portlet:actionURL>">Cancel</a></p>
+<p><a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="index-before" /></portlet:actionURL>">
+<fmt:message key="consolebase.common.cancel"/></a></p>
 --%>



Mime
View raw message