geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r609207 [7/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/realmwizard/usage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp Sat Jan  5 12:22:33 2008
@@ -17,21 +17,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>This page talks about how to use the security realm ${realm.name} from a J2EE application.
-  The example here is a web application, but other application modules would work similarly.</p>
+<p><fmt:message key="realmwizard.usage.title" >
+<fmt:param  value="${realm.name}"/>
+</fmt:message></p>
 
 
 <p><b>WEB-INF/web.xml</b></p>
 
 <p>The <tt>web.xml</tt> should have</p>
-<ul>
-  <li>One or more <tt>security-constraint</tt> blocks designating the protected pages or URLs</li>
-  <li>A <tt>login-config</tt> section configuring the login style for the application</li>
-  <li>One or more <tt>security-role</tt> blocks listing the security roles used by the
-    application</li>
-</ul>
+<fmt:message key="realmwizard.usage.webXmlShouldHave" />
+
 
 <pre>
 &lt;web-app xmlns="http://java.sun.com/xml/ns/j2ee"
@@ -69,15 +68,7 @@
 
 <p><b>WEB-INF/geronimo-web.xml</b></p>
 
-<p>To configure the security realm and the members of each role, the web application
-needs to have a <tt>geronimo-web.xml</tt> deployment plan.  That may be packaged in the WAR
-in the <tt>WEB-INF</tt> directory, or it may be provided separately on the command line to
-the deploy tool.</p>
-
-<p>The <tt>geronimo-web.xml</tt> plan should have a <tt>security-realm-name</tt>
-element indicating which realm will be used to authenticate logins to the web application.
-It also needs to have a <tt>security</tt> element listing the users or groups who
-should be members of each <tt>security-role</tt> listed in <tt>web.xml</tt>.</p>
+<fmt:message key="realmwizard.usage.geronimoWebXmlPreface" />
 
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
@@ -111,43 +102,16 @@
     &lt;/security&gt;
 &lt;/web-app&gt;
 </pre>
+<fmt:message key="realmwizard.usage.geronimoWebXmlLater" >
+<fmt:param  value="${realm.name}"/>
+</fmt:message>
+
+<p><b><fmt:message key="realmwizard.usage.applicationCode" /></b></p>
+<fmt:message key="realmwizard.usage.applicationCodeExp" />
 
-<p>This example indicated that ${realm.name} will be used to handle all logins to
-the web application.  Then it maps the <tt>admin</tt> role to a combination of
-one user (<tt>root</tt>) and one group (<tt>administrators</tt>), using a combination
-of the principal classes and principal names.  (Note that if ${realm.name} uses a
-custom login module, the principal classes may be different, but the ones listed
-above are used for users and groups by all the standard Geronimo login modules.)</p>
-
-<p>It's also possible to configure separate login modules to use separate login
-domain names, and then use the login domain names in the role mapping (so a user
-"root" from login domain "Foo" is different from a user "root" from login domain
-"Bar"), but this is only important if you have multiple login modules assigning
-principals to the users.</p>
-
-<p>Finally, if the <tt>security</tt> section is declared in an EAR
-<tt>application.xml</tt> deployment descriptor, there's no need to repeat it
-in any of the modules inside the EAR -- they'll all share the same role mapping
-information.</p>
-
-<p><b>Application Code</b></p>
-
-<p>No special application code is required to work with security roles.</p>
-
-<p>If an application calls <tt>HttpServletRequest.getUserPrincipal()</tt>,
-Geronimo will return a principal where the principal class implements
-<tt>GeronimoCallerPrincipal</tt> -- normally a username (since <tt>GeronimoUserPrincipal</tt>
-implements <tt>GeronimoCallerPrincipal</tt>).  If you're using a custom login
-module and getting the wrong results for <tt>getUserPrincipal</tt>, try
-making your user principal class implement <tt>GeronimoCallerPrincipal</tt>.</p>
-
-<p>If an application calls <tt>HttpServletRequest.isUserInRole(role)</tt>,
-Geronimo will return true or false depending on whether any of the principals
-assigned to that user by the realm's login modules were listed in the role
-mapping above.</p>
 
 <hr />
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </portlet:actionURL>">Return to list</a></p>
+            </portlet:actionURL>"><fmt:message key="consolebase.common.returnToList"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/help.jsp Sat Jan  5 12:22:33 2008
@@ -14,20 +14,22 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>This page displays the artifacts installed in the server's repository. The layout of the repository is the same as that used by Apache Maven making it possible to easily copy files over. The Geronimo Console provides a method for adding artifacts:</p><br>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<p><fmt:message key="repository.help.title"/></p><br>
 
 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><img src="/console/images/browse.gif" alt="Browse"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Use the Browse button to select the artifact to be added.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="repository.help.browseExplanation"/></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><img src="/console/images/install.gif" alt="Install"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Click on the Install button to install the artifact.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="repository.help.installExplanation"/></td>
   </tr>
 </table>
 
-<p>To use an artifact in an application, add a dependency element into it's deployment plan. For example, to use Castor XML add the following XML to the plan:
+<p><fmt:message key="repository.help.addDependencyElement"/>
 <pre>
     &lt;dependency&gt;
         &lt;uri&gt;org/codehaus/castor/castor/1.0.5/castor-1.0.5.jar&lt;/uri&gt;

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.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/>
 
 <c:set var="reslist" value="${requestScope['org.apache.geronimo.console.repo.list']}"/>
@@ -95,31 +97,31 @@
   <form onsubmit="return <portlet:namespace/>validate();" enctype="multipart/form-data" name="<portlet:namespace/>fileSelect" method="POST" action="<portlet:actionURL><portlet:param name="action" value="deploy"/></portlet:actionURL>">
   <table>
     <tr>
-      <th colspan="2">Add Archive to Repository</th>
+      <th colspan="2"><fmt:message key="repository.normal.addArchiveToRepository"/></th>
     </tr>
     <tr>
-      <td>File</td>
+      <td><fmt:message key="consolebase.common.file"/></td>
       <td><input name="local" onchange="<portlet:namespace/>parse(value);" type="file">&nbsp;&nbsp;&nbsp;</td>
     </tr>
     <tr>
-      <td>Group:</td>
+      <td><fmt:message key="consolebase.common.group"/>:</td>
       <td><input type="text" name="group" value="${group}"/></td>
     </tr>
     <tr>
-      <td>Artifact:</td>
+      <td><fmt:message key="repository.normal.artifact"/>:</td>
       <td><input type="text" name="artifact" value="${artifact}"/></td>
     </tr>
     <tr>
-      <td>Version:</td>
+      <td><fmt:message key="consolebase.common.version"/>:</td>
       <td><input type="text" name="version" value="${version}"/></td>
     </tr>
     <tr>
-      <td>Type:</td>
+      <td><fmt:message key="consolebase.common.type"/>:</td>
       <td><input type="text" name="fileType" value="${fileType}"/></td>
     </tr>
     <tr><td colspan="2"><font size="-2">&nbsp;</font></td></tr>
     <tr>
-      <td colspan="2" align="center"><input type="submit" value="Install" /></td>
+      <td colspan="2" align="center"><input type="submit" value='<fmt:message key="consolebase.common.install"/>' /></td>
     </tr>
   </table>
   </form>
@@ -127,8 +129,8 @@
 </tr>
 </table>
 
-<b>Current Repository Entries</b>
-<p>Click on an entry to view usage.</p>
+<b><fmt:message key="repository.normal.currentRepositoryEntries"/></b>
+<p><fmt:message key="repository.normal.toViewUsage"/></p>
 <ul>
 <c:forEach items="${reslist}" var="res">
 <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="usage"/><portlet:param name="res" value="${res}"/></portlet:actionURL>"><c:out value="${res}"/></a></li>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/usage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/usage.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/usage.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/usage.jsp Sat Jan  5 12:22:33 2008
@@ -17,10 +17,19 @@
 
 <%-- $Rev$ $Date$ --%>
 
-<b>Usage for ${res}</b>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 
-<p>To use <b>${res}</b> in an application or a module, add a dependency element under dependencies in environment element in
-it's deployment plan as shown below:
+<b><fmt:message key="repository.usage.title" >
+<fmt:param  value="${res}"/>
+</fmt:message>
+</b>
+  
+<p>
+<fmt:message key="repository.usage.content" >
+<fmt:param  value="${res}"/>
+</fmt:message>
+</b>
 <pre>
     &lt;environment&gt;
         ...
@@ -36,4 +45,4 @@
     &lt;/environment&gt;
 </pre>
 
-<p><a onClick="history.go(-1); return false;" href="">Back</a>
+<p><a onClick="history.go(-1); return false;" href=""><fmt:message key="consolebase.common.back"/></a>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.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"/>
 <script language="JavaScript">
 var <portlet:namespace/>formName = "<portlet:namespace/>addgroup";
 var <portlet:namespace/>requiredFields = new Array("GroupName","Description");
@@ -57,31 +59,31 @@
     <tr>
       <td colspan="2" align="left" class="formHeader">
        <c:choose>
-	   <c:when test="${add}"> 
-       		<b>ADD GROUP</b>
-      		<c:set var="GroupName" value=""/>
-      		<c:set var="Description" value=""/>
-      		<c:set var="Submit" value="Add"/>
+       <c:when test="${add}"> 
+               <b><fmt:message key="securityrealmmanager.derby.groups.addmaximized.addGroup" /></b>
+              <c:set var="GroupName" value=""/>
+              <c:set var="Description" value=""/>
+              <c:set var="Submit" value="Add"/>
        </c:when>
        <c:otherwise>
-			<b>UPDATE GROUP</b>
-      		<c:set var="GroupName" value="${group['GroupName']}"/>
-      		<c:set var="Description" value="${group['Description']}"/>
-      		<c:set var="Submit" value="Update"/>
+            <b><fmt:message key="securityrealmmanager.derby.groups.addmaximized.updateGroup" /></b>
+              <c:set var="GroupName" value="${group['GroupName']}"/>
+              <c:set var="Description" value="${group['Description']}"/>
+              <c:set var="Submit" value="Update"/>
        </c:otherwise>
        </c:choose>
         </td>
     </tr>
     <tr>
-        <td width="200" class="formLabel">Group Name</td>
+        <td width="200" class="formLabel"><fmt:message key="consolebase.common.groupName"/></td>
         <td class="formElement">
        <c:choose>
-	   <c:when test="${add}"> 
-	    <input type="hidden" name="action" value="add">
-	    <input type="text" name="GroupName" value="">
+       <c:when test="${add}"> 
+        <input type="hidden" name="action" value="add">
+        <input type="text" name="GroupName" value="">
        </c:when>
        <c:otherwise>
-	    <input type="hidden" name="action" value="update">
+        <input type="hidden" name="action" value="update">
         <input type="hidden" name="GroupName" value="${GroupName}">
         ${GroupName}
        </c:otherwise>
@@ -90,11 +92,11 @@
     </tr>   
 
     <tr>
-        <td width="200" class="formLabel">Description</td>
+        <td width="200" class="formLabel"><fmt:message key="consolebase.common.description"/></td>
         <td class="formElement"><input type="text" name="Description" value="${Description}"></td>
     </tr>   
     <tr>
-        <td class="formLabel">Users</td>
+        <td class="formLabel"><fmt:message key="consolebase.common.users"/></td>
         <td colspan="2" class="formElement">
         <c:choose>
         <c:when test="${(otherUsers != null && fn:length(otherUsers) > 0) || (users != null && fn:length(users) > 0)}">
@@ -102,9 +104,9 @@
             <tr>
                 <td>
                     <select name="usersToRemove" size="4" multiple>
-            	    <c:forEach var="user" items="${otherUsers}">
-                	    <option value="${user}">${user}</option>
-                	</c:forEach>    
+                    <c:forEach var="user" items="${otherUsers}">
+                        <option value="${user}">${user}</option>
+                    </c:forEach>    
                     </select> 
                 </td>
                 <td align="center" valign="middle">
@@ -129,7 +131,7 @@
             </table>
         </c:when>
         <c:otherwise>
-        No available users.
+       <fmt:message key="securityrealmmanager.derby.groups.addmaximized.noUsers" />
         </c:otherwise>
         </c:choose>       
         </td>
@@ -139,7 +141,7 @@
           <td align="left" class="formElement">
           <input type="submit" value="${Submit}" 
                 onclick="return <portlet:namespace/>validateForm() && <portlet:namespace/>selectAll('<portlet:namespace/>addgroup', 'Members');">
-          <input type="submit" name="cancel"  value="Cancel">
+          <input type="submit" name="cancel" value='<fmt:message key="consolebase.common.cancel"/>'  >
           </td>
     </tr>
     </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp Sat Jan  5 12:22:33 2008
@@ -14,34 +14,28 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>This portlet lists all the Application Realm groups and allows the 
-  user to add, modify and delete them. To add a new group click on
-  the &quot;Create New Group&quot; link and fill in the fields on that page. To 
-  modify an existing group, click on the group link and change the 
-  field(s) on the page. To delete a group, click on the &quot;Delete&quot; link 
-  to the right of the group to be deleted. <br>
-  <br>
-  Clicking on the &quot;Create New Group&quot; link allows creation of a new
-  group by filling in the fields and clicking on the &quot;Add&quot; button.</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<p> <fmt:message key="securityrealmmanager.derby.groups.help.title" /></p>
 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Group Name</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The name of the group.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="consolebase.common.groupName"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.common.groupNameExp" /></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Description</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The description of the group.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="consolebase.common.description"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.groups.help.descriptionExp" /></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Users</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The box on the left lists all the current user accounts. Selecting a user and then clicking the &quot;Add&gt;&gt;&quot; button will put the user in the group. Selecting a user in the list to the right and clicking on the &quot;&lt;&lt;Remove&quot; button will delete the user from the group.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="consolebase.common.users"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.groups.help.usersExp" /></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/add.gif" alt="Add"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Add a new group. If users have been placed in the new group, then clicking &quot;Add&quot; will create the new group with the selected users in it.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.groups.help.addNewGroupBtnExp" /></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/cancel.gif" alt="Cancel"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Cancel the current operation.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.groups.help.cancelUserBtnExp" /></td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.jsp Sat Jan  5 12:22:33 2008
@@ -16,22 +16,25 @@
 --%>
 <%@ 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="securityrealmmanager"/>
+<fmt:setBundle basename="standard_common" var="standard_common"/>
 <portlet:defineObjects/>
 <table width="100%">
     ${message}
- 	<tr>
-		<td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>">Create New Group</a> </td><td colspan="2">&nbsp;</td>
-	</tr>
+     <tr>
+        <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>"><fmt:message key="securityrealmmanager.derby.groups.maximized.createNewGroup" /></a> </td><td colspan="2">&nbsp;</td>
+    </tr>
         <tr>
-            <td width="100">Group Name</td>
-            <td width="150">Description</td>
+            <td width="100"><fmt:message key="consolebase.common.groupName"/></td>
+            <td width="150"><fmt:message key="consolebase.common.description"/></td>
             <td></td>
         </tr>
     <c:forEach var="group" items="${groups}">
         <tr>
             <td width="100"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="group" value="${group.key}"/></portlet:actionURL>">${group.key}</a></td>
             <td width="150">${group.value}</td>
-            <td><a href="<portlet:actionURL><portlet:param name="group" value="${group.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete?');">Delete</a></td>
+            <td><a href="<portlet:actionURL><portlet:param name="group" value="${group.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete?');"><fmt:message key="consolebase.common.delete"/></a></td>
         </tr>
     </c:forEach>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.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"/>
 <script language="JavaScript">
 var formName = "adduser";
 var requiredFields = new Array("UserName","Password");
@@ -39,43 +41,43 @@
     <tr>
       <td colspan="2" align="left" class="formHeader">
        <c:choose>
-	   <c:when test="${add}"> 
-       		<b>ADD USER</b>
-      		<c:set var="UserName" value=""/>
-      		<c:set var="Password" value=""/>
-      		<c:set var="Password2" value=""/>
-      		<c:set var="FirstName" value=""/>
-      		<c:set var="MiddleInit" value=""/>
-      		<c:set var="LastName" value=""/>
-      		<c:set var="Department" value=""/>
-      		<c:set var="Email" value=""/>
-      		<c:set var="Submit" value="Add"/>
+       <c:when test="${add}"> 
+               <b><fmt:message key="securityrealmmanager.derby.users.addmaximized.addUser" /></b>
+              <c:set var="UserName" value=""/>
+              <c:set var="Password" value=""/>
+              <c:set var="Password2" value=""/>
+              <c:set var="FirstName" value=""/>
+              <c:set var="MiddleInit" value=""/>
+              <c:set var="LastName" value=""/>
+              <c:set var="Department" value=""/>
+              <c:set var="Email" value=""/>
+              <c:set var="Submit" value="Add"/>
        </c:when>
        <c:otherwise>
-			<b>UPDATE USER</b>
-      		<c:set var="UserName" value="${user['UserName']}"/>
-      		<c:set var="Password" value="xxxxxxxx"/>
-      		<c:set var="Password2" value="yyyyyyyy"/>      		
-      		<c:set var="FirstName" value="${user['FirstName']}"/>
-      		<c:set var="MiddleInit" value="${user['MiddleInit']}"/>
-      		<c:set var="LastName" value="${user['LastName']}"/>
-      		<c:set var="Department" value="${user['Department']}"/>
-      		<c:set var="Email" value="${user['Email']}"/>
-      		<c:set var="Submit" value="Update"/>
+            <b><fmt:message key="securityrealmmanager.derby.users.addmaximized.updateUser" /></b>
+              <c:set var="UserName" value="${user['UserName']}"/>
+              <c:set var="Password" value="xxxxxxxx"/>
+              <c:set var="Password2" value="yyyyyyyy"/>              
+              <c:set var="FirstName" value="${user['FirstName']}"/>
+              <c:set var="MiddleInit" value="${user['MiddleInit']}"/>
+              <c:set var="LastName" value="${user['LastName']}"/>
+              <c:set var="Department" value="${user['Department']}"/>
+              <c:set var="Email" value="${user['Email']}"/>
+              <c:set var="Submit" value="Update"/>
        </c:otherwise>
        </c:choose>
         </td>
     </tr>
     <tr>
-        <td width="200" class="formLabel">User Name</td>
+        <td width="200" class="formLabel"><fmt:message key="consolebase.common.userName"/></td>
         <td class="formElement">
        <c:choose>
-	   <c:when test="${add}"> 
-	    <input type="hidden" name="action" value="add">
-	    <input type="text" name="UserName" value="" maxlength="30">
+       <c:when test="${add}"> 
+        <input type="hidden" name="action" value="add">
+        <input type="text" name="UserName" value="" maxlength="30">
        </c:when>
        <c:otherwise>
-	    <input type="hidden" name="action" value="update">
+        <input type="hidden" name="action" value="update">
         <input type="hidden" name="UserName" value="${UserName}">
         ${UserName}
        </c:otherwise>
@@ -83,34 +85,34 @@
         </td>
     </tr>   
     <tr>
-        <td width="200" class="formLabel">Password</td>
+        <td width="200" class="formLabel"> <fmt:message key="consolebase.common.password"/></td>
         <td class="formElement"><input type="password" name="Password" value="${Password}" maxlength="30"></td>
     </tr>   
     <tr>
-        <td width="200">Confirm Password</td>
+        <td width="200"><fmt:message key="consolebase.common.confirmPassword"/>Confirm Password</td>
         <td><input type="password" name="ConfirmPassword" value="${Password2}" maxlength="30"></td>
     </tr>
     <tr>
-        <td width="200" class="formLabel">Given Name</td>
+        <td width="200" class="formLabel"><fmt:message key="consolebase.common.givenName"/></td>
         <td class="formElement"><input type="text" name="FirstName" value="${FirstName}" maxlength="30"></td>
     </tr>
 
     <input type="hidden" name="MiddleInit" value="" >
     <tr>
-        <td width="200" class="formLabel">Family Name</td>
+        <td width="200" class="formLabel"><fmt:message key="consolebase.common.familyName"/></td>
         <td class="formElement"><input type="text" name="LastName" value="${LastName}" maxlength="30"></td>
     </tr>
     <tr>
-        <td width="200" class="formLabel">Department</td>
+        <td width="200" class="formLabel"><fmt:message key="consolebase.common.department"/></td>
         <td class="formElement"><input type="text" name="Department" value="${Department}" maxlength="30"></td>
     </tr>
     <tr>
-        <td width="200" class="formLabel">Email</td>
+        <td width="200" class="formLabel"><fmt:message key="consolebase.common.email"/></td>
         <td class="formElement"><input type="text" name="Email" value="${Email}" maxlength="30"></td>
     </tr>
 
     <tr>   
-         <td>&nbsp;</td><td  align="left"><input type="submit" value="${Submit}" class="formElement" onclick="return <portlet:namespace/>validateForm()"> <input type="submit" name="cancel" value="Cancel" ></td>
+         <td>&nbsp;</td><td  align="left"><input type="submit" value="${Submit}" class="formElement" onclick="return <portlet:namespace/>validateForm()"> <input type="submit" name="cancel" 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/securityrealmmanager/derby/users/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/help.jsp Sat Jan  5 12:22:33 2008
@@ -14,40 +14,42 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>This page lists all the application realm users and allows you to add, modify and delete them. To add a new user click on the &quot;Create New User&quot; link and fill in the fields on that page. To modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the &quot;Delete&quot;  link to the right of the user to be deleted. <br>
-  <br>
-  Clicking on the &quot;Create New User&quot; link allows adding users by filling in the fields and clicking on the &quot;Add&quot; button. The fields are defined as follows:</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<p>
+<fmt:message key="securityrealmmanager.derby.users.help.title" />
+</p>
 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">User Name</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The username for the user.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="consolebase.common.userName"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.users.help.usernameExp"/></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Password</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Password for the new user.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="consolebase.common.password"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.users.help.passwordExp"/></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Given Name</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The user's first name.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="consolebase.common.givenName"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.users.help.givenNameExp"/></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Family Name</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The user's last name.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="consolebase.common.familyName"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.users.help.familyNameExp"/></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Department</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The user's department.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"> <fmt:message key="consolebase.common.department"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.users.help.departmentExp"/></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Email</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The user's email address.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="consolebase.common.email"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.users.help.emailExp"/></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/add.gif" alt="Add"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Add a new user.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.users.help.addUserBtnExp"/></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/cancel.gif" alt="Cancel"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Cancel the current operation.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.derby.users.help.cancelUserBtnExp"/></td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp Sat Jan  5 12:22:33 2008
@@ -16,16 +16,18 @@
 --%>
 <%@ 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/>
 
 <table width="100%" cellspacing="5">
     ${message}
-	<tr>
-		<td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>">Create New User</a> </td>
-		<td >&nbsp;</td>
-	</tr>
+    <tr>
+        <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>"><fmt:message key="securityrealmmanager.derby.users.maximized.createNewUser"/></a> </td>
+        <td >&nbsp;</td>
+    </tr>
         <tr>
-            <td>Username</td>
+            <td><fmt:message key="consolebase.common.userName"/></td>
             <td>&nbsp;</td>
             
         </tr>
@@ -33,7 +35,7 @@
         <tr>
             <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="userId" value="${user.key}"/></portlet:actionURL>">${user.key}</a></td>
             
-            <td><a href="<portlet:actionURL><portlet:param name="userId" value="${user.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete?');">Delete</a></td>
+            <td><a href="<portlet:actionURL><portlet:param name="userId" value="${user.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete?');"><fmt:message key="consolebase.common.delete"/></a></td>
         </tr>
     </c:forEach>
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp Sat Jan  5 12:22:33 2008
@@ -21,6 +21,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/>formName = "<portlet:namespace/>addgroup";
 var <portlet:namespace/>requiredFields = new Array("group");
@@ -63,7 +65,7 @@
       <td colspan="2" align="left" class="formHeader">
        <c:choose>
 	   <c:when test="${add}"> 
-       		<b>ADD GROUP</b>
+       		<b><fmt:message key="securityrealmmanager.se.groups.addmaximized.addGroup" /></b>
       		<c:set var="GroupName" value=""/>
       		<c:set var="Submit" value="Add"/>
        </c:when>
@@ -76,7 +78,7 @@
         </td>
     </tr>
     <tr>
-        <td width="200" class="formLabel">Group Name</td>
+        <td width="200" class="formLabel"><fmt:message key="consolebase.common.groupName"/></td>
         <td class="formElement">
        <c:choose>
 	   <c:when test="${add}"> 
@@ -92,7 +94,7 @@
         </td>
     </tr>   
     <tr>
-        <td class="formLabel">Users</td>
+        <td class="formLabel"><fmt:message key="consolebase.common.users"/></td>
         <td class="formElement">
         <c:choose>
         <c:when test="${users != null && fn:length(users) > 0}">
@@ -146,7 +148,7 @@
              
         </c:when>
         <c:otherwise>
-        No available users.
+        <fmt:message key="securityrealmmanager.se.groups.addmaximized.noUsers" />
         </c:otherwise>
         </c:choose>       
         </td>
@@ -155,7 +157,7 @@
        <td>&nbsp;</td><td align="left" class="formElement">
        <input type="submit" value="${Submit}" 
             onclick="return <portlet:namespace/>validateForm() && <portlet:namespace/>selectAll('<portlet:namespace/>addgroup', 'users');">
-       <input type="submit" name="cancel"  value="Cancel">
+       <input type="submit" name="cancel"  value="<fmt:message key="consolebase.common.cancel"/>">
        </td>
       </tr>
     </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp Sat Jan  5 12:22:33 2008
@@ -14,25 +14,24 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>This portlet lists all the Console Realm groups and allows the user to add, modify and delete them. To add a new group click on the &quot;Create New Group&quot; link and fill in the fields on that page. To modify 
-  an existing group, click on the group link and change the field(s) on the page. To delete a group, click on the &quot;Delete&quot; link to the right of the group to be deleted. <br>
-  <br>
-  Clicking on the &quot;Create New Group&quot; link allows the user to add a new   group. The fields are defined as follows:</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<p><fmt:message key="securityrealmmanager.se.groups.help.title" /></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; color: #1E1E52;">Group Name</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The name of the group.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="consolebase.common.groupName"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.common.groupNameExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Users</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The box on the left lists all the current user accounts. Selecting a user and then clicking the &quot;Add&gt;&gt;&quot; button will put the user in the group. Selecting a user in the list to the right and clicking on the &quot;&lt;&lt;Remove&quot; button will delete the user from the group.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="consolebase.common.users"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.se.groups.help.usersExp" /></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/add.gif" alt="Add"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Add a new group. If users have been placed in the new group, then clicking &quot;Add&quot; will create the new group with the selected users in it.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.se.groups.help.addNewGroupBtnExp" /></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/cancel.gif" alt="Cancel"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Cancel the current operation.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.se.groups.help.cancelUserBtnExp" /></td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp Sat Jan  5 12:22:33 2008
@@ -16,16 +16,18 @@
 --%>
 <%@ 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/>
 <table width="50%" cellspacing="5">
     ${message}
 	<tr>
-        <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>">Create New Group</a></td>
+        <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>"><fmt:message key="securityrealmmanager.se.groups.maximized.createNewGroup" /></a></td>
         <td></td>
 	</tr>
     <tr class="DarkBackground">
-        <th>Group Name</th>
-        <th>Actions</th>
+        <th><fmt:message key="consolebase.common.groupName"/></th>
+        <th><fmt:message key="consolebase.common.actions"/></th>
     </tr>
     <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="group" items="${groupsInfo}">
@@ -40,9 +42,9 @@
         <tr>
             <td class="${backgroundClass}"> ${group.key} </td>
             <td class="${backgroundClass}">
-            <a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="group" value="${group.key}"/></portlet:actionURL>">Edit</a>
+            <a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="group" value="${group.key}"/></portlet:actionURL>"><fmt:message key="consolebase.common.edit"/></a>
             &nbsp;
-            <a href="<portlet:actionURL><portlet:param name="group" value="${group.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete group ${group.key}?');">Delete</a>
+            <a href="<portlet:actionURL><portlet:param name="group" value="${group.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete group ${group.key}?');"><fmt:message key="consolebase.common.delete"/></a>
             </td>
         </tr>
         </form>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.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"/>
 <script language="JavaScript">
 var <portlet:namespace/>formName = "adduser";
 var <portlet:namespace/>requiredFields = new Array("userId","password");
@@ -42,13 +44,13 @@
         <td colspan="2" align="left">
         <c:choose>
         <c:when test="${add}"> 
-       		<b>ADD USER</b>
+       		<b><fmt:message key="securityrealmmanager.se.users.addmaximized.addUser" /></b>
       		<c:set var="UserName" value=""/>
       		<c:set var="Action" value="add"/>      		
       		<c:set var="Submit" value="Add"/>
        </c:when>
        <c:otherwise>
-			<b>UPDATE USER</b>
+			<b><fmt:message key="securityrealmmanager.se.users.addmaximized.updateUser" /></b>
       		<c:set var="UserName" value="${userID}"/>
       		<c:set var="Action" value="update"/>      		
       		<c:set var="Submit" value="Update"/>
@@ -57,7 +59,7 @@
         </td>
     </tr>
     <tr>
-        <td width="200">UserID</td>
+        <td width="200"><fmt:message key="consolebase.common.userID"/></td>
         <td>
         <input type="hidden" name="action" value="${Action}">
         <c:choose>
@@ -75,7 +77,7 @@
     <c:choose>
       <c:when test="${add}">
         <tr>
-          <td width="200">Group</td>
+          <td width="200"><fmt:message key="consolebase.common.group"/></td>
           <td>
             <select name="group">
               <c:forEach var="groups" items="${groupsInfo}">
@@ -89,15 +91,15 @@
       </c:otherwise>
     </c:choose>
     <tr>
-        <td width="200">Password</td>
+        <td width="200"><fmt:message key="consolebase.common.password"/></td>
         <td><input type="password" name="password" value=""></td>
     </tr>   
     <tr>
-        <td width="200">Confirm Password</td>
+        <td width="200"><fmt:message key="consolebase.common.confirmPassword"/></td>
         <td><input type="password" name="confirmpassword" value=""></td>
     </tr>
     <tr>   
-       <td>&nbsp;</td> <td  align="left" class="formElement"><input type="submit" value="${Submit}" onclick="return <portlet:namespace/>validateForm()"> <input type="submit" name="cancel"  value="Cancel"></td>
+       <td>&nbsp;</td> <td  align="left" class="formElement"><input type="submit" value="${Submit}" onclick="return <portlet:namespace/>validateForm()"> <input type="submit" name="cancel"  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/securityrealmmanager/se/users/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/help.jsp Sat Jan  5 12:22:33 2008
@@ -14,30 +14,30 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>This portlet lists all the console realm users and allows the user to add, modify and delete them. To add a new user click on the &quot;Create New User&quot; link and fill in the fields on that page. To 
-  modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the &quot;Delete&quot; link to the right of the user to be deleted.<br>
-  <br>
-  Clicking on the Create New User link brings up a page that allows adding users by filling in the fields and clicking on the&quot;Add&quot; button. The fields are defined as follows:</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<p>
+<fmt:message key="securityrealmmanager.se.users.help.title" />
+</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; color: #1E1E52;">UserID</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The username for the user.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="consolebase.common.userID"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.se.users.help.usernameExp"/></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Password</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Password for the new user.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="consolebase.common.password"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.se.users.help.passwordExp"/></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Confirm Password</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Re-enter the new user's password.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="consolebase.common.confirmPassword"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.se.users.help.confirmPasswordExp"/></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/add.gif" alt="Add"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Create a new user and return to the main &quot;Console Realm Users&quot; 
-page. The new user will be listed there.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.se.users.help.createUserBtnExp"/></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/cancel.gif" alt="Cancel"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Cancel the current operation.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="securityrealmmanager.se.users.help.cancelUserBtnExp"/></td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.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">
@@ -46,12 +48,12 @@
 <table width="50%" cellspacing="5">
     ${message}
 	<tr>
-		<td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>">Create New User</a> </td>
+		<td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>"><fmt:message key="securityrealmmanager.se.users.maximized.createNewUser"/></a> </td>
 		<td></td>
 	</tr>
     <tr class="DarkBackground">
-        <th>Username</th>
-        <th>Actions</th>
+        <th><fmt:message key="consolebase.common.userName"/></th>
+        <th><fmt:message key="consolebase.common.actions"/></th>
     </tr>
     <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="user" items="${userInfo}">
@@ -66,9 +68,9 @@
         <tr>
             <td class="${backgroundClass}"> ${user.key} </td>
             <td class="${backgroundClass}">
-            <a href = "<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="userId" value="${user.key}"/></portlet:actionURL>">Edit</a>
+            <a href = "<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="userId" value="${user.key}"/></portlet:actionURL>"><fmt:message key="consolebase.common.edit"/></a>
             &nbsp;
-            <a href="<portlet:actionURL><portlet:param name="userId" value="${user.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete user ${user.key}?');">Delete</a>
+            <a href="<portlet:actionURL><portlet:param name="userId" value="${user.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete user ${user.key}?');"><fmt:message key="consolebase.common.delete"/></a>
             </td>
         </tr>
     </c:forEach>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/help.jsp Sat Jan  5 12:22:33 2008
@@ -16,12 +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/>
 <br />
 <%--   Removed until a better mechanism for rebooting the server is created
 <p>This portlet allows a warm reboot of the server or a shutdown of it.</p>
 <p>A warm reboot will shutdown all applications and services and reboot the Geronimo kernel within the same process. The Geronimo Console session will be disconnected. Reconnect after the server is back up.</p>
 --%>
-<p>This portlet give the admin the ability to remotely shutdown the Geronimo server.</p>
-<p>A shutdown will shutdown the server and cause the JVM to exit. To continue using the Geronimo Console after a shutdown, Geronimo must be restarted.</p>
+<fmt:message key="servermanager.help.shutdownHelpBody" />
 <br />

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp Sat Jan  5 12:22:33 2008
@@ -16,10 +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/>
 <br />
-<p><font face="Verdana" size="+1" COLOR=DARKRED><center><b>WARNING: A shutdown of the server will disable this Web Console!</b></center></font></p>
-<p><center>Proceed only if you are certain you want to terminate the server.</center></p>
+<p><font face="Verdana" size="+1" COLOR=DARKRED><center><b><fmt:message key="servermanager.normal.warning"/></b></center></font></p>
+<p><center><fmt:message key="servermanager.normal.proceedOnlyIf"/></center></p>
 <br />
 <%--   Removed until a better mechanism for rebooting the server is created
 <table width="100%">
@@ -30,9 +32,9 @@
 --%>
 <br />
 <table width="100%">
-<form action="<portlet:actionURL/>">
-<tr><td align="center"><input type="submit" value="Shutdown" name="shutdown"
-onClick="return confirm('Are you sure you want to shutdown the server (last chance)?');"/></td></tr>
+<form action="<portlet:renderURL/>">
+<tr><td align="center"><input type="submit" value='<fmt:message key="servermanager.normal.shutdown"/>' name="shutdown"
+onClick="return confirm('<fmt:message key="servermanager.normal.areYouSure"/>');" /></td></tr>
 </form>
 </table>
 <br />

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/shutdown.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/shutdown.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/shutdown.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/shutdown.jsp Sat Jan  5 12:22:33 2008
@@ -14,6 +14,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <BR />
-<p><font face="Verdana" size="+1" COLOR=DARKRED><center><b>Server shutdown has been issued.</b></center></font></p>
+<p><font face="Verdana" size="+1" COLOR=DARKRED><center><b><fmt:message key="servermanager.shutdown.shutdownIssued"/></b></center></font></p>
 <BR />

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/list.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/list.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/list.jsp Sat Jan  5 12:22:33 2008
@@ -16,17 +16,17 @@
 --%>
 <%@ 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 the thread pools defined in the Geronimo server.  <i>Note: Currently
-not all threads used by Geronimo come from one of these thread pools.  We're working
-on migrating the different components of Geronimo toward these thread pools.</i></p>
+<p><fmt:message key="threads.list.title"/></p>
 
 <table width="100%">
   <tr>
-    <th class="DarkBackground">Name</th>
-    <th class="DarkBackground" align="center">Size</th>
-    <th class="DarkBackground" align="center">Actions</th>
+    <th class="DarkBackground"><fmt:message key="consolebase.common.name"/></th>
+    <th class="DarkBackground" align="center"><fmt:message key="consolebase.common.size"/></th>
+    <th class="DarkBackground" align="center"><fmt:message key="consolebase.common.actions"/></th>
   </tr>
 <c:set var="backgroundClass" value='MediumBackground'/>
 <c:forEach var="pool" items="${pools}">
@@ -45,7 +45,7 @@
       <a href="<portlet:actionURL portletMode="view">
         <portlet:param name="mode" value="monitor-before" />
         <portlet:param name="abstractName" value="${pool.abstractName}" />
-      </portlet:actionURL>">monitor</a>
+      </portlet:actionURL>"><fmt:message key="consolebase.common.monitor"/></a>
     </td>
   </tr>
 </c:forEach>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/monitor.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/monitor.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/monitor.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/threads/monitor.jsp Sat Jan  5 12:22:33 2008
@@ -16,36 +16,38 @@
 --%>
 <%@ 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>Thread pools statistics for ${poolName}:</p>
+<p><fmt:message key="threads.monitor.title"><fmt:param value="${poolName}"/></fmt:message>:</p>
 
 <table>
   <tr>
-    <th align="right">Pool Max:</th>
+    <th align="right"><fmt:message key="threads.monitor.poolMax" />:</th>
     <td>${stats.threadsInUse.upperBound}</td>
   </tr>
   <tr>
-    <th align="right">Lowest Recorded:</th>
+    <th align="right"><fmt:message key="threads.monitor.lowestRecorded" />:</th>
     <td>${stats.threadsInUse.lowWaterMark}</td>
   </tr>
   <tr>
-    <th align="right">Highest Recorded:</th>
+    <th align="right"><fmt:message key="threads.monitor.highestRecorded" />:</th>
     <td>${stats.threadsInUse.highWaterMark}</td>
   </tr>
   <tr>
-    <th align="right">Threads in Use:</th>
+    <th align="right"><fmt:message key="threads.monitor.threadsInUse" />:</th>
     <td>${stats.threadsInUse.current}</td>
   </tr>
 </table>
 
 <c:if test="${! empty consumers}">
-<p>Current consumers of threads in this pool:</p>
+<p><fmt:message key="threads.monitor.currentConsumersOfThreads" />:</p>
 
 <table>
   <tr>
-    <th>Description</th>
-    <th># of Threads</th>
+    <th><fmt:message key="threads.monitor.description" /></th>
+    <th><fmt:message key="threads.monitor.ofThreads" /></th>
   </tr>
 <c:forEach var="client" items="${consumers}">
   <tr>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/help.jsp Sat Jan  5 12:22:33 2008
@@ -14,34 +14,39 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-This portlet displays and filters the Jetty log file. The Jetty log file contains HTTP accesses and messages from JSP and servlet applications that are running on Geronimo. By default this portlet displays the contents of the log file for the current date. The user can apply filtering criteria to view only data of interest. The user may enter information into any/all/none of the fields, which are defined next.</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+
+<p>
+<fmt:message key="webaccesslogmanager.help.title" />
+</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">Retrieves the latest lines from the log file while retaining the user's filtering criteria. </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="webaccesslogmanager.help.refreshExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">From/To</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Display log output from the dates specified.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="webaccesslogmanager.help.fromTo" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="webaccesslogmanager.help.fromToExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> Ignore Dates</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">If this checkbox is checked, filtering will not be done using the date. All log lines that match the other filtering criteria will be displayed regardless of the date.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> <fmt:message key="webaccesslogmanager.common.ignoreDates" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="webaccesslogmanager.help.ignoreDatesExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> Remote Address</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">A specific remote host can be entered in this field using it's IP address, e.g., 192.168.1.1. </td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> <fmt:message key="webaccesslogmanager.common.remoteAddress" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="webaccesslogmanager.help.remoteAddressExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Authenticated User</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">A username, such as &quot;system.&quot; </td>
-  </tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="webaccesslogmanager.common.authenticatedUser" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="webaccesslogmanager.help.authenticatedUserExp" /> </td>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> Request Method</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">This drop-down box allows the user to filter on &quot;ANY&quot;, &quot;POST&quot; and &quot;GET&quot; methods.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> <fmt:message key="webaccesslogmanager.common.requestMethod" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="webaccesslogmanager.help.requestMethodExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> Requested URI</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Filtering can be done on the Requested URI field by entering a URI, such as, http://localhost:8080/cviewer/jsp/viewclass.jsp</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"><fmt:message key="webaccesslogmanager.common.requestedURI" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="webaccesslogmanager.help.requestedURIExp" />
+    </td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp Sat Jan  5 12:22:33 2008
@@ -20,6 +20,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 <portlet:namespace/>formName = "<portlet:namespace/>searchForm";
 var <portlet:namespace/>dateFields = new Array("fromDate", "toDate");
@@ -40,10 +43,11 @@
     }
     return true;
 }
+
 </script>
 <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>
@@ -51,16 +55,16 @@
     <tr>
         <td>
             <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm" method="post" onSubmit="return <portlet:namespace/>validateForm();">
-                <b>Filter Criteria:</b>
+                <b><fmt:message key="consolebase.common.filterCriteria" />:</b>
                 <input type="hidden" value="search" name="action"/>
                 <table width="680">
                     <c:choose>
                         <c:when test="${fn:length(webContainers) > 1}">
                             <tr>
-                                <td colspan="4" class="DarkBackground"><b>Container:</b></td>
+                                <td colspan="4" class="DarkBackground"><b><fmt:message key="webaccesslogmanager.view.container" />:</b></td>
                             </tr>
                             <tr>
-                                <td>Search Web Container:</td>
+                                <td><fmt:message key="webaccesslogmanager.view.searchWebContainer" />:</td>
                                 <td>
                                     <select name="selectedContainer">
                                         <c:forEach var="webContainer" items="${webContainers}">
@@ -88,7 +92,7 @@
                                 <td colspan="4" class="DarkBackground"><b>Log:</b></td>
                             </tr>
                             <tr>
-                                <td>Search Web Log:</td>
+                                <td><fmt:message key="webaccesslogmanager.view.searchWebLog" />:</td>
                                 <td>
                                     <select name="selectedLog">
                                         <c:forEach var="webLog" items="${webLogs}">
@@ -109,42 +113,42 @@
                         </c:otherwise>
                     </c:choose>
                     <tr>
-                        <td colspan="4" class="DarkBackground"><b>Date:</b></td>
+                        <td colspan="4" class="DarkBackground"><b><fmt:message key="consolebase.common.date"/>:</b></td>
                     </tr>
                     <tr>
-                        <td>From (MM/DD/YYYY):</td>
+                        <td><fmt:message key="webaccesslogmanager.common.from"/>:</td>
                         <td>
                             <input type="text" name="fromDate" value="${fromDate}">
                         </td>
-                        <td>To (MM/DD/YYYY):</td>
+                        <td><fmt:message key="webaccesslogmanager.common.to"/>:</td>
                         <td>
                             <input type="text" name="toDate" value="${toDate}">
                         </td>
                     </tr>
                     <tr>
-                        <td>Ignore Dates:</td>
+                        <td><fmt:message key="webaccesslogmanager.view.ignoreDates"/>:</td>
                         <td>
                             <input type="checkbox" name="ignoreDates" < c:if test="${ignoreDates}">checked</c:if>/>
                         </td>
                     </tr>
                     <tr>
-                        <td colspan="4" class="DarkBackground"><b>Identity:</b></td>
+                        <td colspan="4" class="DarkBackground"><b><fmt:message key="webaccesslogmanager.view.identity"/>:</b></td>
                     </tr>
                     <tr>
-                        <td>Remote Address:</td>
+                        <td><fmt:message key="webaccesslogmanager.common.remoteAddress"/>:</td>
                         <td>
                             <input type="text" name="requestHost" value="${requestHost}"/>
                         </td>
-                        <td>Authenticated User:</td>
+                        <td><fmt:message key="webaccesslogmanager.common.authenticatedUser"/>:</td>
                         <td>
                             <input type="text" name="authUser" value="${authUser}"/>
                         </td>
                     </tr>
                     <tr>
-                        <td colspan="4" class="DarkBackground"><b>Request:</b></td>
+                        <td colspan="4" class="DarkBackground"><b><fmt:message key="webaccesslogmanager.common.request"/>:</b></td>
                     </tr>
                     <tr>
-                        <td>Request Method:</td>
+                        <td><fmt:message key="webaccesslogmanager.common.requestMethod"/>:</td>
                         <td>
                             <select name="requestMethod">
                                 <option value="" < c:if test="${empty requestMethod or requestMethod eq ''}">selected</c:if>>ANY</option>
@@ -154,20 +158,20 @@
                                 <option <c:if test="${requestMethod == 'DELETE'}">selected</c:if>>DELETE</option>
                             </select>
                         </td>
-                        <td>Requested URI:</td>
+                        <td><fmt:message key="webaccesslogmanager.common.requestedURI"/>:</td>
                         <td>
                             <input type="text" name="requestedURI" value="${requestedURI}"/>
                         </td>
                     </tr>
                     <tr>
-                        <td colspan="4" class="DarkBackground"><b>Result Size:</b></td>
+                        <td colspan="4" class="DarkBackground"><b><fmt:message key="webaccesslogmanager.view.resultSize"/>:</b></td>
                     </tr>
                     <tr>
-                        <td>Start Result:</td>
+                        <td><fmt:message key="webaccesslogmanager.view.startResult"/>:</td>
                         <td>
                             <input type="text" name="startResult" value="${startResult}"/>
                         </td>
-                        <td>Max Results:</td>
+                        <td><fmt:message key="webaccesslogmanager.view.maxResults"/>:</td>
                         <td>
                             <input type="text" name="maxResult" value="${maxResult}"/>
                         </td>
@@ -187,7 +191,7 @@
                 <c:when test="${logs != null && fn:length(logs) > 0}">
                     <table>
                         <tr>
-                            <td><b>Found ${fn:length(logs)} matches in logfile (${logLength} lines searched).</b></td>
+                            <td><b><fmt:message key="webaccesslogmanager.view.foundMatches"><fmt:param value="${fn:length(logs)}"/><fmt:param value="${logLength}"/></fmt:message>.</b></td>
                         </tr>
                         <c:forEach var="line" items="${logs}">
                         <tr>
@@ -199,7 +203,7 @@
                     </table>
                 </c:when>
                 <c:otherwise>
-                    No log entries found.
+                    <fmt:message key="webaccesslogmanager.view.noLogEntries"/>
                 </c:otherwise>
             </c:choose>
         </td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/help.jsp Sat Jan  5 12:22:33 2008
@@ -14,19 +14,23 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p> Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click on the enable link to monitor the performance of the Geronimo server.</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<p><fmt:message key="webmanager.help.title"/></p>
 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top">refresh</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Update the display with the latest statistics.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top">
+    <fmt:message key="consolebase.common.refresh"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="webmanager.help.refreshExplanation"/></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top">disable</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Turn off statistics gathering and return the user to the main page.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top"><fmt:message key="webmanager.help.disable"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="webmanager.help.disableExplanation"/></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top">reset</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Reset all counts, totals, averages, etc., to 0 and start gathering statistics again.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top">
+     <fmt:message key="consolebase.common.reset"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="webmanager.help.resetExplanation"/></td>
   </tr>
 </table>
 <p>&nbsp;</p>



Mime
View raw message