geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r609207 [6/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/keystore/importCAReply.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/importCAReply.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/importCAReply.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/importCAReply.jsp Sat Jan  5 12:22:33 2008
@@ -16,9 +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/>
-keystore: ${id}<br/>
-alias: ${alias}<br/>
+<fmt:message key="keystore.common.keystore"/>: ${id}<br/>
+<fmt:message key="keystore.common.alias"/>: ${alias}<br/>
 
 <form method="post"
 action="<portlet:actionURL>
@@ -26,19 +28,19 @@
 <portlet:param name="id" value="${id}" />
 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
 <table>
-<th>PKCS7 Certificate Reply</th>
+<th><fmt:message key="keystore.importCAReply.PKCS7CertificateReply"/></th>
 <tr>
 <td>
 <textarea rows="20" cols="80" name="pkcs7cert">
-...paste pkcs7 encoded certificate reply here...
+<fmt:message key="keystore.importCAReply.pasteHere"/>
 </textarea>
 </td>
 </tr>
 </table>
 <table>
 <tr>
-<td><input type="submit" name="submit" value="Save"/></td>
-<td><input type="submit" name="submit" value="Cancel"/></td>
+<td><input type="submit" name="submit"value='<fmt:message key="consolebase.common.save"/>'/></td>
+<td><input type="submit" name="submit" value='<fmt:message key="consolebase.common.cancel"/>'/></td>
 </tr>
 </table>
 </form>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/index.jsp Sat Jan  5 12:22:33 2008
@@ -20,27 +20,24 @@
 <%@ 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 tool walks you through the process of configuring keystores to use with
-  SSL connectors (for the web container, etc.).</p>
+<p><fmt:message key="keystore.index.title"/></p>
 
 <jsp:include page="_header.jsp" />
 
 <c:choose>
-  <c:when test="${empty(keystores)}"><p><i>There are no keystores defined</i></p></c:when>
+  <c:when test="${empty(keystores)}"><p><i><fmt:message key="keystore.index.noKeystores"/></i></p></c:when>
   <c:otherwise>
-<p>Keystores start out as locked against editing and also not available for usage by
-other components in the server.  The <b>Editable</b> flag indicates whether the keystore
-has been unlocked for editing (by entering the keystore password), which lasts for the
-current login session.  The <b>Available</b> flag indicates whether that password has
-been saved in order to make the keystore available to other components in the server.</p>
+<p><fmt:message key="keystore.index.explanation"/></p>
 
 <table width="100%">
   <tr>
-    <td class="DarkBackground">Keystore File</td>
-    <td class="DarkBackground" align="center">Contents</td>
-    <td class="DarkBackground" align="center">Editable</td>
-    <td class="DarkBackground" align="center">Available</td>
+    <td class="DarkBackground"><fmt:message key="keystore.index.keystoreFile"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="keystore.index.contents"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="keystore.index.editable"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="keystore.index.available"/></td>
   </tr>
 <c:set var="backgroundClass" value='MediumBackground'/>
 <c:forEach var="keystore" items="${keystores}">
@@ -66,7 +63,7 @@
     <td class="${backgroundClass}">
         <c:choose>
           <c:when test="${keystore.lockedEdit}">
-              <i>Keystore locked</i>
+              <i><fmt:message key="keystore.index.keystoreLocked"/></i>
           </c:when>
           <c:otherwise>
             ${fn:length(keystore.keys)} Key<c:if test="${fn:length(keystore.keys) != 1}">s</c:if>
@@ -81,13 +78,13 @@
           <a href="<portlet:actionURL portletMode="view">
             <portlet:param name="mode" value="unlockEdit-before" />
             <portlet:param name="keystore" value="${keystore.name}" />
-            </portlet:actionURL>"><img src="/console/images/ico_lock_16x16.gif" alt="Locked" /></a>
+            </portlet:actionURL>"><img src="/console/images/ico_lock_16x16.gif" alt='<fmt:message key="keystore.index.locked"/>' /></a>
         </c:when>
         <c:otherwise>
           <a href="<portlet:actionURL portletMode="view">
             <portlet:param name="mode" value="lockEdit-before" />
             <portlet:param name="keystore" value="${keystore.name}" />
-            </portlet:actionURL>"><img src="/console/images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
+            </portlet:actionURL>"><img src="/console/images/ico_unlock3_16x16.gif" alt='<fmt:message key="keystore.index.unlocked"/>' /></a>
         </c:otherwise>
       </c:choose>
     </td>
@@ -97,13 +94,13 @@
           <a href="<portlet:actionURL portletMode="view">
             <portlet:param name="mode" value="unlockKeystore-before" />
             <portlet:param name="keystore" value="${keystore.name}" />
-            </portlet:actionURL>"><img src="/console/images/ico_lock_16x16.gif" alt="Locked" /></a>
+            </portlet:actionURL>"><img src="/console/images/ico_lock_16x16.gif" alt='<fmt:message key="keystore.index.locked"/>' /></a>
         </c:when>
         <c:otherwise>
           <a href="<portlet:actionURL portletMode="view">
             <portlet:param name="mode" value="lockKeystore-before" />
             <portlet:param name="keystore" value="${keystore.name}" />
-            </portlet:actionURL> "onClick="return confirm('This keystore is currently in use.  Locking it may prevent the server from starting.  Continue?');" ><img src="/console/images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
+            </portlet:actionURL> " onClick="return confirm('<fmt:message key="keystore.index.continueLocking"/>');" ><img src="/console/images/ico_unlock3_16x16.gif" alt='<fmt:message key="keystore.index.unlocked"/>' /></a>
             ${keys[keystore.name]}
         </c:otherwise>
       </c:choose>
@@ -115,5 +112,5 @@
 </c:choose>
 
 <p>
-    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="createKeystore-before" /></portlet:actionURL>">New Keystore</a>
+    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="createKeystore-before" /></portlet:actionURL>"><fmt:message key="keystore.index.newKeystore"/></a>
 </p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKey.jsp Sat Jan  5 12:22:33 2008
@@ -20,11 +20,11 @@
 <%@ page import="org.apache.geronimo.console.util.PortletManager"%>
 <%@ 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>The keystore has been unlocked.  However, a private key within the keystore
-also needs to be unlocked in order for SSL to work properly.  Please specify
-the password for the private key within the keystore.</p>
+<p><fmt:message key="keystore.unlockKey.title"/></p>
 
 <jsp:include page="_header.jsp" />
 
@@ -32,20 +32,20 @@
     <input type="hidden" name="keystore" value="${keystore}" />
     <input type="hidden" name="password" value="${password}" />
     <input type="hidden" name="mode" value="unlockKey-after" />
-    <b>Unlock Private Key:</b>
+    <b><fmt:message key="keystore.unlockKey.unlockPrivateKey"/>:</b>
     <select name="keyAlias">
         <c:forEach var="alias" items="${keys}">
             <option>${alias}</option>
         </c:forEach>
     </select>
-    Password:
+    <fmt:message key="consolebase.common.password"/>:
     <input type="password" name="keyPassword" size="20" maxlength="200" />
     <br />
 
-    <input type="submit" value="Unlock Private Key" />
+    <input type="submit" value='<fmt:message key="keystore.unlockKey.unlockPrivateKey"/>' />
 </form>
 
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list-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/keystore/unlockKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/unlockKeystore.jsp Sat Jan  5 12:22:33 2008
@@ -20,6 +20,8 @@
 <%@ page import="org.apache.geronimo.console.util.PortletManager"%>
 <%@ 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/>
 
 <jsp:include page="_header.jsp" />
@@ -27,26 +29,26 @@
 <form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="keystore" value="${keystore}" />
     <input type="hidden" name="mode" value="${mode}-after" />
-    <b>Enter keystore password:</b>
+    <b><fmt:message key="keystore.unlockKeystore.enterKeystorePassword"/>:</b>
     <input type="password" name="password" size="20" maxlength="200" />
     <br />
 
     <c:if test="${mode eq 'unlockKeystore' && !empty keys}">
-        <b>Unlock Private Key:</b>
+        <b><fmt:message key="keystore.common.unlockPrivateKey"/>:</b>
         <select name="keyAlias">
             <c:forEach var="alias" items="${keys}">
                 <option>${alias}</option>
             </c:forEach>
         </select>
-        Password:
+        <fmt:message key="consolebase.common.password"/>:
         <input type="password" name="keyPassword" size="20" maxlength="200" />
         <br />
     </c:if>
 
-    <input type="submit" value="Unlock Keystore" />
+    <input type="submit" value='<fmt:message key="keystore.common.unlockPrivateKey"/>'/>
 </form>
 
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list-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/keystore/uploadCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp Sat Jan  5 12:22:33 2008
@@ -17,6 +17,8 @@
 <%@ page import="org.apache.geronimo.console.util.PortletManager"%>
 <%@ 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">
@@ -32,15 +34,13 @@
 certificate file and specify an alias to store it under in the keystore.  The next
 step will be to review the certificate before committing it to the keystore.</p>
 -->
-<p>This screen lets you input a certificate to import into the keystore.  Paste the content of the
-certificate file in the text area and specify an alias to store it under in the keystore.  The next
-step will let you review the certificate before committing it to the keystore.</p>
+<p><fmt:message key="keystore.uploadCertificate.title"/></p>
 
 <form enctype="multipart/form-data" method="POST" name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="id" value="${id}" />
     <input type="hidden" name="mode" value="uploadCertificate-after" />
     <table border="0">
-        <th align="left"> Trusted Certificate </th>
+        <th align="left"> <fmt:message key="keystore.common.trustedCertificate"/> </th>
 <!-- Uploading certificate using a disk file fails on Windows.  Certificate text is used instead.
         <tr>
             <th align="right">Certificate file:</th>
@@ -51,21 +51,21 @@
  -->
         <tr>
             <td colspan="2">
-                <textarea rows="15" cols="80" name="certificate">...paste trusted certificate text here...</textarea>
+                <textarea rows="15" cols="80" name="certificate"><fmt:message key="keystore.uploadCertificate.pasteHere"/></textarea>
             </td>
         </tr>
         <tr>
-            <th align="left">Alias for certificate:</th>
+            <th align="left"><fmt:message key="keystore.uploadCertificate.aliasForCertificate"/>:</th>
             <td>
                 <input type="text" name="alias" size="20" maxlength="200" />
             </td>
         </tr>
     </table>
-    <input type="submit" value="Review Certificate" onclick="return <portlet:namespace/>validateForm()"/>
+    <input type="submit" value='<fmt:message key="keystore.uploadCertificate.reviewCertificate"/>' onclick="return <portlet:namespace/>validateForm()"/>
 </form>
 
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="viewKeystore-before" />
               <portlet:param name="id" value="${id}" />
-            </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/keystore/viewKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/viewKeystore.jsp Sat Jan  5 12:22:33 2008
@@ -20,17 +20,19 @@
 <%@ 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 screen lists the contents of a keystore.</p>
+<p><fmt:message key="keystore.viewKeystore.title"/></p>
 
 <jsp:include page="_header.jsp" />
 
 <table width="100%">
   <tr>
     <td class="DarkBackground">&nbsp;</td>
-    <td class="DarkBackground">Alias</td>
-    <td class="DarkBackground" align="center">Type</td>
-    <td class="DarkBackground" align="center">Certificate Fingerprint</td>
+    <td class="DarkBackground"><fmt:message key="keystore.common.alias"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="consolebase.common.type"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="keystore.viewKeystore.certificateFingerprint"/></td>
   </tr>
 <c:set var="backgroundClass" value='MediumBackground'/>
 <c:forEach var="alias" items="${keystore.certificates}">
@@ -47,7 +49,7 @@
                  <portlet:param name="mode" value="certificateDetails-before" />
                  <portlet:param name="id" value="${keystore.name}" />
                  <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
-        view
+        <fmt:message key="consolebase.common.view"/>
         </a>    
     </td>
     <td class="${backgroundClass}"><a href="<portlet:actionURL portletMode="view">
@@ -57,7 +59,7 @@
         ${alias}
         </a>    
     </td>
-    <td class="${backgroundClass}">Trusted Certificate</td>
+    <td class="${backgroundClass}"><fmt:message key="keystore.common.trustedCertificate"/></td>
     <td class="${backgroundClass}">${keystore.fingerprints[alias]}</td>
   </tr>
 </c:forEach>
@@ -75,7 +77,7 @@
                  <portlet:param name="mode" value="certificateDetails-before" />
                  <portlet:param name="id" value="${keystore.name}" />
                  <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
-        view
+        <fmt:message key="consolebase.common.view"/> 
         </a>    
     </td>
     <td class="${backgroundClass}"><a href="<portlet:actionURL portletMode="view">
@@ -85,15 +87,15 @@
         ${alias}
         </a>    
     </td>
-    <td class="${backgroundClass}">Private Key</td>
+    <td class="${backgroundClass}"><fmt:message key="keystore.viewKeystore.privateKey"/></td>
     <td class="${backgroundClass}">${keystore.fingerprints[alias]}</td>
   </tr>
 </c:forEach>
 </table>
 
 <p>
-    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="uploadCertificate-before" /><portlet:param name="id" value="${keystore.name}" /></portlet:actionURL>">Add Trust Certificate</a>
-    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="configureKey-before" /><portlet:param name="keystore" value="${keystore.name}" /></portlet:actionURL>">Create Private Key</a>
-    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="changePassword-before" /><portlet:param name="keystore" value="${keystore.name}" /></portlet:actionURL>">Change keystore password</a>
-    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="list-before" /></portlet:actionURL>">Return to keystore list</a>
+    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="uploadCertificate-before" /><portlet:param name="id" value="${keystore.name}" /></portlet:actionURL>"><fmt:message key="keystore.viewKeystore.addtrustCertificate"/></a>
+    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="configureKey-before" /><portlet:param name="keystore" value="${keystore.name}" /></portlet:actionURL>"><fmt:message key="keystore.viewKeystore.createprivateKey"/></a>
+    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="changePassword-before" /><portlet:param name="keystore" value="${keystore.name}" /></portlet:actionURL>"><fmt:message key="keystore.viewKeystore.changePassword"/></a>
+    <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="list-before" /></portlet:actionURL>"><fmt:message key="keystore.viewKeystore.returnToKeystoreList"/></a>
 </p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/help.jsp Sat Jan  5 12:22:33 2008
@@ -14,40 +14,29 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>This portlet allows the user to select a configuration file for logging 
-  and/or change the log level and Refresh period. The default &quot;Config file&quot; is a standard log4j file and defines the location where the Geronimo Server
-  will log Geronimo output. The configuration file also defines the log 
-  level, the maximum log file size, and other attributes associated with 
-  logging. <br>
-  <br>
-  Gereonimo Console will display output from the Geronimo log file in the Server Log
-  Viewer portlet in the next window pane.</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<fmt:message key="logmanager.help.introduction"/> 
+
 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
   <tr>
-    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Config File</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">Another configuration file can be used by entering a 
-different path and file name in the Config file 
-text box.</td>
+    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="logmanager.common.configFile"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;"><fmt:message key="logmanager.help.configFileExplanation"/></td>
   </tr>
   <tr>
-    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Refresh Period</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">By default Geronimo checks every 60 seconds to see if the
-configuration file has changed. The user may modify 
-the refresh period.</td>
+    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="logmanager.common.refreshPeriod"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;"><fmt:message key="logmanager.help.refreshPeriodExplanation"/></td>
   </tr>
   <tr>
-    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Log Level</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">The user may select a level for logging from the 
-drop-down menu. </td>
+    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="logmanager.common.logLevel"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;"><fmt:message key="logmanager.help.logLevelExplanation"/> </td>
   </tr>
   <tr>
     <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 5px 10px; font-weight: bold;"><img src="/console/images/update.gif" width="65" height="20" alt="Update"></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">Apply the changes with the Update button.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;"><fmt:message key="logmanager.help.updateExplanation"/></td>
   </tr>
   <tr>
     <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 5px 10px; font-weight: bold;"><img src="/console/images/reset.gif" width="56" height="20" alt="Reset"></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">Use the Reset button to reset the &quot;Config File&quot;, &quot;Refresh Period&quot; and 
-&quot;Log Level&quot; to their settings at the last &quot;Update.&quot;
-It does not reset to the Geronimo Server defaults.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;"><fmt:message key="logmanager.help.resetExplanation"/></td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp Sat Jan  5 12:22:33 2008
@@ -17,6 +17,9 @@
 <%@ 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"/>
+
 <script language="JavaScript">
 var numbers = new Array(0,1,2,3,4,5,6,7,8,9);
 var max = ${lineCount};
@@ -66,7 +69,7 @@
 
 <table>
     <tr>
-        <td><button onclick="location='<portlet:renderURL><portlet:param name="action" value="refresh"/></portlet:renderURL>'">Refresh</button>
+        <td><button onclick="location='<portlet:renderURL><portlet:param name="action" value="refresh"/></portlet:renderURL>'"><fmt:message key="consolebase.common.refresh"/></button>
             <br/>
             <br/>
         </td>
@@ -74,7 +77,7 @@
     <tr>
         <td class="Smaller" valign="middle">
             <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm" onsubmit="return <portlet:namespace/>validateForm();">
-                <b>Filter Criteria:</b>
+                <b><fmt:message key="logmanager.common.filterCriteria"/>:</b>
                 <input type="hidden" value="search" name="action"/>
                 <br/>
                 File 
@@ -83,10 +86,10 @@
                         <option value="${file.fullName}" < c:if test="${logFile eq file.fullName}">selected</c:if>>${file.name}</option>
                     </c:forEach>
                 </select>
-                Lines <input type="text" name="startPos" value="${startPos}" size="3"/>
-                to <input type="text" name="endPos" value="${endPos}" size="3"/>
-                Max Results <input type="text" name="maxRows" value="${maxRows}" size="3"/>
-                Level
+                <fmt:message key="logmanager.search.lines"/> <input type="text" name="startPos" value="${startPos}" size="3"/>
+                <fmt:message key="logmanager.search.to"/> <input type="text" name="endPos" value="${endPos}" size="3"/>
+                <fmt:message key="logmanager.search.maxResults"/> <input type="text" name="maxRows" value="${maxRows}" size="3"/>
+                <fmt:message key="logmanager.search.level"/>
                 <select name="logLevel">
                     <option <c:if test="${logLevel == 'TRACE' || logLevel == ''}">selected</c:if>>TRACE</option>
                     <option <c:if test="${logLevel == 'DEBUG'}">selected</c:if>>DEBUG</option>
@@ -95,10 +98,10 @@
                     <option <c:if test="${logLevel == 'ERROR'}">selected</c:if>>ERROR</option>
                     <option <c:if test="${logLevel == 'FATAL'}">selected</c:if>>FATAL</option>
                 </select>
-                Containing text <input type="text" name="searchString" value="${searchString}"/>
-                With Exceptions <input type="checkbox" name="stackTraces" < c:if test="${!empty stackTraces}">CHECKED </c:if>/>
+                <fmt:message key="logmanager.search.containingText"/> <input type="text" name="searchString" value="${searchString}"/>
+                <fmt:message key="logmanager.search.withExceptions"/> <input type="checkbox" name="stackTraces" < c:if test="${!empty stackTraces}">CHECKED </c:if>/>
                 <br/>
-                <input type="submit" value="Filter Log"/>
+                <input type="submit" value="<fmt:message key="logmanager.search.fileterLog"/>"/>
             </form>
         </td>
     </tr>
@@ -109,8 +112,11 @@
             <table>
                 <tr>
                     <td class="Smaller">
-                        <b>${lineCount} total message(s) in log file. ${fn:length(searchResults)} matched your criteria
-                            <c:if test="${!empty capped}">(number of results capped)</c:if>.
+                        <b><fmt:message key="logmanager.search.messagesMatched">
+                              <fmt:param value="${lineCount}"/>
+                              <fmt:param value="${fn:length(searchResults)}"/>
+                           </fmt:message>
+                           <c:if test="${!empty capped}">(<fmt:message key="logmanager.search.numberOfResultsCapped"/>)</c:if>.
                         </b>
                     </td>
                 </tr>
@@ -125,7 +131,7 @@
             </table>
             </c:when>
             <c:otherwise>
-                No logs found with the specified criteria.
+                <fmt:message key="logmanager.search.noLogs"/> 
             </c:otherwise>
             </c:choose>
         </td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.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/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 
 <script>
 function trim(str){
@@ -52,20 +54,20 @@
 <table width="680">
 <tr>
 <!--
-		renderRequest.setAttribute("configuration", LogHelper.getConfiguration());
-		renderRequest.setAttribute("logLevel", LogHelper.getLogLevel());
-		renderRequest.setAttribute("refreshPeriod", LogHelper.getRefreshPeriod());
+        renderRequest.setAttribute("configuration", LogHelper.getConfiguration());
+        renderRequest.setAttribute("logLevel", LogHelper.getLogLevel());
+        renderRequest.setAttribute("refreshPeriod", LogHelper.getRefreshPeriod());
 
 -->
-    <td nowrap>Config File</td>
+    <td nowrap><fmt:message key="logmanager.common.configFile"/></td>
     <td><input type="text" name="configFile" value="${configFile}" size="45"/></td>
 </tr>
 <tr>
-    <td nowrap>Refresh Period</td>
+    <td nowrap><fmt:message key="logmanager.common.refreshPeriod"/></td>
     <td><input type="text" name="refreshPeriod" value="${refreshPeriod}" size="45"/></td>
 </tr>
 <tr>
-    <td nowrap>Log Level</td>
+    <td nowrap><fmt:message key="logmanager.common.logLevel"/></td>
     <td>
     <select name="logLevel">
         <option<c:if test="${logLevel eq 'ALL'}"> selected</c:if>>ALL</option>
@@ -80,7 +82,7 @@
     </td>
 </tr>
 <tr>   
-    <td colspan="2" align="center" class="formElement"><input type="submit" value="Update"/> <input type="reset" value="Reset"/></td>
+    <td colspan="2" align="center" class="formElement"><input type="submit" value='<fmt:message key="consolebase.common.update"/>' /> <input type="reset" value='<fmt:message key="consolebase.common.reset"/>' /></td>
 </tr>
 </table>
 </form>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/viewhelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/viewhelp.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/viewhelp.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/viewhelp.jsp Sat Jan  5 12:22:33 2008
@@ -14,21 +14,20 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>This portlet displays the Geronimo server log and is helpful for 
-  debugging problems with the Geronimo Console and with deployed
-  applications.</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<p><fmt:message key="logmanager.viewhelp.introduction"/></p>
 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
   <tr>
-    <td width="150"  align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; font-weight: bold; text-decoration: underline;">Refresh</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" >Resets the filtering criteria to Geronimo Console's defaults and displays the latest 11 lines in the Geronimo log file.</td>
+    <td width="150"  align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; font-weight: bold; text-decoration: underline;"><fmt:message key="consolebase.common.refresh"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" ><fmt:message key="logmanager.viewhelp.refreshExplanation"/></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground"style="padding: 10px 10px 10px 5px; color: #1E1E52; font-weight: bold;">Filter results</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Allows the user to customize the filtering criteria. The user can display any line of the log file starting at the first line of the log file through the end. Note: A browser may limit how many lines can be 
-displayed at once. <br>
+    <td width="150" align="right" valign="top" class="MediumBackground"style="padding: 10px 10px 10px 5px; color: #1E1E52; font-weight: bold;"><fmt:message key="logmanager.common.filterResults"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="logmanager.viewhelp.filterResultsExplanationFrag1"/><br>
 <br>
-The user may filter on the log level to display only log lines at that level. <br>
+<fmt:message key="logmanager.viewhelp.filterResultsExplanationFrag2"/> <br>
 <br>
-The user may also enter a string of text to search for.</td>
+<fmt:message key="logmanager.viewhelp.filterResultsExplanationFrag3"/></td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp Sat Jan  5 12:22:33 2008
@@ -20,6 +20,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"/>
 
       <script language="JavaScript">
         var <portlet:namespace/>requiredFieldsCommon = new Array('option-userSelect', 'option-groupSelect');
@@ -34,54 +36,55 @@
         }
       </script>
       <tr>
-        <th style="min-width: 140px"><div align="right">User SELECT SQL:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.common.userSelectSQL" />:</div></th>
         <td><input name="option-userSelect" type="text"
                    size="60" value="${realm.options['userSelect']}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>A SQL statement to load user/password information.  It should return 2 columns, the first
-          holding a username and the second holding a password.  The statement may use the PreparedStatement
-          syntax of ? for a parameter, in which case the username will be set for every parameter.  A
-          typical setting would be <tt>SELECT username, password FROM app_users WHERE username=?</tt></td>
+         <td><fmt:message key="realmwizard._sql.userSelectSQLExp" /></td>
       </tr>
 
       <tr>
-        <th><div align="right">Group SELECT SQL:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.groupSelectSQL" />:</div></th>
         <td><input name="option-groupSelect" type="text"
                    size="60" value="${realm.options['groupSelect']}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>A SQL statement to load group information for a user.  It should return 2 columns, the first
-          holding a username and the second holding a group name.  The statement may use the PreparedStatement
-          syntax of ? for a parameter, in which case the username will be set for every parameter.  A
-          typical setting would be <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt> or for
-          a more normalized schema, <tt>SELECT u.username, g.name FROM app_users u, groups g, user_groups ug
-          WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt></td>
+        <td><fmt:message key="realmwizard._sql.groupSelectSQLExp" /></td>
       </tr>
 
       <tr>
-        <th><div align="right">Digest Algorithm:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.digestAlgorithm" />:</div></th>
         <td><input name="option-digest" type="text"
                    size="10" value="${realm.options['digest']}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>Message Digest algorithm (e.g. MD5, SHA1, etc.) used on the passwords.  Leave this field empty if no digest
-          algorithm is used.</td>
+        <td><fmt:message key="realmwizard._sql.digestAlgorithmExp" /></td>
+      </tr>
+
+      <tr>
+        <th><div align="right"><fmt:message key="realmwizard.common.digestEncoding" />:</div></th>
+        <td><input name="option-encoding" type="text"
+                   size="10" value="${realm.options['encoding']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><fmt:message key="realmwizard._sql.digestEncodingExp" />
+        </td>
       </tr>
 
       <tr>
         <td></td>
-        <td><i>A SQL security realm must either have a database pool or JDBC connectivity settings to
-          connect to the database.  Please select EITHER the database pool, OR the rest of the JDBC
-          settings.</i></td>
+        <td><i><fmt:message key="realmwizard._sql.eitherPoolOrJDBC" />
+        </i></td>
       </tr>
 
 
       <tr>
-        <th><div align="right">Database Pool</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.databasePool" /></div></th>
         <td>
           <select name="option-databasePoolAbstractName" onChange="<portlet:namespace/>changeRequiredFields(this)">
             <option />
@@ -96,23 +99,21 @@
       </tr>
       <tr>
         <td></td>
-        <td>A database pool that the login module will use to connect to the database.  If this is specified, none of
-          the rest of the settings after this are necessary.</td>
+        <td><fmt:message key="realmwizard._sql.databasePoolExp" /></td>
       </tr>
 
       <tr>
-        <th><div align="right">JDBC Driver Class</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.JDBCDriverClass" /></div></th>
         <td><input name="option-jdbcDriver" type="text"
                    size="60" value="${realm.options['jdbcDriver']}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>The fully-qualified JDBC driver class name.  This driver must be located in the JAR specified in the next
-          field.</td>
+        <td><fmt:message key="realmwizard._sql.JDBCDriverClassExp" /></td>
       </tr>
 
       <tr>
-        <th><div align="right">Driver JAR:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.driverJAR" />:</div></th>
         <td>
           <select name="jar">
             <option />
@@ -124,42 +125,41 @@
       </tr>
       <tr>
         <td></td>
-        <td>The JAR holding the selected JDBC driver.  Should be installed under GERONIMO/repository/ to appear in this list.</td>
+        <td><fmt:message key="realmwizard._sql.driverJARExp" /></td>
       </tr>
 
       <tr>
-        <th><div align="right">JDBC URL</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.JDBCUrl" /></div></th>
         <td><input name="option-jdbcURL" type="text"
                    size="60" value="${realm.options['jdbcURL']}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>The JDBC URL that specifies the details of the database to connect to.  This has a different form for
-          each JDBC driver.</td>
+        <td><fmt:message key="realmwizard._sql.JDBCUrlExp" /></td>
       </tr>
 
       <tr>
-        <th><div align="right">JDBC Username</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.JDBCUsername" /></div></th>
         <td><input name="option-jdbcUser" type="text"
                    size="20" value="${realm.options['jdbcUser']}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>The username used to connect to the database</td>
+        <td><fmt:message key="realmwizard._sql.JDBCUsernameExp" /></td>
       </tr>
 
       <tr>
-        <th><div align="right">JDBC Password</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.JDBCPassword" /></div></th>
         <td><input name="option-jdbcPassword" type="password"
                    size="20" value="${realm.options['jdbcPassword']}"></td>
       </tr>
       <tr>
-        <th><div align="right">Confirm Password</div></th>
+        <th><div align="right"><fmt:message key="consolebase.common.confirmPassword"/></div></th>
         <td><input name="confirm-option-jdbcPassword" type="password"
                    size="20" value="${realm.options['jdbcPassword']}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>The password used to connect to the database</td>
+        <td><fmt:message key="realmwizard._sql.JDBCPasswordExp" /></td>
       </tr>
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp Sat Jan  5 12:22:33 2008
@@ -19,6 +19,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">
@@ -46,7 +48,7 @@
 }
 </script>
 
