geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r609207 [5/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/car/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/index.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/index.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/index.jsp Sat Jan  5 12:22:33 2008
@@ -18,49 +18,36 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<p>This portlet lets you install or create Geronimo plugins.
-    This can be used to install new features into a Geronimo server at runtime.</p>
+<fmt:message key="car.index.summary" />
 
-<h2>Install Geronimo Plugins</h2>
-
-<p>Choose a remote repository to inspect for available Geronimo plugins.  The
-repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory
-listing the available plugins in the repository.</p>
-
-<p>You can also download running configurations from another Geronimo server
-just as if you're browsing and installing third-party plugins.
- If you want to point to a remote Geronimo server, enter a URL such as
-<tt>http://geronimo-server:8080/console/maven-repo/</tt> and the enter
-the administrator username and password in the optional authentication fields.</p>
 
 <form name="<portlet:namespace/>PluginForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="index-after" />
-    <b>Repository:</b> <%-- todo: entry field for user-specified list --%>
+    <b><fmt:message key="car.common.repository" />:</b> <%-- todo: entry field for user-specified list --%>
     <select name="repository">
         <c:forEach var="repo" items="${repositories}">
             <option<c:if test="${repo eq repository}"> selected</c:if>>${repo}</option>
         </c:forEach>
     </select>
     <c:if test="${!empty repositories}"><br /></c:if>
-    <i>(<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="updateList-before" /><portlet:param name="repository" value="${repository}" /></portlet:actionURL>">Update Repository List</a>
-     or <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="addRepository-before" /><portlet:param name="repository" value="${repository}" /></portlet:actionURL>">Add Repository</a>)</i>
-    <br/>
+    <i>(<a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="updateList-before" /><portlet:param name="repository" value="${repository}" /></portlet:actionURL>"><fmt:message key="car.index.updateRepositoryList" /></a>
+     or <a href="<portlet:actionURL portletMode="view"><portlet:param name="mode" value="addRepository-before" /><portlet:param name="repository" value="${repository}" /></portlet:actionURL>"><fmt:message key="car.common.addRepository" /></a>)</i>
     <%--<input type="text" name="repository" value="${repository}" size="30" maxlength="200" />--%>
     <c:if test="${!empty repositories}">
-      <input type="submit" value="Show Plugins in selected repository" />
-      <br /><b>Optional Authentication:</b><br/>
-         User: <input type="text" name="username" value="${repouser}" size="12" maxlength="200" /><br/>
-         Password: <input type="password" name="password" value="${repopass}" size="12" maxlength="200" /><br/>
+      <input type="submit" value='<fmt:message key="car.common.searchForPlugins" />' />
+      <br /><b><fmt:message key="car.index.optionalAuthentication" />:</b>
+         <fmt:message key="consolebase.common.user"/>: <input type="text" name="username" value="${repouser}" size="12" maxlength="200" />
+         <fmt:message key="consolebase.common.password"/>: <input type="password" name="password" value="${repopass}" size="12" maxlength="200" />
     </c:if>
 </form>
 
-<h2>Create Geronimo Plugin</h2>
+<h2><fmt:message key="car.common.createGeronimoPlugin" /></h2>
+<p><fmt:message key="car.index.createGeronimoPluginExp" /></p>
+
 
-<p>Choose a configuration in the current Geronimo server to export as a Geronimo
-   plugin.  The configuration will be saved as a CAR file to your local filesystem.
-   <i>Note: at present, you must manually add a <tt>META-INF/geronimo-plugin.xml</tt>
-   file to the CAR after you export it in order for it to be a valid plugin.</i></p>
 
 <form name="<portlet:namespace/>ExportForm" action="<portlet:actionURL/>" method="POST">
     <input type="hidden" name="mode" value="configure-before" />
@@ -70,6 +57,6 @@
         <option>${config.configID}</option>
       </c:forEach>
     </select>
-    <input type="submit" value="Export Plugin" />
+    <input type="submit" value='<fmt:message key="car.common.exportPlugin" />' />
 </form>
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/list.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/list.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/list.jsp Sat Jan  5 12:22:33 2008
@@ -16,14 +16,16 @@
 --%>
 <%@ 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/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
-<h3>Plugins listed at <a href='${repository}'>${repository}</a></h3>
+<h3><fmt:message key="car.list.pluginRepo" /> <a href='${repository}'>${repository}</a></h3>
 
 <c:choose>
 <c:when test="${fn:length(plugins) < 1}">
-  No plugins are ilsted at this repository.
+  <fmt:message key="car.list.noPlugins" />
 </c:when>
 <c:otherwise>
 <form action="<portlet:actionURL/>">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp Sat Jan  5 12:22:33 2008
@@ -17,9 +17,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><fmt:message key="car.pluginParams.title" /></p>
 
-<p><b>Export Plugin</b> -- Configure Plugin Data</p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>PluginForm" action="<portlet:actionURL/>" method="POST">
@@ -30,108 +32,98 @@
 
         <!-- ENTRY FIELD: Name -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Human Readable Name:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.pluginParams.humanReadableName" />:</div></th>
             <td><input name="name" type="text" size="30" value="${name}" /></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              A human-readable name that will be displayed for this plugin.
+            <fmt:message key="car.pluginParams.humanReadableNameExp" />              
             </td>
           </tr>
         <!-- ENTRY FIELD: Config ID -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Unique ID:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.uniqueID" />:</div></th>
             <td><b>${configId}</b></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              The globally unique ID for this plugin.  This is determined from
-              the installation in the server you're exporting.  This defines
-              the version number for the plugin, so make sure it's correct.
+            <fmt:message key="car.pluginParams.uniqueIDExp" />         
             </td>
           </tr>
           </tr>
         <!-- ENTRY FIELD: Repositories -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Download Repositories:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.downloadRepositories" />:</div></th>
             <td><textarea rows="5" cols="60" name="repository">${repository}</textarea></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              A list of repositories to check for any dependencies that need to be downloaded.
-              This should be a list of one URL per line, with values such as
-              <tt>http://geronimoplugins.com/repository/</tt> and <tt>http://www.ibiblio.org/maven2/</tt>.
-              Note that the repository this plugin is deployed to should typically be the first one listed.
+            <fmt:message key="car.pluginParams.downloadRepositoriesExp" />
+              
             </td>
           </tr>
         <!-- ENTRY FIELD: Category -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Category:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.category" />:</div></th>
             <td><input name="category" type="text" size="30" value="${category}" /></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              The category this plugin falls into.  Plugins in the same category will
-              be listed together.  If this plugin is intended to be listed on
-              geronimoplugins.com then you should use one of the category names there
-              if any of them fit.  Otherwise, you can select this freely, or according
-              to the categories acceptable to the repository where you plan to post
-              this.
+            <fmt:message key="car.pluginParams.categoryExp" />               
             </td>
           </tr>
         <!-- ENTRY FIELD: Description -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Description:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="consolebase.common.description"/>:</div></th>
             <td><textarea rows="10" cols="60" name="description">${description}</textarea></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              A description of this plugin.  You should use plain text only, with
-              blank lines to separate paragraphs.
+            <fmt:message key="car.pluginParams.descriptionExp" />
+              
             </td>
           </tr>
         <!-- ENTRY FIELD: URL -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Plugin URL:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.pluginURL" />:</div></th>
               <td><input name="url" type="text" size="30" value="${url}" /></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              A URL to get more information about the plugin (e.g. the plugin home page).
+            <fmt:message key="car.pluginParams.pluginURLExp" />             
             </td>
           </tr>
         <!-- ENTRY FIELD: Author -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Author:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.author" />:</div></th>
               <td><input name="author" type="text" size="30" value="${author}" /></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              The author of the plug, which may be a person, company, open source project, etc.
+            <fmt:message key="car.pluginParams.authorExp" />               
             </td>
           </tr>
         <!-- ENTRY FIELD: License -->
           <tr>
-            <th style="min-width: 140px"><div align="right">License:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.license" />:</div></th>
             <td><input name="license" type="text" size="30" value="${license}" /></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              The name of the license that this plugin is covered by.  Ideally, it would
-              be prefixed by the class of license, like "BSD -- (name)" or "GPL -- (name)".
+            <fmt:message key="car.pluginParams.licenseExp" />
             </td>
           </tr>
         <!-- ENTRY FIELD: License Is Open Source-->
           <tr>
-            <th style="min-width: 140px"><div align="right">Open Source:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.openSource" />:</div></th>
             <td>
                 <input type="checkbox" name="licenseOSI"<c:if test="${!(empty licenseOSI)}"> checked="checked"</c:if> />
             </td>
@@ -139,219 +131,155 @@
           <tr>
             <td></td>
             <td>
-              Check this box if the license is an OSI-approved open source license
-              (see <a href="http://www.opensource.org/licenses/index.php">http://www.opensource.org/licenses/index.php</a>).
+            <fmt:message key="car.pluginParams.openSourceExp" />
             </td>
           </tr>
         <!-- ENTRY FIELD: Geronimo Versions -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Geronimo Version:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.geronimoVersions" />:</div></th>
             <td><input type="text" cols="30" name="geronimoVersion" value="${geronimoVersion}"/></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              The Geronimo Version element is the version of geronimo that this plugin will
-              be running on.  It is a required element and take on values such as 2.0-SNAPSHOT
-              and 2.0-M2
+            <fmt:message key="car.pluginParams.geronimoVersionsExp" />
             </td>
           </tr>
         <!-- ENTRY FIELD: JVM Versions -->
           <tr>
-            <th style="min-width: 140px"><div align="right">JVM Versions:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="consolebase.common.JVMVersions"/>:</div></th>
             <td><textarea rows="5" cols="60" name="jvmVersions">${jvmVersions}</textarea></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              An optional list of JVM version prefixes supported by this plugin.  If no values
-              are listed, the plugin can be installed in Geronimo running in any version of
-              the JVM.  Otherwise, list one acceptable JVM version perfix per line, like
-              "1.4.2&nbsp;\n&nbsp;1.5&nbsp;\n&nbsp;..."
-              (ideally, of course, this means you've actually tested the plugin with Geronimo
-              on each JVM version listed here).
+            <fmt:message key="car.pluginParams.JVMVersionsExp" />
+             
             </td>
           </tr>
         <!-- ENTRY FIELD: Dependencies -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Dependencies:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.dependencies" />:</div></th>
             <td><textarea rows="5" cols="60" name="dependencies">${dependencies}</textarea></td>
           </tr>
           <tr>
             <td></td>
-            <td>
-              A list of JARs or other module IDs that this plugin depends on.  These
-              will be downloaded automatically when this plugin is installed.  Normally
-              you shouldn't change this list.  However, you can move entries from the
-              dependency list to the <b>prerequisite</b> list if the user must install the
-              dependency manually before installing the plugin (e.g. for a database pool
-              where a plugin wouldn't know what server to connect to).<br /><br />
-              Each entry in this list should use the Unique ID format like is used for
-              this plugin above.  You may remove the version number if you'd like to
-              work with any version of the dependency, though that may be risky.  Each
-              value should be on a separate line.
+            <td><fmt:message key="car.pluginParams.dependenciesExp" />
+              
             </td>
           </tr>
         <!-- ENTRY FIELD: Obsoletes -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Obsoletes:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.obsoletes" />:</div></th>
             <td><textarea rows="5" cols="60" name="obsoletes">${obsoletes}</textarea></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              A list of module IDs that this plugin replaces.  Those plugins or
-              modules will be removed when this one is installed.  That may include
-              previous versions of this plugin if you want installing it to "upgrade"
-              rather than just offering an additional alternative.  This should be a
-              list with one module ID per line.
+            <fmt:message key="car.pluginParams.obsoletesExp" />
+             
             </td>
           </tr>
         <!-- ENTRY FIELD: Prerequisite 1 -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Prerequisite 1 ID:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite1ID" />:</div></th>
             <td><input name="prereq1" type="text" size="30" value="${prereq1}" /></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              The module ID of a prerequisite for this plugin.  This is a module that
-              must be present in the server before the plugin can be installed.  It
-              may be something like a specific web container for a web application
-              (<tt>geronimo/jetty/*/car</tt>) or something like a database pool or
-              security realm that the user must install because the plugin author can't
-              create a value that will be valid in the destination server.  You may want
-              to leave out as many segments of the module ID as possible in order to
-              accomodate more users (e.g. <tt>*/mypool/*/*</tt> rather than
-              <tt>myapp/mypool/1.2/car</tt>).
+            <fmt:message key="car.pluginParams.prerequisiteIDExp" /> 
+              
             </td>
           </tr>
         <!-- ENTRY FIELD: Prerequisite 1 Type -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Prerequisite 1 Type:</div></th>
+            <th style="min-width: 140px"><div align="right">
+            <fmt:message key="car.common.prerequisite1Type" />
+           :</div></th>
             <td><input name="prereq1type" type="text" size="30" value="${prereq1type}" /></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              A brief description of the type of prerequisite this is (for the benefit
-              of the user).  Examples could include <tt>Database Pool</tt> or
-              <tt>Web Container</tt>.
+            <fmt:message key="car.pluginParams.prerequisiteTypeExp" />
             </td>
           </tr>
         <!-- ENTRY FIELD: Prerequisite 1 Description -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Prereq 1 Description:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prereq1Description" />:</div></th>
             <td><textarea rows="5" cols="60" name="prereq1desc">${prereq1desc}</textarea></td>
           </tr>
           <tr>
             <td></td>
-            <td>
-              A longer description of what the user needs to do to comply with this
-              prerequisite (for example, instructions to set up a database pool listing
-              the supported database products and telling the user where to find a script
-              to initialize the database).  This should be plain text with empty lines
-              to separate paragraphs.
+            <td><fmt:message key="car.pluginParams.prereqDescriptionExp" />
             </td>
           </tr>
         <!-- ENTRY FIELD: Prerequisite 2 -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Prerequisite 2 ID:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite2ID" />:</div></th>
             <td><input name="prereq2" type="text" size="30" value="${prereq2}" /></td>
           </tr>
           <tr>
             <td></td>
             <td>
-              The module ID of a prerequisite for this plugin.  This is a module that
-              must be present in the server before the plugin can be installed.  It
-              may be something like a specific web container for a web application
-              (<tt>geronimo/jetty/*/car</tt>) or something like a database pool or
-              security realm that the user must install because the plugin author can't
-              create a value that will be valid in the destination server.  You may want
-              to leave out as many segments of the module ID as possible in order to
-              accomodate more users (e.g. <tt>*/mypool/*/*</tt> rather than
-              <tt>myapp/mypool/1.2/car</tt>).
+              <fmt:message key="car.pluginParams.prerequisiteIDExp" /> 
             </td>
           </tr>
         <!-- ENTRY FIELD: Prerequisite 2 Type -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Prerequisite 2 Type:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite2Type" />:</div></th>
             <td><input name="prereq2type" type="text" size="30" value="${prereq2type}" /></td>
           </tr>
           <tr>
             <td></td>
-            <td>
-              A brief description of the type of prerequisite this is (for the benefit
-              of the user).  Examples could include <tt>Database Pool</tt> or
-              <tt>Web Container</tt>.
+            <td><fmt:message key="car.pluginParams.prerequisiteTypeExp" />
             </td>
           </tr>
         <!-- ENTRY FIELD: Prerequisite 2 Description -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Prereq 2 Description:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prereq2Description" />:</div></th>
             <td><textarea rows="5" cols="60" name="prereq2desc">${prereq2desc}</textarea></td>
           </tr>
           <tr>
             <td></td>
-            <td>
-              A longer description of what the user needs to do to comply with this
-              prerequisite (for example, instructions to set up a database pool listing
-              the supported database products and telling the user where to find a script
-              to initialize the database).  This should be plain text with empty lines
-              to separate paragraphs.
+            <td><fmt:message key="car.pluginParams.prereqDescriptionExp" /> 
             </td>
           </tr>
         <!-- ENTRY FIELD: Prerequisite 3 -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Prerequisite 3 ID:</div></th>
+            <th style="min-width: 140px"><div align="right">><fmt:message key="car.common.prerequisite3ID" />:</div></th>
             <td><input name="prereq3" type="text" size="30" value="${prereq3}" /></td>
           </tr>
           <tr>
             <td></td>
-            <td>
-              The module ID of a prerequisite for this plugin.  This is a module that
-              must be present in the server before the plugin can be installed.  It
-              may be something like a specific web container for a web application
-              (<tt>geronimo/jetty/*/car</tt>) or something like a database pool or
-              security realm that the user must install because the plugin author can't
-              create a value that will be valid in the destination server.  You may want
-              to leave out as many segments of the module ID as possible in order to
-              accomodate more users (e.g. <tt>*/mypool/*/*</tt> rather than
-              <tt>myapp/mypool/1.2/car</tt>).
+            <td><fmt:message key="car.pluginParams.prerequisiteIDExp" />
             </td>
           </tr>
         <!-- ENTRY FIELD: Prerequisite 3 Type -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Prerequisite 3 Type:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite3Type" />:</div></th>
             <td><input name="prereq3type" type="text" size="30" value="${prereq3type}" /></td>
           </tr>
           <tr>
             <td></td>
-            <td>
-              A brief description of the type of prerequisite this is (for the benefit
-              of the user).  Examples could include <tt>Database Pool</tt> or
-              <tt>Web Container</tt>.
+            <td><fmt:message key="car.pluginParams.prerequisiteTypeExp" />             
             </td>
           </tr>
         <!-- ENTRY FIELD: Prerequisite 3 Description -->
           <tr>
-            <th style="min-width: 140px"><div align="right">Prereq 3 Description:</div></th>
+            <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prereq3Description" />:</div></th>
             <td><textarea rows="5" cols="60" name="prereq3desc">${prereq3desc}</textarea></td>
           </tr>
           <tr>
             <td></td>
-            <td>
-              A longer description of what the user needs to do to comply with this
-              prerequisite (for example, instructions to set up a database pool listing
-              the supported database products and telling the user where to find a script
-              to initialize the database).  This should be plain text with empty lines
-              to separate paragraphs.
+            <td><fmt:message key="car.pluginParams.prereqDescriptionExp" />              
             </td>
           </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
-        <td><input type="submit" value="Save Plugin Data" /></td>
+        <td><input type="submit" value='<fmt:message key="car.common.savePluginData" />' /></td>
       </tr>
     </table>
 </form>
@@ -360,4 +288,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index" />
-            </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/car/results.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/results.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/results.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/results.jsp Sat Jan  5 12:22:33 2008
@@ -18,11 +18,17 @@
 <%@ 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>The plugin ${configId} has been installed.</p>
+<p>
+<fmt:message key="car.results.title" >
+<fmt:param  value="${configId}"/>
+</fmt:message>
+</p>
 
 <c:if test="${! empty dependencies}">
-  <p><b>Files Processed:</b></p>
+  <p><b><fmt:message key="car.results.filesProcessed" />:</b></p>
   <ul>
     <c:forEach var="dep" items="${dependencies}">
       <li>${dep.name} (${dep.action})</li>
@@ -36,5 +42,6 @@
     <input type="hidden" name="repository" value="${repository}" />
     <input type="hidden" name="repo-user" value="${repouser}" />
     <input type="hidden" name="repo-pass" value="${repopass}" />
-    <input type="submit" value="Start ${configId}" />
+    <input type="submit" value='<fmt:message key="consolebase.common.start"/> ${configId}' />
 </form>
+

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp Sat Jan  5 12:22:33 2008
@@ -17,6 +17,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 <c:set var="artifact" value="${plugin.pluginArtifact.moduleId}"/>
@@ -25,28 +27,28 @@
 
 <table border="0">
   <tr>
-    <th align="right" valign="top">Module ID:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.moduleId" />:</th>
     <td>${artifact.groupId}/${artifact.artifactId}/${artifact.version}/${artifact.type}</td>
   </tr>
   <tr>
-    <th align="right" valign="top">Group:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.group" />:</th>
     <td>${plugin.category}</td>
   </tr>
   <tr>
-    <th align="right" valign="top">Description:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.description" />:</th>
     <td>${plugin.description}</td>
   </tr>
   <tr>
-    <th align="right" valign="top">Author:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.author" />:</th>
     <td>${plugin.author}</td>
   </tr>
   <tr>
-    <th align="right" valign="top">Web Site:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.website" />:</th>
     <td><a href="${plugin.url}">${plugin.url}</a></td>
   </tr>
   <c:forEach var="license" items="${plugin.license}">
       <tr>
-        <th align="right" valign="top">License:</th>
+        <th align="right" valign="top"><fmt:message key="car.viewForDownload.license" />:</th>
         <td>${license.value}
           <c:choose>
               <c:when test="${license.osiApproved}">(Open Source)</c:when>
@@ -56,7 +58,7 @@
       </tr>
   </c:forEach>
     <tr>
-    <th align="right" valign="top">Geronimo-Versions:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.geronimoVersions" />:</th>
     <td>
       <c:choose>
         <c:when test="${empty plugin.geronimoVersion}">
@@ -72,7 +74,7 @@
   </tr>
   <tr>
   <tr>
-    <th align="right" valign="top">JVM Versions:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.jvmVersions" />:</th>
     <td>
       <c:choose>
           <c:when test="${empty plugin.jvmVersion}">
@@ -87,7 +89,7 @@
     </td>
   </tr>
   <tr>
-    <th align="right" valign="top">Dependencies:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.dependencies" />:</th>
     <td>
       <c:forEach var="dependency" items="${plugin.dependency}">
         ${dependency.groupId}/${dependency.artifactId}/${dependency.version}/${dependency.type}<br />
@@ -95,7 +97,7 @@
     </td>
   </tr>
   <tr>
-    <th align="right" valign="top">Prerequisites:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.prerequisites" />:</th>
     <td>
       <c:choose>
         <c:when test="${empty plugin.prerequisite}">
@@ -111,7 +113,7 @@
     </td>
   </tr>
   <tr>
-    <th align="right" valign="top">Obsoletes:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.obsoletes" />:</th>
     <td>
       <c:choose>
         <c:when test="${empty plugin.obsoletes}">
@@ -126,7 +128,7 @@
     </td>
   </tr>
   <tr>
-    <th align="right" valign="top">Installable:</th>
+    <th align="right" valign="top"><fmt:message key="car.viewForDownload.installable" />:</th>
     <td>
     ${plugin.installable ? "<img alt='check' src='/console/images/checkmark._16_green.png' /> " : "<strong><font color='red'>X</font></strong> "}
     ${validation}
@@ -140,7 +142,7 @@
 <table><tr>
 <c:if test="${plugin.installable}">
 <td valign="top">
-    <input type="submit" value="Install" />
+    <input type="submit" value="<fmt:message key="consolebase.common.install" />" />
     <input type="hidden" name="configId" value="${configId}" />
     <input type="hidden" name="mode" value="viewForDownload-after" />
     <input type="hidden" name="repository" value="${repository}" />
@@ -149,6 +151,6 @@
 <td>
 </c:if>
 <td valign="top">
-<input type="submit" value="Return" onclick="history.go(-1); return false;" />
+<input type="submit" value="<fmt:message key="consolebase.common.install" />" onclick="history.go(-1); return false;" />
 </td></tr></table>
 </form>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.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>
@@ -53,26 +55,23 @@
 <!-- Migrated Plan -->
 <c:if test="${!(empty migratedPlan)}">
 <hr/><br/>
-The deployment plan you provided appears to be for a previous version of 
-the application server.
-A migrated version of your plan is provided below for your convenience.  Not all
-deployment plans can be fully migrated so some manual editing may be required
-before the migrated plan can be deployed.
+<fmt:message key="configmanager.deploy.migratedPlanSummary" />
+
 <p/>
 <div id="<portlet:namespace/>migratedPlan" style="display:inline">
-Migrated plan:
+<fmt:message key="configmanager.deploy.migratedPlan" />:
 <form method="POST" action="/console/forwards/plan-export">
     <textarea name="migratedPlan" rows=10 cols=80><c:out escapeXml="true" value="${migratedPlan}"/></textarea>
     <br/>
-    <button onclick="<portlet:namespace/>toggleDisplay('originalPlan');<portlet:namespace/>toggleDisplay('migratedPlan');return false;">Show original plan</button>
-    <input type="submit" value="Save this plan locally"/>
+    <button onclick="<portlet:namespace/>toggleDisplay('originalPlan');<portlet:namespace/>toggleDisplay('migratedPlan');return false;"><fmt:message key="configmanager.deploy.showOriginalPlan" /></button>
+    <input type="submit" value='<fmt:message key="configmanager.deploy.saveLocally" />' />
 </form>
 </div>
 <div id="<portlet:namespace/>originalPlan" style="display:none">
-Original plan:
+<fmt:message key="configmanager.deploy.originalPlan" />:
 <form>
     <textarea rows=10 cols=80><c:out escapeXml="true" value="${originalPlan}"/></textarea><br/>
-    <button onclick="<portlet:namespace/>toggleDisplay('migratedPlan');<portlet:namespace/>toggleDisplay('originalPlan');return false;">Show Migrated plan</button>
+    <button onclick="<portlet:namespace/>toggleDisplay('migratedPlan');<portlet:namespace/>toggleDisplay('originalPlan');return false;"><fmt:message key="configmanager.deploy.showMigratedPlan" /></button>
 </form>
 </div>
 <br/><hr/><br/>
@@ -80,18 +79,18 @@
 
 <form enctype="multipart/form-data" method="POST" action="<portlet:actionURL><portlet:param name="action" value="deploy"/></portlet:actionURL>">
 <table>
-  <tr><th align="right">Archive: </th><td><input type="file" name="module" /></td></tr>
-  <tr><th align="right">Plan: </th><td><input type="file" name="plan" /></td></tr>
+  <tr><th align="right"><fmt:message key="configmanager.common.archive" />: </th><td><input type="file" name="module" /></td></tr>
+  <tr><th align="right"><fmt:message key="configmanager.common.plan" />: </th><td><input type="file" name="plan" /></td></tr>
   <tr>
     <td></td>
     <td>
-        <input name="startApp" type="checkbox" value="yes" checked>Start app after install <br />
-        <input name="redeploy" type="checkbox" value="yes">Redeploy application <br />
+        <input name="startApp" type="checkbox" value="yes" checked><fmt:message key="configmanager.common.startAppAfterInstall" /> <br />
+        <input name="redeploy" type="checkbox" value="yes"><fmt:message key="configmanager.deploy.redeployApplication" /> <br />
     </td>
   </tr>
   <tr>
     <td></td>
-    <td><input type="submit" value="Install" /></td>
+    <td><input type="submit" value='<fmt:message key="consolebase.common.install"/>' /></td>
   </tr>
 </table>
 </form>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp Sat Jan  5 12:22:33 2008
@@ -14,24 +14,27 @@
    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"/>
 <portlet:defineObjects/>
-<p>This portlet allows the user to deploy new applications on Geronimo. Web applications require deployment plans, which are either packaged with the war file or kept in a separate file which is typically called geronimo-web.xml.<br>
+<p>
+<fmt:message key="configmanager.deployHelp.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 5px 10px"><strong>Archive</strong></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Browse to select the war file in the Archive box. </td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong><fmt:message key="configmanager.common.archive" /></strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="configmanager.deployHelp.archiveExp" /> </td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Plan</strong></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">If the deployment plan is separate from the war file, then browse to select it.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong><fmt:message key="configmanager.common.plan" /></strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="configmanager.deployHelp.planExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Start app after install</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Check this to automatically start the application when it is installed. Otherwise, the user can start the application by clicking on the associated &quot;Start&quot; toggle in the&quot;Installed Applications&quot; window. By default this checkbox is checked and newly installed applications will automatically be started.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> <fmt:message key="configmanager.common.startAppAfterInstall" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="configmanager.deployHelp.startAppAfterInstallExp" /></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">Install the application in the Geronimo server.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="configmanager.deployHelp.installApplication" /></td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/help.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/help.jsp Sat Jan  5 12:22:33 2008
@@ -14,14 +14,16 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>This page lists the applications that have been installed in the server and whether they are running or stopped. There are four columns; two provide information and the other two allow user action. The first column indicates the state of the application, either &quot;stopped&quot; or &quot;running.&quot; The fourth column shows the configID of the application. The two remaining columns are:</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<p><fmt:message key="configmanager.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; text-decoration: underline; font-weight: bold;">Stop/Start</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The stop/start toggle can be clicked to stop or start an application. If the toggle says &quot;Stop&quot; the application is running so clicking on the Stop toggle will stop the application and vice versa.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;"><fmt:message key="configmanager.help.stopStart"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="configmanager.help.stopStartExp"/></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">Uninstall</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The uninstall link will undeploy/remove the application from Geronimo.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;"><fmt:message key="consolebase.common.uninstall"/></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><fmt:message key="configmanager.help.uninstallExp" /></td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/maximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/maximized.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/maximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/maximized.jsp Sat Jan  5 12:22:33 2008
@@ -16,14 +16,16 @@
 --%>
 <%@ 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%">
     <c:forEach var="configInfo" items="${configurations}">
         <tr>
             <td width="500">${configInfo.state}</td>
             <td>
-<c:if test="${configInfo.state.running}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
-<c:if test="${configInfo.state.stopped}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="start"/></portlet:actionURL>">Start</a></c:if>
+<c:if test="${configInfo.state.running}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>"><fmt:message key="consolebase.common.stop"/></a></c:if>
+<c:if test="${configInfo.state.stopped}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="start"/></portlet:actionURL>"><fmt:message key="consolebase.common.start"/></a></c:if>
 </td>
             <td>${configInfo.configID}</td>
         </tr>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.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>
@@ -204,12 +206,12 @@
 <br />
 <table width="100%">
     <tr class="DarkBackground">
-        <th align="left">&nbsp;Component Name</th>
+        <th align="left">&nbsp;<fmt:message key="configmanager.normal.componentName" /></th>
         <c:if test="${showWebInfo}"><th>URL</th></c:if>
-        <th>&nbsp;State</th>
-        <th align="center" colspan="3">Commands</th>
-        <th align="left">Parent Components</th>
-        <th align="left">Child Components</th>
+        <th>&nbsp;<fmt:message key="consolebase.common.state"/></th>
+        <th align="center" colspan="3"> <fmt:message key="consolebase.common.commands"/></th>
+        <th align="left"><fmt:message key="configmanager.normal.parentComponents" /></th>
+        <th align="left"><fmt:message key="configmanager.normal.childComponents" /></th>
     </tr>
   <c:set var="backgroundClass" value='MediumBackground'/>
   <c:forEach var="moduleDetails" items="${configurations}">
@@ -250,16 +252,16 @@
         <td width="75" class="${backgroundClass}">
             <c:if test="${moduleDetails.state.running || moduleDetails.state.failed}">
                 <span <c:if test="${moduleDetails.expertConfig}"> name=expert </c:if>> 
-                    &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='stop'/></portlet:actionURL>" onClick="return promptIfUnsafeToStop('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');">Stop</a>&nbsp;
+                    &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='stop'/></portlet:actionURL>" onClick="return promptIfUnsafeToStop('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');"><fmt:message key="consolebase.common.stop"/></a>&nbsp;
                 </span>
             </c:if>
             <c:if test="${moduleDetails.expertConfig && (moduleDetails.state.running || moduleDetails.state.failed)}">
                 <span name=nonexpert> 
-                    &nbsp;<a>Stop</a>&nbsp;
+                    &nbsp;<a><fmt:message key="consolebase.common.stop"/></a>&nbsp;
                 </span>
             </c:if>
             <c:if test="${moduleDetails.state.stopped && (moduleDetails.type.name ne 'CAR')}">
-                &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='start'/></portlet:actionURL>">Start</a>&nbsp;
+                &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='start'/></portlet:actionURL>"><fmt:message key="consolebase.common.start"/></a>&nbsp;
             </c:if>
         </td>
 
@@ -267,12 +269,12 @@
         <td width="75" class="${backgroundClass}">
             <c:if test="${moduleDetails.state.running}">
                 <span <c:if test="${moduleDetails.expertConfig}"> name=expert </c:if>> 
-                    &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='restart'/></portlet:actionURL>" onClick="return promptIfUnsafeToRestart('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');">Restart</a>&nbsp;
+                    &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='restart'/></portlet:actionURL>" onClick="return promptIfUnsafeToRestart('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');"><fmt:message key="consolebase.common.restart"/></a>&nbsp;
                 </span>
             </c:if>
             <c:if test="${moduleDetails.expertConfig && moduleDetails.state.running}">
                 <span name=nonexpert> 
-                    &nbsp;<a>Restart</a>&nbsp;
+                    &nbsp;<a><fmt:message key="consolebase.common.restart"/></a>&nbsp;
                 </span>
             </c:if>
         </td>
@@ -280,11 +282,11 @@
         <!-- Uninstall action -->
         <td width="75" class="${backgroundClass}">
             <span <c:if test="${moduleDetails.expertConfig}"> name=expert </c:if>> 
-                &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='uninstall'/></portlet:actionURL>" onClick="return uninstallPrompt('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');">Uninstall</a>&nbsp;
+                &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='uninstall'/></portlet:actionURL>" onClick="return uninstallPrompt('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');"><fmt:message key="consolebase.common.uninstall"/></a>&nbsp;
             </span>
             <c:if test="${moduleDetails.expertConfig}">
                 <span name=nonexpert> 
-                    &nbsp;<a>Uninstall</a>&nbsp;
+                    &nbsp;<a><fmt:message key="consolebase.common.uninstall"/></a>&nbsp;
                 </span>
             </c:if>
         </td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp Sat Jan  5 12:22:33 2008
@@ -14,4 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-This page displays the values of the system properties available to the server process.
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<fmt:message key="infomanager.javaSysHelp.body" />
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.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/>
 
 <table width="100%">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoHelp.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoHelp.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoHelp.jsp Sat Jan  5 12:22:33 2008
@@ -14,5 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-This page provides information about the uptime of the server and the resources
-being used by the JVM.
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<fmt:message key="infomanager.svrInfoHelp.body" />
+

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp Sat Jan  5 12:22:33 2008
@@ -16,7 +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 type='text/javascript' src='/console/dwr/interface/Jsr77Stats.js'></script>
@@ -25,19 +26,19 @@
 
 <table width="100%">
   <tr>
-    <td class="DarkBackground" width="100%" colspan="2" align="center">Geronimo</td>
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.svrInfoNormal.server"/></td>
   </tr>
   <tr>
-    <td class="LightBackground" width="20%" nowrap>Geronimo Version</td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.build"/></td>
     <td class="LightBackground" width="80%">${svrProps['Geronimo Version']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground" width="20%" nowrap>Geronimo Start Time</td>
+    <td class="MediumBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.bootTime"/></td>
     <td class="MediumBackground" width="80%">${svrProps['Kernel Boot Time']}</td>
   </tr>
   <tr>
-    <td class="LightBackground">Geronimo Up Time</td>
-    <td class="LightBackground"><div id="<portlet:namespace/>UpTime">Not Yet Available</div></td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.upTime"/></td>
+    <td class="LightBackground"><div id="<portlet:namespace/>UpTime"><fmt:message key="infomanager.svrInfoNormal.notAvailable"/></div></td>
   </tr>
 </table>
 <br>
@@ -49,24 +50,24 @@
 
   base directory is commented originally
   <tr>
-    <td class="LightBackground" width="20%" nowrap>Base Directory</td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.architecture"/></td>
     <td class="LightBackground" width="80%">${svrProps['Base Directory']}</td>
   </tr>
 
   <tr>
-    <td class="LightBackground">Platform Architecture</td>
+    <td class="MediumBackground" width="20%" nowrap><fmt:message key="consolebase.common.name"/></td>
     <td class="LightBackground">${svrProps['Platform Architecture']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground" width="20%" nowrap>Version</td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.version"/></td>
     <td class="MediumBackground"  width="80%">${svrProps['Version']}</td>
   </tr>
   <tr>
-    <td class="LightBackground">Apache Geronimo Build Version</td>
+    <td class="MediumBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.patchLevel"/></td>
     <td class="LightBackground">${svrProps['Apache Geronimo Build Version']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground">J2EE Specs Version</td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.locale"/></td>
     <td class="MediumBackground">${svrProps['J2EE Specifications Version']}</td>
   </tr>
   <tr>
@@ -90,34 +91,34 @@
 <br>
 <table width="100%">
   <tr>
-    <td class="DarkBackground" width="100%" colspan="2" align="center">JVM</td>
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.svrInfoNormal.jvm"/></td>
   </tr>
   <tr>
-    <td class="LightBackground" width="20%" nowrap>Java Version</td>
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="infomanager.svrInfoNormal.javaVersion"/></td>
     <td class="LightBackground" width="80%">${jvmProps['Java Version']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground">Java Vendor</td>
+    <td class="MediumBackground"><fmt:message key="infomanager.svrInfoNormal.javaVendor"/></td>
     <td class="MediumBackground">${jvmProps['Java Vendor']}</td>
   </tr>
   <tr>
-    <td class="LightBackground">Node</td>
+    <td class="LightBackground"><fmt:message key="infomanager.svrInfoNormal.node"/></td>
     <td class="LightBackground">${jvmProps['Node']}</td>
   </tr>
   <tr>
-    <td class="MediumBackground">Current Memory Used</td>
-    <td class="MediumBackground"><div id="<portlet:namespace/>CurrentMemory">Not Yet Available</div></td>
+    <td class="MediumBackground"><fmt:message key="infomanager.svrInfoNormal.currentMemoryUsed"/></td>
+    <td class="MediumBackground"><div id="<portlet:namespace/>CurrentMemory"><fmt:message key="infomanager.svrInfoNormal.notAvailable"/></div></td>
   </tr>
   <tr>
-    <td class="LightBackground">Most Memory Used</td>
-    <td class="LightBackground"><div id="<portlet:namespace/>MostMemory">Not Yet Available</div></td>
+    <td class="LightBackground"><fmt:message key="infomanager.svrInfoNormal.mostMemoryUsed"/></td>
+    <td class="LightBackground"><div id="<portlet:namespace/>MostMemory"><fmt:message key="infomanager.svrInfoNormal.notAvailable"/></div></td>
   </tr>
   <tr>
-    <td class="MediumBackground">Total Memory Allocated</td>
-    <td class="MediumBackground"><div id="<portlet:namespace/>AvailableMemory">Not Yet Available</div></td>
+    <td class="MediumBackground"><fmt:message key="infomanager.svrInfoNormal.totalMemoryAllocated"/></td>
+    <td class="MediumBackground"><div id="<portlet:namespace/>AvailableMemory"><fmt:message key="infomanager.svrInfoNormal.notAvailable"/></div></td>
   </tr>
   <tr>
-    <td class="LightBackground">Available Processors</td>
+    <td class="LightBackground"><fmt:message key="infomanager.svrInfoNormal.availableProcessors"/></td>
     <td class="LightBackground">${jvmProps['Available Processors']}</td>
   </tr>
   <tr>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp Sat Jan  5 12:22:33 2008
@@ -19,14 +19,16 @@
 
 <%@ 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" />
 
 <table>
-<th class="DarkBackground">keystore</th>
-<th class="DarkBackground">alias</th>
-<th class="DarkBackground">type</th>
+<th class="DarkBackground"><fmt:message key="keystore.common.keystore"/></th>
+<th class="DarkBackground"><fmt:message key="keystore.common.alias"/></th>
+<th class="DarkBackground"><fmt:message key="consolebase.common.type"/></th>
 <tr>
 <td class="LightBackground">${id}</td>
 <td class="LightBackground">${alias}</td>
@@ -42,13 +44,13 @@
 <portlet:param name="mode" value="generateCSR-before" />
 <portlet:param name="id" value="${id}" />
 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
-Generate CSR</a></td>
+<fmt:message key="keystore.certificateDetails.generateCSR"/></a></td>
 <td>
 <a href="<portlet:actionURL portletMode="view">
 <portlet:param name="mode" value="importCAReply-before" />
 <portlet:param name="id" value="${id}" />
 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
-Import CA reply</a></td>
+<fmt:message key="keystore.certificateDetails.importCAReply"/></a></td>
 <td>
 <a href="<portlet:actionURL portletMode="view">
 <portlet:param name="mode" value="changePassword-before" />
@@ -61,14 +63,14 @@
 <a href="<portlet:actionURL portletMode="view">
 <portlet:param name="mode" value="deleteEntry-before" />
 <portlet:param name="id" value="${id}" />
-<portlet:param name="alias" value="${alias}" /></portlet:actionURL>" onClick="return confirm('Are you sure you want to delete ${alias}?');">
-Delete Entry</a></td>
+<portlet:param name="alias" value="${alias}" /></portlet:actionURL>" onClick="return confirm('<fmt:message key="keystore.certificateDetails.reallyDelete"><fmt:param value="${alias}"/></fmt:message>');">
+<fmt:message key="keystore.certificateDetails.deleteEntry"/></a></td>
 
 <td>
 <a href="<portlet:actionURL portletMode="view">
 <portlet:param name="mode" value="certificateDetails-after" />
 <portlet:param name="id" value="${id}" /></portlet:actionURL>">
-Back to keystore</a></td>
+<fmt:message key="keystore.certificateDetails.backToKeystore"/>/a></td>
 </tr>
 </table>
 <br/>
@@ -76,37 +78,37 @@
 <c:set var="backgroundClass" value='LightBackground'/>
 <c:forEach items="${certs}" var="cert">
 <table>
-<th class="DarkBackground" colspan="2" align="left">Certificate Info</th>
+<th class="DarkBackground" colspan="2" align="left"><fmt:message key="keystore.certificateDetails.certificateInfo"/></th>
 <tr>
-<td class="LightBackground">Version:</td>
+<td class="LightBackground"><fmt:message key="keystore.common.version"/>:</td>
 <td class="LightBackground"><c:out value="${cert.version}"/></td>
 </tr>
 <tr>
-<td class="MediumBackground">Subject:</td>
+<td class="MediumBackground"><fmt:message key="keystore.common.subject"/>:</td>
 <td class="MediumBackground"><c:out value="${cert.subjectDN.name}"/></td>
 </tr>
 <tr>
-<td class="LightBackground">Issuer:</td>
+<td class="LightBackground"><fmt:message key="keystore.common.issuer"/>:</td>
 <td class="LightBackground"><c:out value="${cert.issuerDN.name}"/></td>
 </tr>
 <tr>
-<td class="MediumBackground">Serial Number:</td>
+<td class="MediumBackground"><fmt:message key="keystore.common.serialNumber"/>:</td>
 <td class="MediumBackground"><c:out value="${cert.serialNumber}"/></td>
 </tr>
 <tr>
-<td class="LightBackground">Valid From:</td>
+<td class="LightBackground"><fmt:message key="keystore.certificateDetails.validFrom"/>:</td>
 <td class="LightBackground"><c:out value="${cert.notBefore}"/></td>
 </tr>
 <tr>
-<td class="MediumBackground">Valid To:</td>
+<td class="MediumBackground"><fmt:message key="keystore.certificateDetails.validTo"/>:</td>
 <td class="MediumBackground"><c:out value="${cert.notAfter}"/></td>
 </tr>
 <tr>
-<td class="LightBackground">Signature Alg:</td>
+<td class="LightBackground"><fmt:message key="keystore.certificateDetails.signatureAlg"/>:</td>
 <td class="LightBackground"><c:out value="${cert.sigAlgName}"/></td>
 </tr>
 <tr>
-<td class="MediumBackground">Public Key Alg:</td>
+<td class="MediumBackground"><fmt:message key="keystore.certificateDetails.publicKeyAlg"/>:</td>
 <td class="MediumBackground"><c:out value="${cert.publicKey.algorithm}"/></td>
 </tr>
 <c:set var="backgroundClass" value='MediumBackground'/> <!-- This should be set from the row above. -->
@@ -120,7 +122,7 @@
     </c:otherwise>
 </c:choose>
 <tr>
-<td class="${backgroundClass}">critical ext: </td>
+<td class="${backgroundClass}"><fmt:message key="keystore.certificateDetails.criticalExt"/>: </td>
 <td class="${backgroundClass}"><c:out value="${extoid}"/></td>
 </tr>
 </c:forEach>
@@ -134,7 +136,7 @@
     </c:otherwise>
 </c:choose>
 <tr>
-<td class="${backgroundClass}">non-critical ext: </td>
+<td class="${backgroundClass}"><fmt:message key="keystore.certificateDetails.nonCriticalExt"/>: </td>
 <td class="${backgroundClass}"><c:out value="${extoid}"/></td>
 </tr>
 </c:forEach>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.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" />
@@ -40,10 +42,10 @@
 
 <c:choose>
     <c:when test="${!empty(alias)}">
-        <b>Change password for private key ${alias}</b><br/>
+        <b><fmt:message key="keystore.viewKeystore.changePwdForPriKey"/> ${alias}</b><br/>
     </c:when>
     <c:otherwise>
-        <b>Change password for keystore ${keystore}</b><br/>
+        <b><fmt:message key="keystore.viewKeystore.changePwdForKeystore"/> ${keystore}</b><br/>
     </c:otherwise>
 </c:choose>
 
@@ -53,25 +55,25 @@
     <input type="hidden" name="mode" value="${mode}" />
     <table border="0">
         <tr>
-            <th align="right">Old password:</th>
+            <th align="right"><fmt:message key="keystore.viewKeystore.oldPassword"/>:</th>
             <td>
                 <input type="password" name="password" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">New password:</th>
+            <th align="right"><fmt:message key="keystore.viewKeystore.newPassword"/>:</th>
             <td>
                 <input type="password" name="newPassword" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">Confirm new password:</th>
+            <th align="right"><fmt:message key="keystore.viewKeystore.confirmPassword"/>:</th>
             <td>
                 <input type="password" name="confirm-newPassword" size="20" maxlength="200" />
             </td>
         </tr>
     </table>
-    <input type="submit" value="Change Password" onClick="return <portlet:namespace/>validateForm();"/>
+    <input type="submit" value="<fmt:message key="keystore.viewKeystore.changePassword"/>" onClick="return <portlet:namespace/>validateForm();"/>
 </form>
 
 <c:choose>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.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/>
 
 <script language="JavaScript">
@@ -41,34 +43,32 @@
 }
 </script>
 
-<p>On this screen you can configure the settings to generate a new private key.
-The next screen will let you review this information before generating the
-private key and accompanying certificate.</p>
+<p><fmt:message key="keystore.configureKey.title"/></p>
 
 <form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="keystore" value="${keystore}" />
     <input type="hidden" name="mode" value="configureKey-after" />
     <table border="0">
         <tr>
-            <th align="right">Alias for new key:</th>
+            <th align="right"><fmt:message key="keystore.configureKey.aliasForKey"/>:</th>
             <td>
                 <input type="text" name="alias" size="20" maxlength="100" />
             </td>
         </tr>
         <tr>
-            <th align="right">Password for new key:</th>
+            <th align="right"><fmt:message key="keystore.configureKey.passwordForKey"/></th>
             <td>
                 <input type="password" name="password" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">Confirm password:</th>
+            <th align="right"><fmt:message key="consolebase.common.confirmPassword"/>:</th>
             <td>
                 <input type="password" name="confirm-password" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">Key Size:</th>
+            <th align="right"><fmt:message key="keystore.configureKey.keySize"/>:</th>
             <td>
                 <select name="keySize">
                     <option>512</option>
@@ -78,7 +78,7 @@
             </td>
         </tr>
         <tr>
-            <th align="right">Algorithm:</th>
+            <th align="right"><fmt:message key="keystore.configureKey.algorithm"/>:</th>
             <td>
                 <select name="algorithm">
                     <option>MD2withRSA</option>
@@ -88,56 +88,56 @@
             </td>
         </tr>
         <tr>
-            <th align="right">Valid for (# of days):</th>
+            <th align="right"><fmt:message key="keystore.configureKey.validFor"/> :</th>
             <td>
                 <input type="text" name="valid" size="5" maxlength="8" />
             </td>
         </tr>
         <tr>
-            <th colspan="2">Certificate Identity</th>
+            <th colspan="2"><fmt:message key="keystore.configureKey.certificateIdentity"/></th>
         </tr>
         <tr>
-            <th align="right">Server Hostname (CN):</th>
+            <th align="right"><fmt:message key="keystore.configureKey.serverHostname"/> (CN):</th>
             <td>
                 <input type="text" name="certCN" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">Company/Organization (O):</th>
+            <th align="right"><fmt:message key="keystore.configureKey.company_Org"/> (O):</th>
             <td>
                 <input type="text" name="certO" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">Division/Business Unit (OU):</th>
+            <th align="right"><fmt:message key="keystore.configureKey.division_BusinessUnit"/> (OU):</th>
             <td>
                 <input type="text" name="certOU" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">City/Locality (L):</th>
+            <th align="right"><fmt:message key="keystore.configureKey.city_Locality"/> (L):</th>
             <td>
                 <input type="text" name="certL" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">State/Province (ST):</th>
+            <th align="right"><fmt:message key="keystore.configureKey.state_Province"/> (ST):</th>
             <td>
                 <input type="text" name="certST" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">Country Code (2 char) (C):</th>
+            <th align="right"><fmt:message key="keystore.configureKey.country_Code"/> (2 char) (C):</th>
             <td>
                 <input type="text" name="certC" size="3" maxlength="2" />
             </td>
         </tr>
     </table>
-    <input type="submit" value="Review Key Data" onClick="return <portlet:namespace/>validateForm();"/>
+    <input type="submit" value='<fmt:message key="keystore.configureKey.reviewKeyData"/>' 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="${keystore}" />
-            </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/confirmCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/confirmCertificate.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/confirmCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/confirmCertificate.jsp Sat Jan  5 12:22:33 2008
@@ -17,9 +17,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>Please confirm that this is the correct certificate to import:</p>
+<p><fmt:message key="keystore.confirmCertificate.title"/></p>
 
 <form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="id" value="${id}" />
@@ -29,35 +31,35 @@
 
     <table border="0">
         <tr>
-            <th class="DarkBackground" colspan="2" align="left">Certificate Details</th>
+            <th class="DarkBackground" colspan="2" align="left"><fmt:message key="keystore.confirmCertificate.certificateDetails"/></th>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Fingerprint:</th>
+            <th class="LightBackground" align="right"><fmt:message key="keystore.confirmCertificate.fingerprint"/>:</th>
             <td class="LightBackground">${fingerprint}</td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Subject:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="keystore.common.subject"/>:</th>
             <td class="MediumBackground">${subject}</td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Issuer:</th>
+            <th class="LightBackground" align="right"><fmt:message key="keystore.common.issuer"/>:</th>
             <td class="LightBackground">${issuer}</td>
         </tr>
         <tr>
-            <th class="MediumBackground" align="right">Validity:</th>
+            <th class="MediumBackground" align="right"><fmt:message key="keystore.common.validity"/>:</th>
             <td class="MediumBackground">${validStart} to ${validEnd}</td>
         </tr>
         <tr>
-            <th class="LightBackground" align="right">Serial Number:</th>
+            <th class="LightBackground" align="right"><fmt:message key="keystore.common.serialNumber"/>:</th>
             <td class="LightBackground">${serial}</td>
         </tr>
     </table>
 
-    <input type="submit" value="Import Certificate" />
+    <input type="submit" value='<fmt:message key="keystore.confirmCertificate.importCertificate"/>' />
 </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/confirmKey.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/confirmKey.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/confirmKey.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/confirmKey.jsp Sat Jan  5 12:22:33 2008
@@ -17,9 +17,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>Please confirm that this is the correct information for the key I'm about to generate:</p>
+<p><fmt:message key="keystore.confirmKey.title"/></p>
 
 <form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="confirmKey-after" />
@@ -38,19 +40,19 @@
 
     <table border="0">
         <tr>
-            <th align="right">Alias:</th>
+            <th align="right"><fmt:message key="keystore.common.alias"/>:</th>
             <td>${alias}</td>
         </tr>
         <tr>
-            <th align="right">Key Type:</th>
+            <th align="right"><fmt:message key="keystore.common.keyType"/>:</th>
             <td>${algorithm} -- ${keySize} bits</td>
         </tr>
         <tr>
-            <th align="right">Validity:</th>
+            <th align="right"><fmt:message key="keystore.common.validity"/>:</th>
             <td>${validFrom} to ${validTo}</td>
         </tr>
         <tr>
-            <th align="right" valign="top">Identity:</th>
+            <th align="right" valign="top"><fmt:message key="keystore.common.identity"/>:</th>
             <td>
                 ${certCN}<br />
                 ${certOU}, ${certO}<br />
@@ -59,11 +61,11 @@
         </tr>
     </table>
 
-    <input type="submit" value="Generate Key" />
+    <input type="submit" value='<fmt:message key="keystore.confirmKey.generateKey"/>' />
 </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/createKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.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/>
 
 <script language="JavaScript">
@@ -41,28 +43,28 @@
     <input type="hidden" name="mode" value="createKeystore-after" />
     <table border="0">
         <tr>
-            <th align="right">Keystore file name:</th>
+            <th align="right"><fmt:message key="keystore.createKeystore.keystoreFileName"/>:</th>
             <td>
                 <input type="text" name="filename" size="20" maxlength="100" />
             </td>
         </tr>
         <tr>
-            <th align="right">Password for new keystore:</th>
+            <th align="right"><fmt:message key="keystore.createKeystore.passwordForKeystore"/>:</th>
             <td>
                 <input type="password" name="password" size="20" maxlength="200" />
             </td>
         </tr>
         <tr>
-            <th align="right">Confirm password:</th>
+            <th align="right"><fmt:message key="consolebase.common.confirmPassword"/>:</th>
             <td>
                 <input type="password" name="confirm-password" size="20" maxlength="200" />
             </td>
         </tr>
     </table>
-    <input type="submit" value="Create Keystore" onClick="return <portlet:namespace/>validateForm();"/>
+    <input type="submit" value='<fmt:message key="keystore.createKeystore.createKeystore"/>' onClick="return <portlet:namespace/>validateForm();"/>
 </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/generateCSR.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/generateCSR.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/generateCSR.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/generateCSR.jsp Sat Jan  5 12:22:33 2008
@@ -16,12 +16,14 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-keystore: ${id}<br/>
-alias: ${alias}<br/>
+<fmt:message key="keystore.common.keystore"/>: ${id}<br/>
+<fmt:message key="keystore.common.alias"/>: ${alias}<br/>
 
 <table>
-<th>PKCS10 Certification Request</th>
+<th><fmt:message key="keystore.generateCSR.PKCS10CertificatioRequest"/>t</th>
 <tr>
 <td>
 <form action=>
@@ -35,6 +37,6 @@
 <portlet:param name="mode" value="generateCSR-after" />
 <portlet:param name="id" value="${id}" />
 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
-Back</a></td>
+<fmt:message key="consolebase.common.back"/></a></td>
 </tr>
 </table>



Mime
View raw message