-<p><b>Create Security Realm</b> -- Step 3: Advanced Configuration</p>
+<p><fmt:message key="realmwizard.advanced.title" /></p>
 
 <c:if test="${!(empty AdvancedError)}"><p><font color="red"><b>Error: ${AdvancedError}</b></font></p></c:if>
 
@@ -89,68 +91,61 @@
     <table border="0">
     <!-- ENTRY FIELD: Audit Log -->
       <tr>
-        <th valign="top" style="min-width: 140px"><div align="right">Enable Auditing:</div></th>
+        <th valign="top" style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.common.enableAuditing" />:</div></th>
         <td valign="top">
           <input type="checkbox" id="<portlet:namespace/>auditCheckbox" name="enableAuditing"<c:if test="${!(empty realm.auditPath)}"> checked="checked"</c:if>
           onclick="document.getElementById('<portlet:namespace/>auditDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>auditPath').value='';"/>
           <div id="<portlet:namespace/>auditDiv" style="display: <c:choose><c:when test="${empty realm.auditPath}">none</c:when><c:otherwise>block</c:otherwise></c:choose>;">
-          Log File: <input type="text" id="<portlet:namespace/>auditPath" name="auditPath" size="30" value="${realm.auditPath}" />
+          <fmt:message key="realmwizard.common.logFile" />: <input type="text" id="<portlet:namespace/>auditPath" name="auditPath" size="30" value="${realm.auditPath}" />
           </div>
         </td>
       </tr>
       <tr>
         <td></td>
-        <td>If enabled, every login attempt will be recorded to the specified file.  The path should
-          be relative to the Geronimo home directory (a typical value would be
-          <tt>var/log/login-attempts.log</tt>).</td>
+        <td><fmt:message key="realmwizard.advanced.AuditEnabledExp" /></td>
       </tr>
     <!-- ENTRY FIELDS: Lockout -->
       <tr>
-        <th valign="top"><div align="right">Enable Lockout:</div></th>
+        <th valign="top"><div align="right"><fmt:message key="realmwizard.common.enableLockout" />:</div></th>
         <td valign="top">
           <input type="checkbox" id="<portlet:namespace/>lockoutCheckbox" name="enableLockout"<c:if test="${realm.lockoutEnabled}"> checked="checked"</c:if>
                  onclick="document.getElementById('<portlet:namespace/>lockoutDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>lockoutCount').value='';document.getElementById('<portlet:namespace/>lockoutWindow').value='';document.getElementById('<portlet:namespace/>lockoutDuration').value='';"/>
           <div id="<portlet:namespace/>lockoutDiv" style="display: <c:choose><c:when test="${realm.lockoutEnabled}">block</c:when><c:otherwise>none</c:otherwise></c:choose>;">
-          Lock a user after <input type="text" id="<portlet:namespace/>lockoutCount" name="lockoutCount" size="2" maxlength="3" value="${realm.lockoutCount}" />
-          failures within <input type="text" id="<portlet:namespace/>lockoutWindow" name="lockoutWindow" size="4" maxlength="5" value="${realm.lockoutWindow}" /> seconds<br />
-          and keep the account locked for <input type="text" id="<portlet:namespace/>lockoutDuration" name="lockoutDuration" size="5" maxlength="5" value="${realm.lockoutDuration}" /> seconds.
+          <fmt:message key="realmwizard.advanced.lockUserAfter" /> <input type="text" id="<portlet:namespace/>lockoutCount" name="lockoutCount" size="2" maxlength="3" value="${realm.lockoutCount}" />
+          <fmt:message key="realmwizard.advanced.failuresWithin" /> <input type="text" id="<portlet:namespace/>lockoutWindow" name="lockoutWindow" size="4" maxlength="5" value="${realm.lockoutWindow}" /> <fmt:message key="realmwizard.advanced.failuresWithinSeconds" /><br />
+          <fmt:message key="realmwizard.advanced.keepAccountLockedFor" /> <input type="text" id="<portlet:namespace/>lockoutDuration" name="lockoutDuration" size="5" maxlength="5" value="${realm.lockoutDuration}" /> <fmt:message key="realmwizard.advanced.keepAccountLockedForSeconds" />.
           </div>
         </td>
       </tr>
       <tr>
         <td></td>
-        <td>If enabled, a certain number of failed logins in a particular time frame will cause a
-          user's account to be locked for a certain period of time.  This is a defense against
-          brute force account cracking attacks.</td>
+        <td><fmt:message key="realmwizard.advanced.lockoutEnabledExp" /></td>
       </tr>
     <!-- ENTRY FIELD: Store Password -->
       <tr>
-        <th valign="top"><div align="right">Store Password:</div></th>
+        <th valign="top"><div align="right"><fmt:message key="realmwizard.common.storePassword" />:</div></th>
         <td valign="top">
           <input type="checkbox" name="storePassword"<c:if test="${realm.storePassword}"> checked="checked"</c:if>/>
         </td>
       </tr>
       <tr>
         <td></td>
-        <td>If enabled, the realm will store each user's password in a private credential in the
-          Subject.  This will allow access to the password later after the login process has
-          completed.  This is not normally required.</td>
+        <td><fmt:message key="realmwizard.advanced.storePasswordEnabledExp" /></td>
       </tr>
     <!-- ENTRY FIELD: Named UPC -->
       <tr>
-        <th valign="top"><div align="right">Named Credential:</div></th>
+        <th valign="top"><div align="right"><fmt:message key="realmwizard.advanced.namedCredential" />:</div></th>
         <td valign="top">
           <input type="checkbox" id="<portlet:namespace/>namedUPCCheckbox" name="namedUPC"<c:if test="${!(empty realm.credentialName)}"> checked="checked"</c:if>
           onclick="document.getElementById('<portlet:namespace/>namedUPCDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>credentialName').value='';"/>
           <div id="<portlet:namespace/>namedUPCDiv" style="display: <c:choose><c:when test="${empty realm.credentialName}">none</c:when><c:otherwise>block</c:otherwise></c:choose>;">
-          Credential Name: <input type="text" id="<portlet:namespace/>credentialName" name="credentialName" size="30" value="${realm.credentialName}" />
+          <fmt:message key="realmwizard.advanced.credentialName" />: <input type="text" id="<portlet:namespace/>credentialName" name="credentialName" size="30" value="${realm.credentialName}" />
           </div>
         </td>
       </tr>
       <tr>
         <td></td>
-        <td>If enabled, the realm will store each username and password in a private credential in the
-          Subject under a specified credential name.</td>
+        <td><fmt:message key="realmwizard.advanced.credentialNameExp" /></td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
@@ -158,13 +153,13 @@
         <td>
       <c:choose>
         <c:when test="${realm.testable}">
-          <input type="submit" value="Test a Login" />
-          <input type="button" value="Skip Test and Deploy" onclick="document.<portlet:namespace/>RealmForm.test.value='false';document.<portlet:namespace/>RealmForm.submit();return false;" />
-          <input type="button" value="Skip Test and Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="submit" value='<fmt:message key="realmwizard.common.testLogin" />' />
+          <input type="button" value='<fmt:message key="realmwizard.common.skipTestAndDeploy" />'  onclick="document.<portlet:namespace/>RealmForm.test.value='false';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value='<fmt:message key="realmwizard.common.skipTestAndShowPlan" />'  onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
         </c:when>
         <c:otherwise>
-          <input type="button" value="Deploy Realm" onclick="document.<portlet:namespace/>RealmForm.test.value='false';document.<portlet:namespace/>RealmForm.submit();return false;" />
-          <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value='<fmt:message key="realmwizard.common.deployRealm" />' onclick="document.<portlet:namespace/>RealmForm.test.value='false';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value='<fmt:message key="realmwizard.common.showPlan" />' onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
         </c:otherwise>
       </c:choose>
         </td>
@@ -175,4 +170,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp Sat Jan  5 12:22:33 2008
@@ -20,6 +20,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/>
 
 <script language="JavaScript">
@@ -37,7 +39,7 @@
 }
 </script>
 
-<p><b>Create Security Realm</b> -- Step 2: Configure Login Module</p>
+<p><fmt:message key="realmwizard.configure.title" /></p>
 
 <c:if test="${!(empty LoginModuleError)}"><p><font color="red"><b>Error: ${LoginModuleError}</b></font></p></c:if>
 
@@ -123,7 +125,7 @@
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" onClick="return <portlet:namespace/>validateForm()"/></td>
+        <td><input type="submit" value='<fmt:message key="consolebase.common.next"/>' onClick="return <portlet:namespace/>validateForm()"/></td>
       </tr>
     </table>
 </form>
@@ -132,4 +134,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </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/realmwizard/edit.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp Sat Jan  5 12:22:33 2008
@@ -20,18 +20,14 @@
 <%@ 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/>
+<fmt:message key="realmwizard.edit.summary" />
 
-<p>This page edits a new or existing security realm.</p>
-
-<p>A security realm may have one or more login modules.  Many simple realms have
-only one login module.  Additional login modules may be used to access more
-underlying security information stores, or to add functionality such as auditing
-to a realm without affecting the authentication process for the realm.</p>
 
 <c:if test="${empty realm.abstractName}">
-<p>If you don't need to use as many login modules as there are entries below,
-just leave the extra ones blank.</p>
+<p><fmt:message key="realmwizard.edit.ifLeaveBlank" /></p>
 </c:if>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
@@ -53,7 +49,7 @@
     <table border="0">
     <!-- ENTRY FIELD: NAME -->
       <tr>
-        <th style="min-width: 140px"><div align="right">Realm Name:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.common.realmName" />:</div></th>
         <td>
       <c:choose> <%-- Can't change the realm name after deployment because it's wired into all the abstractNames --%>
         <c:when test="${empty realm.abstractName}">
@@ -68,14 +64,13 @@
       </tr>
       <tr>
         <td></td>
-        <td>A name that is different than the name for any other security realms in the server (no spaces in the name please).
-          Other components will use this name to refer to the security realm.</td>
+        <td><fmt:message key="realmwizard.edit.realmNameExp" /></td>
       </tr>
     <!-- ENTRY FIELD: LoginModule JAR -->
     <c:choose>
       <c:when test="${mode eq 'custom'}">
       <tr>
-        <th><div align="right">Login Module JAR:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.edit.loginModuleJAR" />:</div></th>
         <td>
           <select name="jar">
                   <option />
@@ -89,7 +84,7 @@
       </tr>
       <tr>
         <td></td>
-        <td>The jar containing Login Module and Principal classes.</td>
+        <td><fmt:message key="realmwizard.edit.loginModuleJARExp" /></td>
       </tr>
       </c:when>
       <c:otherwise>
@@ -99,10 +94,10 @@
     <!-- HEADER -->
     <c:forEach var="module" items="${realm.modules}" varStatus="status" >
       <tr>
-        <th colspan="2">Login Module ${status.index+1}</th>
+        <th colspan="2"><fmt:message key="realmwizard.common.loginModule" />${status.index+1}</th>
       </tr>
       <tr>
-        <th><div align="right">Login Domain Name:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.loginDomainName" />:</div></th>
         <td>
       <c:choose> <%-- Can't change the login domain name after deployment because it's how we know which GBean is which --%>
         <c:when test="${empty realm.abstractName}">
@@ -119,20 +114,18 @@
       </tr>
       <tr>
         <td></td>
-        <td>The login domain for this login module, which must be unique among all modules in the security realm.
-          This can be used to distinguish principals from two otherwise identical login modules (for example,
-          from two LDAP login modules pointing to two different LDAP servers)</td>
+        <td><fmt:message key="realmwizard.edit.loginDomainExp" /></td>
       </tr>
       <tr>
-        <th><div align="right">Login Module Class:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.loginModuleClass" />:</div></th>
         <td><input name="module-class-${status.index}" type="text" size="60" value="${module.className}" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>The fully-qualified class name for the login module.</td>
+        <td><fmt:message key="realmwizard.edit.loginModuleClassExp" /></td>
       </tr>
       <tr>
-        <th><div align="right">Control Flag:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.controlFlag" />:</div></th>
         <td>
           <select name="module-control-${status.index}">
             <option value="OPTIONAL"<c:if test="${module.controlFlag eq 'OPTIONAL'}"> selected</c:if>>Optional</option>
@@ -144,12 +137,11 @@
       </tr>
       <tr>
         <td></td>
-        <td>The control flag for the login module, which controls what happens to the overall login processing if this
-          login module succeeds or fails.  For more information see
+        <td><fmt:message key="realmwizard.edit.controlFlagExp" />
           <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/login/Configuration.html">javax.security.auth.login.Configuration</a>.</td>
       </tr>
       <tr>
-        <th><div align="right">Support Advanced Mapping:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.supportAdvancedMapping" />:</div></th>
         <td>
           <select name="module-wrap-${status.index}">
             <option value="true"<c:if test="${module.wrapPrincipals}"> selected</c:if>>Yes</option>
@@ -159,20 +151,15 @@
       </tr>
       <tr>
         <td></td>
-        <td>Normally Geronimo can't distinguish between two different principals that have the same name
-          and same principal class but were produced by two different login modules.  If this option is
-          enabled, Geronimo will "wrap" principals to track which login module and realm each
-          principal came from.  This lets you use the "realm-principal" and "login-domain-principal"
-          elements in your security mapping in Geronimo deployment plans.</td>
+        <td><fmt:message key="realmwizard.edit.supportAdvancedMappingExp" /></td>
       </tr>
       <tr>
-        <th><div align="right">Configuration Options:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.configurationOptions" />:</div></th>
         <td><textarea name="module-options-${status.index}" rows="5" cols="60">${module.optionString}</textarea></td>
       </tr>
       <tr>
         <td></td>
-        <td>Any configuration options necessary for the login module, in the standard Java properties format (one
-          per line, <tt>name=value</tt>)</td>
+        <td><fmt:message key="realmwizard.edit.configurationOptionsExp" /></td>
       </tr>
     </c:forEach>
 
@@ -180,9 +167,9 @@
       <tr>
         <td></td>
         <td>
-          <input type="button" value="<c:choose><c:when test="${empty realm.abstractName}">Deploy</c:when><c:otherwise>Save</c:otherwise></c:choose>"
+          <input type="button" value="<c:choose><c:when test="${empty realm.abstractName}"><fmt:message key='realmwizard.common.deploy' /></c:when><c:otherwise><fmt:message key='consolebase.common.save'/></c:otherwise></c:choose>"
                  onclick="document.<portlet:namespace/>RealmForm.mode.value='save';document.<portlet:namespace/>RealmForm.submit();return false;" />
-          <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value='<fmt:message key="realmwizard.common.showPlan" />' onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
         </td>
       </tr>
     </table>
@@ -193,4 +180,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </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/realmwizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp Sat Jan  5 12:22:33 2008
@@ -16,23 +16,23 @@
 --%>
 <%@ 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 page lists all the available security realms.  Server-wide security realms can be edited, while security
-realms deployed as part of a single application cannot (change the deployment plan in the application instead).</p>
+<p><fmt:message key="realmwizard.list.title" /></p>
 
 <c:choose>
-  <c:when test="${empty(realms)}"><p><i>There are no security realms defined</i></p></c:when>
+  <c:when test="${empty(realms)}"><p><i><fmt:message key="realmwizard.list.noSecurityRealms" /></i></p></c:when>
   <c:otherwise>
-<p>For each realm listed, you can click the <b>usage</b> link to see examples of how
-  to use the realm from your application.</p>
+<p><fmt:message key="realmwizard.list.seeExamples" /></p>
 
 <table width="100%">
   <tr>
-    <td class="DarkBackground">Name</td>
-    <td class="DarkBackground" align="center">Deployed As</td>
-    <td class="DarkBackground" align="center">State</td>
-    <td class="DarkBackground" align="center">Actions</td>
+    <td class="DarkBackground"><fmt:message key="consolebase.common.name"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="consolebase.common.deployedAs"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="consolebase.common.state"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="consolebase.common.actions"/></td>
   </tr>
 <c:forEach var="realm" items="${realms}">
   <tr>
@@ -40,7 +40,7 @@
     <td>
       <c:choose>
         <c:when test="${empty realm.parentName}">
-          Server-wide
+          <fmt:message key="realmwizard.common.serverWide" />
         </c:when>
         <c:otherwise>
           ${realm.parentName}  <%-- todo: make this a link to an application portlet --%>
@@ -57,7 +57,7 @@
                  <portlet:param name="name" value="${info.objectName}" />
                  <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
                  <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
-               </portlet:actionURL>">stop</a>
+               </portlet:actionURL>"><fmt:message key="consolebase.common.stop"/></a>
                </c:when>
                <c:otherwise>
                <a href="<portlet:actionURL portletMode="view">
@@ -65,24 +65,24 @@
                  <portlet:param name="name" value="${info.objectName}" />
                  <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
                  <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
-               </portlet:actionURL>">start</a>
+               </portlet:actionURL>"><fmt:message key="consolebase.common.start"/></a>
                </c:otherwise>
              </c:choose>--%>
       <a href="<portlet:actionURL portletMode="view">
         <portlet:param name="mode" value="editExisting" />
         <portlet:param name="abstractName" value="${realm.abstractName}" />
-      </portlet:actionURL>">edit</a>
+      </portlet:actionURL>"><fmt:message key="consolebase.common.edit"/></a>
       <a href="<portlet:actionURL portletMode="view">
         <portlet:param name="mode" value="usage" />
         <portlet:param name="name" value="${realm.name}" />
         <portlet:param name="abstractName" value="${realm.abstractName}" />
-      </portlet:actionURL>">usage</a>
+      </portlet:actionURL>"><fmt:message key="consolebase.common.usage"/></a>
            <%--<a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="delete" />
                  <portlet:param name="name" value="${info.objectName}" />
                  <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
                  <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
-               </portlet:actionURL>">delete</a>--%>
+               </portlet:actionURL>"><fmt:message key="consolebase.common.delete"/></a>--%>
     </c:if>
     </td>
   </tr>
@@ -93,4 +93,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="type" />
-            </portlet:actionURL>">Add new security realm</a></p>
+            </portlet:actionURL>"><fmt:message key="realmwizard.common.addSecurityRealm" /></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp Sat Jan  5 12:22:33 2008
@@ -19,6 +19,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">
@@ -29,7 +31,7 @@
 }
 </script>
 
-<p><b>Create Security Realm</b> -- Step 1: Select Name and Type</p>
+<p><fmt:message key="realmwizard.selectType.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
@@ -73,17 +75,16 @@
     <table border="0">
     <!-- ENTRY FIELD: NAME -->
       <tr>
-        <th style="min-width: 140px"><div align="right">Name of Security Realm:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.common.nameOfSecurityRealm" />:</div></th>
         <td><input name="name" type="text" size="30" value="${realm.name}" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>A name that is different than the name for any other security realms in the server (no spaces in the name please).
-          Other components will use this name to refer to the security realm.</td>
+        <td><fmt:message key="realmwizard.selectType.nameOfSecurityRealmExp" /></td>
       </tr>
     <!-- ENTRY FIELD: REALM TYPE -->
       <tr>
-        <th><div align="right">Realm Type:</div></th>
+        <th><div align="right"><fmt:message key="realmwizard.common.realmType" />:</div></th>
         <td>
           <select name="realmType">
         <c:forEach var="module" items="${moduleTypes}">
@@ -94,13 +95,11 @@
       </tr>
       <tr>
         <td></td>
-        <td>The type of login module used as the master for this security realm.  Select "Other" for manual
-          configuration options including custom login modules and realms that use multiple login modules
-          to populate user principals.</td>
+        <td><fmt:message key="realmwizard.selectType.realmTypeExp" /></td>
       </tr>
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" onclick="return <portlet:namespace/>validateForm()"/></td>
+        <td><input type="submit" value='<fmt:message key="consolebase.common.next"/>' onclick="return <portlet:namespace/>validateForm()"/></td>
       </tr>
     </table>
 </form>
@@ -108,4 +107,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </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/realmwizard/showPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp Sat Jan  5 12:22:33 2008
@@ -19,9 +19,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><b>Create Security Realm</b> -- Show Deployment Plan</p>
+<p><fmt:message key="realmwizard.showPlan.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
@@ -67,23 +69,21 @@
     <table border="0">
     <!-- STATUS FIELD: Deployment Plan -->
       <tr>
-        <th valign="top" style="min-width: 140px"><div align="right">Deployment Plan:</div></th>
+        <th valign="top" style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.common.deploymentPlan" />:</div></th>
         <td><textarea rows="30" cols="60" readonly>${deploymentPlan}</textarea></td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
         <td>
-<input type="submit" value="<c:choose><c:when test="${empty realm.abstractName}">Deploy Realm</c:when><c:otherwise>Save</c:otherwise></c:choose>" />
-<input type="button" value="Edit Settings" onclick="document.<portlet:namespace/>RealmForm.mode.value='configure';document.<portlet:namespace/>RealmForm.submit();return false;" />
+<input type="submit" value="<c:choose><c:when test="${empty realm.abstractName}"><fmt:message key='realmwizard.common.deployRealm' /></c:when><c:otherwise><fmt:message key='consolebase.common.save'/></c:otherwise></c:choose>" />
+<input type="button" value='<fmt:message key="realmwizard.common.editSettings" />'  onclick="document.<portlet:namespace/>RealmForm.mode.value='configure';document.<portlet:namespace/>RealmForm.submit();return false;" />
         </td>
       </tr>
     <!-- STATUS FIELD: Command-line guidance -->
       <tr>
-        <th valign="top"><div align="right">Deploy Command:</div></th>
-        <td>To deploy a security realm from the command line using this plan,
-          copy and paste it to a file (say, <tt>security-realm.xml</tt>) and save
-          it.  Then run a command like:<br />
+        <th valign="top"><div align="right"><fmt:message key="realmwizard.common.deployCommand" />:</div></th>
+        <td><fmt:message key="realmwizard.showPlan.deployCommandExp" /><br />
 <pre>
 cd GERONIMO_HOME
 java -jar bin/deployer.jar deploy security-realm.xml
@@ -91,14 +91,8 @@
       </tr>
     <!-- STATUS FIELD: Embed in EAR guidance -->
       <tr>
-        <th valign="top"><div align="right">Add to EAR:</div></th>
-        <td>Instead of deploying as a top-level security realm, you
-          can deploy this realm as part of an EAR.  To add a security
-          realm to an EAR using this plan, create a
-          <tt>META-INF/geronimo-application.xml</tt> file in your EAR
-          that has the <tt>dependency</tt> elements (if any) and
-          <tt>gbean</tt> elements from the plan above.  It should look
-          something like this:
+        <th valign="top"><div align="right"><fmt:message key="realmwizard.common.addToEAR" />:</div></th>
+        <td><fmt:message key="realmwizard.showPlan.addToEARExp" />
 <pre>
 &lt;application
    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"&gt;
@@ -126,4 +120,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </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/realmwizard/testLogin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp Sat Jan  5 12:22:33 2008
@@ -19,6 +19,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">
@@ -29,12 +31,9 @@
 }
 </script>
 
-<p><b>Create Security Realm</b> -- Step 4: Test Login</p>
+<p><fmt:message key="realmwizard.testLogin.title" /></p>
 
-<p>From here you can enter a username and password for the main login module in the realm, and
-see if the login is successful and which Principals are generated for the user.  This is
-menat to be an indication of whether the settings for the main login module are correct.  It
-does not invoke advanced features such as auditing or lockout.</p>
+<p><fmt:message key="realmwizard.testLogin.summary" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
@@ -80,25 +79,25 @@
     <table border="0">
     <!-- ENTRY FIELD: Username -->
       <tr>
-        <th style="min-width: 140px"><div align="right">Username:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="consolebase.common.userName"/>:</div></th>
         <td><input name="username" type="text" size="20" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>The username to use to log in to the realm.</td>
+        <td><fmt:message key="realmwizard.testLogin.usernameExp" /></td>
       </tr>
     <!-- ENTRY FIELD: Password -->
       <tr>
-        <th><div align="right">Password:</div></th>
+        <th><div align="right"><fmt:message key="consolebase.common.password"/>:</div></th>
         <td><input name="password" type="password" size="20" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>The password to use to log in to the realm.</td>
+        <td><fmt:message key="realmwizard.testLogin.passwordExp" /></td>
       </tr>
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" onClick="return <portlet:namespace/>validateForm()"/></td>
+        <td><input type="submit" value='<fmt:message key="consolebase.common.next"/>' onClick="return <portlet:namespace/>validateForm()"/></td>
       </tr>
     </table>
 </form>
@@ -106,4 +105,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </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/realmwizard/testResults.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/testResults.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/testResults.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/testResults.jsp Sat Jan  5 12:22:33 2008
@@ -20,9 +20,11 @@
 <%@ 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>Create Security Realm</b> -- Step 5: Login Results</p>
+<p><fmt:message key="realmwizard.testResults.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
@@ -68,13 +70,13 @@
     <table border="0">
     <!-- STATUS FIELD: Results -->
       <tr>
-        <th style="min-width: 140px"><div align="right">Test Results:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="realmwizard.testResults.testResults" />:</div></th>
         <td colspan="2">${LoginResults}</td>
       </tr>
     <!-- STATUS FIELD: Principals -->
     <c:if test="${!(empty principals)}">
       <tr>
-        <th rowspan="${fn:length(principals)}" valign="top"><div align="right">Principals:</div></th>
+        <th rowspan="${fn:length(principals)}" valign="top"><div align="right"><fmt:message key="realmwizard.common.principals" />:</div></th>
       <c:forEach var="principal" items="${principals}" varStatus="status">
       <c:if test="${!status.first}">
       <tr>
@@ -88,10 +90,10 @@
       <tr>
         <td></td>
         <td colspan="2">
-          <input type="submit" value="Test Again" />
-          <input type="button" value="Edit Realm" onclick="document.<portlet:namespace/>RealmForm.mode.value='configure';document.<portlet:namespace/>RealmForm.submit();return false;" />
-          <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
-          <input type="button" value="<c:choose><c:when test="${empty realm.abstractName}">Deploy Realm</c:when><c:otherwise>Save</c:otherwise></c:choose>"
+          <input type="submit" value='<fmt:message key="realmwizard.common.testAgain" />' />
+          <input type="button" value='<fmt:message key="realmwizard.common.editRealm" />' onclick="document.<portlet:namespace/>RealmForm.mode.value='configure';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value='<fmt:message key="realmwizard.common.showPlan" />' onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value="<c:choose><c:when test="${empty realm.abstractName}"><fmt:message key='realmwizard.common.deployRealm' /></c:when><c:otherwise><fmt:message key='consolebase.common.save'/></c:otherwise></c:choose>"
                  onclick="document.<portlet:namespace/>RealmForm.mode.value='save';document.<portlet:namespace/>RealmForm.submit();return false;" />
         </td>
       </tr>
@@ -101,4 +103,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>



Mime
View raw message