geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r611728 [6/6] - in /geronimo/server/trunk/plugins: activemq/activemq-portlets/src/main/resources/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/activem...
Date Mon, 14 Jan 2008 07:16:36 GMT
Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/edit.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/edit.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/edit.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/edit.jsp Sun Jan 13 23:16:30 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="systemdatabase"/>
+
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -39,7 +42,7 @@
 }
 </script>
 
-<p>This page edits a new or existing database pool.</p>
+<p><fmt:message key="dbwizard.edit.summary"/></p>
 
 <script language="JavaScript">
 function <portlet:namespace/>validate() {
@@ -107,13 +110,13 @@
     <table border="0">
     <c:if test="${!(empty pool.deployError)}">
       <tr>
-          <th><div align="right"><font color="red">Error Deploying:</font></div></th>
-          <td><font color="red">${pool.deployError} - see the log for details</font></td>
+          <th><div align="right"><font color="red"><fmt:message key="dbwizard.edit.errorDeploying"/>:</font></div></th>
+          <td><font color="red">${pool.deployError} - <fmt:message key="dbwizard.edit.seeLog"/></font></td>
       </tr>
     </c:if>
     <!-- ENTRY FIELD: NAME -->
       <tr>
-        <th style="min-width: 140px"><div align="right">Pool Name:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="dbwizard.edit.poolName"/>:</div></th>
         <td>
       <c:choose> <%-- Can't change the pool name after deployment because it's wired into all the ObjectNames --%>
         <c:when test="${empty pool.abstractName}">
@@ -131,11 +134,11 @@
       </tr>
       <tr>
         <td></td>
-        <td>A name that is different than the name for any other database pools in the server (no spaces in the name please).</td>
+        <td><fmt:message key="dbwizard.edit.poolNameExp"/></td>
       </tr>
     <!-- STATUS FIELD: Display Name -->
       <tr>
-        <th><div align="right">Pool Type:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.edit.poolType"/>:</div></th>
         <td><i><c:out value="${pool.adapterDisplayName}" /></i></td>
       </tr>
       <tr>
@@ -144,13 +147,13 @@
       </tr>
     <!-- HEADER -->
       <tr>
-        <th colspan="2">Basic Connection Properties</th>
+        <th colspan="2"><fmt:message key="dbwizard.edit.basicConProperties"/></th>
       </tr>
 <c:choose>
   <c:when test="${pool.generic}"> <%-- This is a standard TranQL JDBC pool -- we know what parameters it wants --%>
     <!-- ENTRY FIELD: Driver Class -->
       <tr>
-        <th><div align="right">JDBC Driver Class:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.JDBCDriverClass" />:</div></th>
         <td>
       <c:choose>
         <c:when test="${empty pool.abstractName}">
@@ -169,15 +172,15 @@
       <tr>
         <td></td>
         <td>
-          <c:if test="${!(empty driverError)}"><font color="red"><b>Unable to load driver from selected JARs!</b></font></c:if>
-          See the documentation for your JDBC driver.
+          <c:if test="${!(empty driverError)}"><font color="red"><b><fmt:message key="dbwizard.edit.unableToLoadDriver"/></b></font></c:if>
+          <fmt:message key="dbwizard.edit.seeDocumentation"/> 
         </td>
       </tr>
     <!-- ENTRY FIELD: Driver JAR -->
   <c:choose> <%-- Can't set JAR after deployment because we don't know how to dig through dependencies yet --%>
     <c:when test="${empty pool.abstractName}">
       <tr>
-        <th><div align="right">Driver JAR:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.driverJAR"/>:</div></th>
         <td>
           <select multiple="true" name="jars" size="10">
               <c:forEach var="availableJar" items="${availableJars}">
@@ -193,9 +196,8 @@
       </tr>
       <tr>
         <td></td>
-        <td>The JAR(s) required to make a connection to the database.  Use CTRL-click or SHIFT-click to select multiple jars.<br> 
-           The JAR(s) should already be installed under GERONIMO/repository/ (or
-          <input type="button" value="Download a Driver" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
+        <td><fmt:message key="dbwizard.common.driverJARExplanation"/>
+          <input type="button" value='<fmt:message key="dbwizard.common.downloadDriver"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
         </td>
       </tr>
     </c:when>
@@ -207,7 +209,7 @@
   </c:choose>
     <!-- ENTRY FIELD: URL -->
       <tr>
-        <th><div align="right">JDBC Connect URL:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.JDBCConnectURL"/>:</div></th>
         <td><input name="url" type="text" size="50" value="${pool.url}"></td>
       </tr>
       <script language="JavaScript">
@@ -215,24 +217,24 @@
       </script>
       <tr>
         <td></td>
-        <td>Make sure the generated URL fits the syntax for your JDBC driver.</td>
+        <td><fmt:message key="dbwizard.common.URLFits"/></td>
       </tr>
     <!-- ENTRY FIELD: Username -->
       <tr>
-        <th><div align="right">DB User Name:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.DBUserName"/>:</div></th>
         <td><input name="user" type="text" size="20" value="${pool.user}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>The username used to connect to the database</td>
+        <td><fmt:message key="dbwizard.common.DBUserNameExp"/></td>
       </tr>
     <!-- ENTRY FIELD: Password -->
       <tr>
-        <th><div align="right">DB Password:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.DBPassword"/>:</div></th>
         <td><input name="password" type="password" size="20" value="${pool.password}"></td>
       </tr>
       <tr>
-        <th><div align="right">Confirm Password:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.confirmPassword"/>:</div></th>
         <td><input name="confirm-password" type="password" size="20" value="${pool.password}"></td>
       </tr>
       <script language="JavaScript">
@@ -240,7 +242,7 @@
       </script>
       <tr>
         <td></td>
-        <td>The password used to connect to the database
+        <td><fmt:message key="dbwizard.common.DBPasswordExp"/>
 
         <%-- Just to be safe, save all the non-Generic properties since we're not going to edit them here --%>
   <c:forEach var="prop" items="${pool.properties}">
@@ -254,7 +256,7 @@
   <c:choose> <%-- Can't set JAR after deployment because we don't know how to dig through dependencies yet --%>
     <c:when test="${empty pool.abstractName}">
       <tr>
-        <th><div align="right">Driver JAR:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.driverJAR"/>:</div></th>
         <td>
           <select multiple="true" name="jars" size="10">
               <c:forEach var="availableJar" items="${availableJars}">
@@ -270,9 +272,8 @@
       </tr>
       <tr>
         <td></td>
-        <td>The JAR(s) required to make a connection to the database.  Use CTRL-click or SHIFT-click to select multiple jars.<br> 
-           The JAR(s) should already be installed under GERONIMO/repository/ (or
-          <input type="button" value="Download a Driver" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
+        <td><fmt:message key="dbwizard.common.driverJARExplanation"/>
+          <input type="button" value='<fmt:message key="dbwizard.common.downloadDriver"/>'  onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
         </td>
       </tr>
     </c:when>
@@ -289,7 +290,7 @@
       </tr>
     <c:if test="${fn:containsIgnoreCase(prop.key, 'password')}">
       <tr>
-        <th><div align="right">Confirm password:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.confirmPassword"/>:</div></th>
         <td><input name="confirm-${prop.key}" type="password" size="20" value="${prop.value}"></td>
       </tr>
       <script language="JavaScript">
@@ -316,43 +317,43 @@
 </c:choose>
     <!-- HEADER -->
       <tr>
-        <th colspan="2">Connection Pool Parameters</th>
+        <th colspan="2"><fmt:message key="dbwizard.common.connectionPoolParameters"/></th>
       </tr>
     <!-- ENTRY FIELD: Min Size -->
       <tr>
-        <th><div align="right">Pool Min Size:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.poolMinSize"/>:</div></th>
         <td><input name="minSize" type="text" size="5" value="${pool.minSize}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>The minimum number of connections in the pool.  The default is 0.</td>
+        <td><fmt:message key="dbwizard.edit.minimumNoOfCon"/></td>
       </tr>
     <!-- ENTRY FIELD: Max Size -->
       <tr>
-        <th><div align="right">Pool Max Size:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.common.poolMaxSize"/>:</div></th>
         <td><input name="maxSize" type="text" size="5" value="${pool.maxSize}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>The maximum number of connections in the pool.  The default is 10.</td>
+        <td><fmt:message key="dbwizard.common.maxNoOfCon"/></td>
       </tr>
     <!-- ENTRY FIELD: Blocking Timeout -->
       <tr>
-        <th><div align="right">Blocking Timeout:</div></th>
-        <td><input name="blockingTimeout" type="text" size="7" value="${pool.blockingTimeout}"> (in milliseconds)</td>
+        <th><div align="right"><fmt:message key="dbwizard.common.blockingTimeout"/>:</div></th>
+        <td><input name="blockingTimeout" type="text" size="7" value="${pool.blockingTimeout}"> (<fmt:message key="dbwizard.common.inMilliseconds"/>)</td>
       </tr>
       <tr>
         <td></td>
-        <td>The length of time a caller will wait for a connection.  The default is 5000.</td>
+        <td><fmt:message key="dbwizard.edit.blockingTimeoutExp"/></td>
       </tr>
     <!-- ENTRY FIELD: Idle timeout -->
       <tr>
-        <th><div align="right">Idle Timeout:</div></th>
-        <td><input name="idleTimeout" type="text" size="5" value="${pool.idleTimeout}"> (in minutes)</td>
+        <th><div align="right"><fmt:message key="dbwizard.common.idleTimeout"/>:</div></th>
+        <td><input name="idleTimeout" type="text" size="5" value="${pool.idleTimeout}"> (<fmt:message key="dbwizard.common.inMinutes"/>)</td>
       </tr>
       <tr>
         <td></td>
-        <td>How long a connection can be idle before being closed.  The default is 15.</td>
+        <td><fmt:message key="dbwizard.edit.idleTimeoutExp"/></td>
       </tr>
 
     <!-- SUBMIT BUTTON -->
@@ -363,23 +364,23 @@
   <c:when test="${pool.generic}">
     <c:choose> <%-- Can't test after deployment because we don't know what JAR to put on the ClassPath, can't show plan becasue we can't update a plan --%>
       <c:when test="${empty pool.abstractName}">
-          <input type="button" value="Test Connection" onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.test.value='true';document.<portlet:namespace/>DatabaseForm.submit();}" />
-          <input type="button" value="Skip Test and Deploy" onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.test.value='false';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
-          <input type="button" value="Skip Test and Show Plan" onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+          <input type="button" value='<fmt:message key="dbwizard.common.testConnection"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.test.value='true';document.<portlet:namespace/>DatabaseForm.submit();}" />
+          <input type="button" value='<fmt:message key="dbwizard.common.skipTestAndDeploy"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.test.value='false';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+          <input type="button" value='<fmt:message key="dbwizard.common.skipTestAndShowPlan"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
       </c:when>
       <c:otherwise>
-          <input type="button" value="Save" onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+          <input type="button" value='<fmt:message key="dbwizard.common.save"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
       </c:otherwise>
     </c:choose>
   </c:when>
   <c:otherwise> <%-- Not a generic JDBC pool --%>
     <c:choose>
       <c:when test="${empty pool.abstractName}"> <%-- If it's new we can preview the plan or save/deploy --%>
-          <input type="button" value="Deploy" onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
-          <input type="button" value="Show Plan" onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+          <input type="button" value='<fmt:message key="dbwizard.common.deploy"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+          <input type="button" value='<fmt:message key="dbwizard.common.showPlan"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
       </c:when>
       <c:otherwise> <%-- If it's existing we can only save --%>
-          <input type="button" value="Save" onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+          <input type="button" value='<fmt:message key="dbwizard.common.save"/>'  onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
       </c:otherwise>
     </c:choose>
   </c:otherwise>
@@ -394,4 +395,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message  key="dbwizard.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp Sun Jan 13 23:16:30 2008
@@ -16,24 +16,23 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
 <portlet:defineObjects/>
 
-<p><b>Import Database Pools</b> -- Step 2: Review Imported Data</p>
+<p><fmt:message key="dbwizard.importStatus.title"/></p>
 
-<p>The list of recognized database pools appears below.  You can deploy any pools to
-  Geronimo that were configured as plain JDBC pools, or XA pools where Geronimo has
-  a supported XA adapter.  Below the pool list is the list of status messages from
-  the import process.</p>
+<p><fmt:message key="dbwizard.importStatus.summary"/></p>
 
 <c:choose>
-  <c:when test="${empty(status.pools)}"><p><i>The import failed or did not discover any usable database pools!</i></p></c:when>
+  <c:when test="${empty(status.pools)}"><p><i><fmt:message key="dbwizard.importStatus.importFailed"/></i></p></c:when>
   <c:otherwise>
 <table width="100%">
   <tr>
-    <td class="DarkBackground">Original Name</td>
-    <td class="DarkBackground" align="center">Original JNDI</td>
-    <td class="DarkBackground" align="center">Import Status</td>
-    <td class="DarkBackground" align="center">Actions</td>
+    <td class="DarkBackground"><fmt:message key="dbwizard.importStatus.originalJNDI"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="dbwizard.importStatus.originalName"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="dbwizard.importStatus.importStatus"/></td>
+    <td class="DarkBackground" align="center"><fmt:message key="dbwizard.common.actions"/></td>
   </tr>
 <c:forEach var="pool" items="${status.pools}" varStatus="loop" >
   <tr>
@@ -48,7 +47,7 @@
       <a href="<portlet:actionURL portletMode="view">
         <portlet:param name="mode" value="importEdit" />
         <portlet:param name="importIndex" value="${loop.index}" />
-      </portlet:actionURL>">Confirm and Deploy</a>
+      </portlet:actionURL>"><fmt:message key="dbwizard.common.confirmAndDeploy"/></a>
     </c:otherwise>
   </c:choose>
     </td>
@@ -58,7 +57,7 @@
     <td colspan="4" align="center">
       <a href="<portlet:actionURL portletMode="view">
         <portlet:param name="mode" value="importComplete" />
-      </portlet:actionURL>"><c:choose><c:when test="${status.finished}">Finish</c:when><c:otherwise>Skip Remaining Pools</c:otherwise></c:choose></a>
+      </portlet:actionURL>"><c:choose><c:when test="${status.finished}"><fmt:message key="dbwizard.common.finish"/></c:when><c:otherwise><fmt:message key="dbwizard.common.skipRemainingPools"/></c:otherwise></c:choose></a>
     </td>
   </tr>
 </table>
@@ -67,7 +66,7 @@
 
 <hr />
 
-<p>Current Pools in Server:</p>
+<p><fmt:message key="dbwizard.importStatus.currentPools"/>:</p>
 <ul>
 <c:forEach var="pool" items="${pools}">
   <li>${pool.name}</li>
@@ -76,7 +75,7 @@
 
 <hr />
 
-<p>Import Messages:</p>
+<p><fmt:message key="dbwizard.importStatus.importMessages"/>:</p>
 <ul>
 <c:forEach var="message" items="${status.original.messages}">
   <li>${message}</li>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importUpload.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importUpload.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importUpload.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/importUpload.jsp Sun Jan 13 23:16:30 2008
@@ -16,34 +16,33 @@
 --%>
 <%@ 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="systemdatabase"/>
 <portlet:defineObjects/>
 
 
-<p><b>Import Database Pools</b> -- Step 1: Upload Configuration File</p>
+<p><fmt:message key="dbwizard.importUpload.title"/></p>
 
-<p>This page starts the process of importing database pools from another application server.
-To do the import, you'll need to upload a configuration file from the other server using the
-fields below.  After that, we'll convert the values we can, and ask you to confirm the
-configuration for each pool we find in the configuration.</p>
+<p><fmt:message key="dbwizard.importUpload.summary"/></p>
 
 <form enctype="multipart/form-data" method="POST" name="<portlet:namespace/>ImportForm"
       action="<portlet:actionURL><portlet:param name="mode" value="importUpload"/><portlet:param name="importSource" value="${pool.importSource}"/></portlet:actionURL>">
     <table width="100%">
       <tr>
-        <td class="DarkBackground" colspan="2">${pool.importSource} Import</td>
+        <td class="DarkBackground" colspan="2"><fmt:message key="dbwizard.common.import"><fmt:param value="${pool.importSource}"/></fmt:message></td>
       </tr>
       <tr>
-        <th align="right" style="min-width: 140px">Config File:</th>
+        <th align="right" style="min-width: 140px"><fmt:message key="dbwizard.common.configFile"/>:</th>
         <td><input type="file" name="configFile" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>Please select the ${from}.</td>
+        <td><fmt:message key="dbwizard.importUpload.pleaseSelect"/> ${from}.</td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" /></td>
+        <td><input type="submit" value='<fmt:message key="dbwizard.common.next"/>' /></td>
       </tr>
     </table>
 </form>
@@ -58,38 +57,33 @@
     <input type="hidden" name="from" value="${from}" />
     <table width="100%">
       <tr>
-        <td class="DarkBackground" colspan="2">Alternate ${pool.importSource} Import</td>
+        <td class="DarkBackground" colspan="2"><fmt:message key="dbwizard.importUpload.alternateImport">
+        <fmt:param value="${pool.importSource}" />
+        </fmt:message></td>
       </tr>
       <tr>
-        <td colspan="2">If WebLogic 8.1 is installed on the same machine as Geronimo, and the
-WebLogic domain directory is readable by the user running Geronimo, you
-can also point directly to the WebLogic installation and domain directories.
-This has the advantage that the import process can read the database
-passwords, whereas if you just import a <tt>config.xml</tt> above you'll
-need to re-enter all the passwords.</td>
+        <td colspan="2"><fmt:message key="dbwizard.importUpload.aboutWebLogic"/></td>
       </tr>
       <tr>
-        <th align="right" style="min-width: 140px">Domain directory path:</th>
+        <th align="right" style="min-width: 140px"><fmt:message key="dbwizard.importUpload.domainDirectoryPath"/>:</th>
         <td><input type="text" name="weblogicDomainDir" size="40" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>Please enter the full path to the WebLogic domain directory (containing the
-          <tt>config.xml</tt> file) for your WebLogic domain (e.g. C:\bea\user_projects\domains\mydomain).</td>
+        <td><fmt:message key="dbwizard.importUpload.domainDirectoryPathExp"/> (e.g. C:\bea\user_projects\domains\mydomain).</td>
       </tr>
       <tr>
-        <th align="right"><tt>weblogic81/server/lib</tt> path:</th>
+        <th align="right"><tt>weblogic81/server/lib</tt> <fmt:message key="dbwizard.importUpload.path"/>:</th>
         <td><input type="text" name="weblogicLibDir" size="40" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>Please enter the full path to the <tt>weblogic81/server/lib</tt> directory
-          for your WebLogic 8.1 installation (e.g. C:\bea\weblogic81\server\lib).</td>
+        <td><fmt:message key="dbwizard.importUpload.enterFullPath"/> (e.g. C:\bea\weblogic81\server\lib).</td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" /></td>
+        <td><input type="submit" value='<fmt:message key="dbwizard.common.next"/>' /></td>
       </tr>
     </table>
 </form>
@@ -98,4 +92,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp Sun Jan 13 23:16:30 2008
@@ -16,22 +16,23 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
 <portlet:defineObjects/>
 
-<p>This page lists all the available database pools.</p>
+<p><fmt:message key="dbwizard.list.summary"/></p>
 
 <c:choose>
-  <c:when test="${empty(pools)}"><p><i>There are no database pools defined</i></p></c:when>
+  <c:when test="${empty(pools)}"><p><i><fmt:message key="dbwizard.list.noDatabasePools"/></i></p></c:when>
   <c:otherwise>
-<p>For each pool listed, you can click the <b>usage</b> link to see examples of how
-  to use the pool from your application.</p>
+<p><fmt:message key="dbwizard.list.hasDatabasePools"/></p>
 
 <table width="100%">
   <tr>
-    <th class="DarkBackground" align="left">Name</th>
-    <th class="DarkBackground" align="center">Deployed As</th>
-    <th class="DarkBackground" align="center">State</th>
-    <th class="DarkBackground" align="center">Actions</th>
+    <th class="DarkBackground" align="left"><fmt:message key="dbwizard.common.name"/></th>
+    <th class="DarkBackground" align="center"><fmt:message key="dbwizard.list.deployedAs"/></th>
+    <th class="DarkBackground" align="center"><fmt:message key="dbwizard.common.state"/></th>
+    <th class="DarkBackground" align="center"><fmt:message key="dbwizard.common.actions"/></th>
   </tr>
 <c:set var="backgroundClass" value='MediumBackground'/>
 <c:forEach var="pool" items="${pools}">
@@ -48,7 +49,7 @@
     <td class="${backgroundClass}">
       <c:choose>
         <c:when test="${empty pool.parentName}">
-          Server-wide
+          <fmt:message key="dbwizard.list.serverWide" />
         </c:when>
         <c:otherwise>
           ${pool.parentName}  <%-- todo: make this a link to an application portlet --%>
@@ -79,18 +80,18 @@
         <portlet:param name="mode" value="editExisting" />
         <portlet:param name="adapterAbstractName" value="${pool.adapterAbstractName}" />
         <portlet:param name="abstractName" value="${pool.factoryAbstractName}" />
-      </portlet:actionURL>">edit</a>
+      </portlet:actionURL>"><fmt:message key="dbwizard.common.edit"/></a>
       <a href="<portlet:actionURL portletMode="view">
         <portlet:param name="mode" value="usage" />
         <portlet:param name="name" value="${pool.name}" />
         <portlet:param name="abstractName" value="${pool.factoryAbstractName}" />
-      </portlet:actionURL>">usage</a>
+      </portlet:actionURL>"><fmt:message key="dbwizard.list.usage"/></a>
        <a href="<portlet:actionURL portletMode="view">
          <portlet:param name="mode" value="delete" />
          <portlet:param name="name" value="${info.objectName}" />
          <portlet:param name="adapterAbstractName" value="${pool.adapterAbstractName}" />
          <portlet:param name="abstractName" value="${pool.factoryAbstractName}" />
-       </portlet:actionURL>">delete</a>
+       </portlet:actionURL>"><fmt:message key="dbwizard.common.delete"/></a>
     </td>
   </tr>
 </c:forEach>
@@ -98,19 +99,19 @@
   </c:otherwise>
 </c:choose>
 
-<p>Create a new database pool:</p>
+<p><fmt:message key="dbwizard.list.createPool"/>:</p>
 <ul>
   <li><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="rdbms" />
-            </portlet:actionURL>">Using the Geronimo database pool wizard</a></li>
+            </portlet:actionURL>"><fmt:message key="dbwizard.common.usingPoolWizard"/></a></li>
   <li><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="startImport" />
               <portlet:param name="importSource" value="JBoss 4" />
               <portlet:param name="from" value="<tt>*-ds.xml</tt> file from the <tt>jboss4/server/name/deploy</tt> directory" />
-            </portlet:actionURL>">Import from JBoss 4</a></li>
+            </portlet:actionURL>"><fmt:message key="dbwizard.common.importFromJBoss"/></a></li>
   <li><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="startImport" />
               <portlet:param name="importSource" value="WebLogic 8.1" />
               <portlet:param name="from" value="<tt>config.xml</tt> file from the WebLogic domain directory" />
-            </portlet:actionURL>">Import from WebLogic 8.1</a></li>
+            </portlet:actionURL>"><fmt:message key="dbwizard.common.importFromWebLogic"/></a></li>
 </ul>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp Sun Jan 13 23:16:30 2008
@@ -19,6 +19,9 @@
 
 <%@ 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="systemdatabase"/>
+
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -31,7 +34,7 @@
 }
 </script>
 
-<p><b>Create Database Pool</b> -- Step 1: Select Name and Database</p>
+<p><fmt:message key="dbwizard.selectDatabase.title"/></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
@@ -60,16 +63,16 @@
     <table border="0">
     <!-- ENTRY FIELD: NAME -->
       <tr>
-        <th style="min-width: 140px"><div align="right">Name of Database Pool:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="dbwizard.selectDatabase.nameOfPool"/>:</div></th>
         <td><input name="name" type="text" size="30" value="${pool.name}"></td>
       </tr>
       <tr>
         <td></td>
-        <td>A name that is different than the name for any other database pools in the server (no spaces in the name please).</td>
+        <td><fmt:message key="dbwizard.selectDatabase.nameOfPoolExplanation"/></td>
       </tr>
     <!-- ENTRY FIELD: DB TYPE -->
       <tr>
-        <th><div align="right">Database Type:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.selectDatabase.databaseType"/>:</div></th>
         <td>
           <select name="dbtype">
         <c:forEach var="db" items="${databases}">
@@ -80,11 +83,11 @@
       </tr>
       <tr>
         <td></td>
-        <td>The type of database the pool will connect to.</td>
+        <td><fmt:message key="dbwizard.selectDatabase.databaseTypeExp"/></td>
       </tr>
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" onClick="return <portlet:namespace/>validateForm();"/></td>
+        <td><input type="submit" value='<fmt:message key="dbwizard.common.next"/>' onClick="return <portlet:namespace/>validateForm();"/></td>
       </tr>
     </table>
 </form>
@@ -101,4 +104,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDownload.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDownload.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDownload.jsp Sun Jan 13 23:16:30 2008
@@ -16,17 +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="systemdatabase"/>
 <portlet:defineObjects/>
 
-<p><b>Create Database Pool</b> -- Step 2: Select Driver, JAR, Parameters</p>
+<p><fmt:message key="dbwizard.selectDownload.title"/></p>
 
-<p>This page lets you automatically download a driver for a database where the
-driver JARs are available online without login or registration.</p>
+<fmt:message key="dbwizard.selectDownload.summary"/>
 
-<p><i>If this page took a very long time to load and there are no drivers listed in the box below,
-it probably means your Geronimo installation can't connect to apache.org to retrieve the driver
-download configuration file.  Sorry for the inconvenience, you'll have to try again later or
-install the driver by hand (copy it to a directory under geronimo/repository/)</i></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST" onSubmit="startProgress()">
@@ -57,7 +54,7 @@
     <table border="0">
     <!-- ENTRY FIELD: DRIVER TYPE -->
       <tr>
-        <th style="min-width: 140px"><div align="right">Select Driver:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="dbwizard.selectDownload.selectDriver"/>:</div></th>
         <td>
           <select name="driverName">
         <c:forEach var="driver" items="${drivers}">
@@ -68,13 +65,13 @@
       </tr>
       <tr>
         <td></td>
-        <td>A driver that Geronimo can download automatically for you.</td>
+        <td><fmt:message key="dbwizard.selectDownload.selectDriverExp"/></td>
       </tr>
       <tr>
         <td></td>
         <td>
-          <input type="submit" value="Next" />
-          <input type="button" value="Cancel" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='params';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+          <input type="submit" value='<fmt:message key="dbwizard.common.next"/>' />
+          <input type="button" value='<fmt:message key="dbwizard.common.cancel"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='params';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
         </td>
       </tr>
     </table>
@@ -85,17 +82,17 @@
 <%--
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="params" />
-            </portlet:actionURL>">Select predefined database</a></p>
+            </portlet:actionURL>"><fmt:message key="dbwizard.selectDownload.selectPredefinedDatabase"/></a></p>
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="edit" />
-            </portlet:actionURL>">Select "other" database</a></p>
+            </portlet:actionURL>"><fmt:message key="dbwizard.selectDownload.selectOtherDatabase"/></a></p>
 --%>
 
 <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="dbwizard.common.returnToList"/></a></p>
 
-<p><br /><br /><br />Here are some other JDBC drivers you might want to download on your own (just save them somewhere under geronimo/repository/):</p>
+<p><br /><br /><br /><fmt:message key="dbwizard.selectDownload.otherJDBCDrivers"/>:</p>
 <ul>
   <li><a href="http://www.daffodildb.com/download/index.jsp">DaffodilDB</a></li>
   <li><a href="http://www.frontbase.com/cgi-bin/WebObjects/FrontBase">FrontBase</a></li>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/showPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/showPlan.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/showPlan.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/showPlan.jsp Sun Jan 13 23:16:30 2008
@@ -16,9 +16,11 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
 <portlet:defineObjects/>
 
-<p><b>Create Database Pool</b> -- Show Deployment Plan</p>
+<p><fmt:message key="dbwizard.showPlan.title"/></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
@@ -49,23 +51,21 @@
     <table border="0">
     <!-- STATUS FIELD: Deployment Plan -->
       <tr>
-        <th valign="top" style="min-width: 140px"><div align="right">Deployment Plan:</div></th>
+        <th valign="top" style="min-width: 140px"><div align="right"><fmt:message key="dbwizard.showPlan.deploymentPlan"/>:</div></th>
         <td><textarea rows="30" cols="60" readonly>${deploymentPlan}</textarea></td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
         <td>
-<input type="submit" value="Deploy Pool" />
-<input type="button" value="Edit Settings" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='edit';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+<input type="submit" value='<fmt:message key="dbwizard.showPlan.deployPool"/>' />
+<input type="button" value='<fmt:message key="dbwizard.common.editSettings"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='edit';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
         </td>
       </tr>
     <!-- STATUS FIELD: Command-line guidance -->
       <tr>
-        <th valign="top"><div align="right">Deploy Command:</div></th>
-        <td>To deploy a database pool from the command line using this plan,
-          copy and paste it to a file (say, <tt>plan-file.xml</tt>) and save
-          it.  Then run a command like:<br />
+        <th valign="top"><div align="right"><fmt:message key="dbwizard.showPlan.deployCommand"/>:</div></th>
+        <td><fmt:message key="dbwizard.showPlan.deployPoolFromCommandLine"/>
 <pre>
 cd GERONIMO_HOME
 java -jar bin/deployer.jar deploy plan-file.xml \
@@ -74,19 +74,11 @@
       </tr>
     <!-- STATUS FIELD: Embed in EAR guidance -->
       <tr>
-        <th valign="top"><div align="right">Add to EAR:</div></th>
-        <td>Instead of deploying as a top-level database pool, you
-          can deploy this pool as part of an EAR.  To add a database
-          pool to an EAR using this plan:
-<ol>
-  <li>Copy and paste the plan to a file</li>
-  <li>Save the plan file to the top level of your EAR</li>
-  <li>Copy the RAR file from <tt>GERONIMO_HOME/${rarRelativePath}</tt>
-    to the top level of your EAR</li>
-  <li>Create a <tt>META-INF/geronimo-application.xml</tt> file in your EAR
-    that has a <tt>module</tt> entry like this (substituting the correct
-    RAR file name and plan file name):</li>
-</ol>
+        <th valign="top"><div align="right"><fmt:message key="dbwizard.showPlan.addToEAR"/>:</div></th>
+        <td>
+        <fmt:message key="dbwizard.showPlan.deployAsPartEAR">
+        <fmt:param value="${rarRelativePath}" />
+        </fmt:message>
 <pre>
 &lt;application
    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"&gt;
@@ -108,4 +100,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp Sun Jan 13 23:16:30 2008
@@ -16,9 +16,11 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
 <portlet:defineObjects/>
 
-<p><b>Create Database Pool</b> -- Step 4: Test Connection</p>
+<p><b><fmt:message key="dbwizard.testConnection.title"/></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
@@ -49,13 +51,13 @@
     <table border="0">
     <!-- STATUS FIELD: Conection Result -->
       <tr>
-        <th style="min-width: 140px"><div align="right">Test Result:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="dbwizard.testConnection.testResult"/>:</div></th>
         <td>
           <c:choose>
             <c:when test="${empty connectResult}">
-              <font color="red"><i>Connection Error (see below)</i></font>
+              <font color="red"><i><fmt:message key="dbwizard.testConnection.connectionError"/></i></font>
             </c:when><c:otherwise>
-              Connected to ${connectResult}
+              <fmt:message key="dbwizard.testConnection.connectedTo"/> ${connectResult}
             </c:otherwise>
           </c:choose>
         </td>
@@ -63,7 +65,7 @@
     <!-- STATUS FIELD: Connection Errors -->
     <c:if test="${!(empty connectError)}">
       <tr>
-        <th><div align="right">Test Error:</div></th>
+        <th><div align="right"><fmt:message key="dbwizard.testConnection.testError"/>:</div></th>
         <td><textarea rows="30" cols="60" readonly>${connectError}</textarea></td>
       </tr>
     </c:if>
@@ -73,12 +75,12 @@
         <td>
           <c:choose>
             <c:when test="${empty connectResult}">
-<input type="submit" value="Deploy Anyway" />
-<input type="button" value="Edit Settings" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='edit';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
-<input type="button" value="Test Again" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='process-url';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+<input type="submit" value='<fmt:message key="dbwizard.testConnection.deployAnyway"/>' />
+<input type="button" value='<fmt:message key="dbwizard.common.editSettings"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='edit';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+<input type="button" value='<fmt:message key="dbwizard.testConnection.testAgain"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='process-url';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
             </c:when><c:otherwise>
-<input type="submit" value="Deploy" />
-<input type="button" value="Show Plan" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+<input type="submit" value='<fmt:message key="dbwizard.common.deploy"/>' />
+<input type="button" value='<fmt:message key="dbwizard.common.showPlan"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
             </c:otherwise>
           </c:choose>
         </td>
@@ -89,4 +91,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp Sun Jan 13 23:16:30 2008
@@ -17,17 +17,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="systemdatabase"/>
 <portlet:defineObjects/>
 
-<p>This page talks about how to use the database pool ${pool.name} from a J2EE application.
-  The example here is a web application, but other application modules would work in
-  the same way.</p>
+<p><fmt:message key="dbwizard.usage.title">
+<fmt:param  value="${pool.name}"/>
+</fmt:message></p>
 
 <p><b>WEB-INF/web.xml</b></p>
 
-<p>The <tt>web.xml</tt> should have a <tt>resource-ref</tt> section declaring the database pool,
-like this.  Note the <tt>res-ref-name</tt>, which is what we'll need to map the reference
-to a pool, and also what the application will need in order to access the pool.</p>
+<p><fmt:message key="dbwizard.usage.resource_refSection"/></p>
 
 <pre>
 &lt;web-app xmlns="http://java.sun.com/xml/ns/j2ee"
@@ -49,18 +49,10 @@
 
 <p><b>WEB-INF/geronimo-web.xml</b></p>
 
-<p>To point the resource reference to a specific database pool in Gernimo, 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.  The <tt>geronimo-web.xml</tt> plan should have a <tt>dependency</tt>
-element pointing to the database pool module, and a <tt>resource-ref</tt> block corresponding
-to the <tt>web.xml</tt> <tt>resource-ref</tt> above, which maps the resource reference to a
-specific database pool.  In that block, the <tt>ref-name</tt> must match the
-<tt>res-ref-name</tt> from the <tt>web.xml</tt> (above) and the <tt>resource-link</tt> must
-point to the database pool by name.</p>
+<fmt:message key="dbwizard.usage.geronimo_webExp">
+<fmt:param   value="${pool.name}" />
+</fmt:message>
 
-<p><i>If you have only one pool named ${pool.name} deployed in Geronimo, you can point to it
-like this.</i></p>
 
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
@@ -88,13 +80,17 @@
     &lt;/resource-ref&gt;
 &lt;/web-app&gt;
 </pre>
+<fmt:message key="dbwizard.usage.searchOnlyOne">
+<fmt:param   value="${pool.name}" />
+</fmt:message>
+</p>
+
+<p><i>
+<fmt:message key="dbwizard.usage.moreThanOnePool">
+<fmt:param   value="${pool.name}" />
+</fmt:message>
+</i></p>
 
-<p>That will search for a pool named ${pool.name} in the current application and any
-modules listed as dependencies (and their dependencies, etc.).</p>
-
-<p><i>If you have more than one pool named ${pool.name} (for example, two dependencies
-that <b>each</b> include a component named ${pool.name}), then you can specify the
-pool to use more explicitly like this:</i></p>
 
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
@@ -127,11 +123,9 @@
 &lt;/web-app&gt;
 </pre>
 
-<p><b>Application Code</b></p>
+<p><b><fmt:message key="dbwizard.usage.applicationCode" /></b></p>
 
-<p>To get a reference to the database pool, your application can use code like this.  Note that
-the JNDI lookup string is <tt>java:comp/env/</tt> plus the <tt>res-ref-name</tt> used in
-<tt>web.xml</tt> (above).</p>
+<p><fmt:message key="dbwizard.usage.usingInCode" /></p>
 
 <pre>
 protected void doGet(HttpServletRequest request, HttpServletResponse response) {

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/help.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/help.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/help.jsp Sun Jan 13 23:16:30 2008
@@ -14,4 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-This portlet views the log file for Geronimo's internal database, Derby.
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
+<fmt:message key="derbylogmanager.help.title" /> 
+

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp Sun Jan 13 23:16:30 2008
@@ -17,10 +17,12 @@
 <%@ 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="systemdatabase"/>
 
 <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="derbylogmanager.view.refresh"/></button>
             <br/>
             <br/>
         </td>
@@ -28,15 +30,15 @@
     <tr>
         <td class="Smaller" valign="middle">
             <form action="<portlet:renderURL/>" name="<portlet:namespace/>searchForm" >
-                <b>Filter Criteria:</b>
+                <b><fmt:message key="derbylogmanager.view.filterResults"/>:</b>
                 <input type="hidden" value="search" name="action"/>
                 <br/>
-                Lines <input type="text" name="startPos" value="${startPos}" size="3"/>
-                to <input type="text" name="endPos" value="${endPos}" size="3"/>
-                Max Results <input type="text" name="maxRows" value="${maxRows}" size="3"/>
-                Containing text <input type="text" name="searchString" value="${searchString}"/>
+                <fmt:message key="derbylogmanager.view.Lines"/> <input type="text" name="startPos" value="${startPos}" size="3"/>
+                <fmt:message key="derbylogmanager.view.to"/> <input type="text" name="endPos" value="${endPos}" size="3"/>
+                <fmt:message key="derbylogmanager.view.maxResults"/> <input type="text" name="maxRows" value="${maxRows}" size="3"/>
+                <fmt:message key="derbylogmanager.view.containingText"/> <input type="text" name="searchString" value="${searchString}"/>
                 <br/>
-                <input type="submit" value="Filter Log"/>
+                <input type="submit" value="<fmt:message key="derbylogmanager.view.filterLog"/>"/>
             </form>
         </td>
     </tr>
@@ -47,10 +49,14 @@
                     <table>
                         <tr>
                             <td class="Smaller">
-                                <b>${lineCount} total message(s) in log file. ${fn:length(searchResults)} matched your criteria
-                                   <c:if test="${!empty capped}">
-                                       (number of results capped)
-                                   </c:if>.
+                                <b>
+                                    <fmt:message key="derbylogmanager.view.matchCriterial" >
+                                        <fmt:param   value="${lineCount}" />
+                                        <fmt:param   value="${fn:length(searchResults)}" />
+                                    </fmt:message>
+                                    <c:if test="${!empty capped}">
+                                       <fmt:message key="derbylogmanager.view.numberOfResultsCapped"/>
+                                    </c:if>.
                                 </b>
                             </td>
                         </tr>
@@ -65,7 +71,7 @@
                     </table>
                 </c:when>
                 <c:otherwise>
-                    No entries found with the specified criteria.
+                    <fmt:message key="derbylogmanager.view.noEntries"/>
                 </c:otherwise>
             </c:choose>
         </td>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/dbViewerHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/dbViewerHelp.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/dbViewerHelp.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/dbViewerHelp.jsp Sun Jan 13 23:16:30 2008
@@ -14,4 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-Displays all the available databases and their tables and displays the contents of the tables. From the main window, to view the tables in a database, click on the database link. This will show all the tables in the database. To view the contents of the tables, click on the "View Contents" link. At the bottom of the DB Viewer window pane there will be links to take the user back to other views, e.g., "View Databases" and/or "View Tables."
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
+<fmt:message key="internaldb.dbViewerHelp.content"/>
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBHelp.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBHelp.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBHelp.jsp Sun Jan 13 23:16:30 2008
@@ -14,4 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-This page provides information about the internal database, such as, the product name, the version of the database, the supported functions and the supported SQL commands, among other things. Scroll to the botton to see all the information.
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
+<fmt:message key="internaldb.internalDBHelp.content"/>
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBNormal.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBNormal.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBNormal.jsp Sun Jan 13 23:16:30 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="systemdatabase"/>
 <portlet:defineObjects/>
 
 <%--
@@ -49,46 +51,46 @@
 
 <table width="100%">
   <tr> 
-    <td class="DarkBackground" width="100%" colspan="2" align="center">DB</td> 
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="internaldb.common.DB"/></td> 
   </tr> 
   <tr> 
   <tr> 
-    <td class="LightBackground" width="20%" nowrap>DB Product Name</td> 
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.DBProductName"/></td> 
     <td class="LightBackground" width="80%">${internalDB['DB Product Name']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">DB Product Version</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.DBProductVersion"/></td> 
     <td class="MediumBackground">${internalDB['DB Product Version']}</td> 
   </tr> 
   <tr> 
-    <td class="LightBackground">DB Major Version</td> 
+    <td class="LightBackground"><fmt:message key="internaldb.common.DBMajorVersion" /></td> 
     <td class="LightBackground">${internalDB['DB Major Version']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">DB Minor Version</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.DBMinorVersion"/></td> 
     <td class="MediumBackground">${internalDB['DB Minor Version']}</td> 
   </tr> 
 </table>
 <br>
 <table width="100%">
   <tr> 
-    <td class="DarkBackground" width="100%" colspan="2" align="center">Driver</td> 
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="internaldb.common.driver"/></td> 
   </tr> 
   <tr> 
   <tr> 
-    <td class="LightBackground" width="20%" nowrap>Driver Name</td> 
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.driverName"/></td> 
     <td class="LightBackground" width="80%">${internalDB['Driver Name']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">Driver Version</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.driverVersion"/></td> 
     <td class="MediumBackground">${internalDB['Driver Version']}</td> 
   </tr> 
   <tr> 
-    <td class="LightBackground">Driver Major Version</td> 
+    <td class="LightBackground"><fmt:message key="internaldb.common.driverMajorVersion"/></td> 
     <td class="LightBackground">${internalDB['Driver Major Version']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">Driver Minor Version</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.driverMinorVersion"/></td> 
     <td class="MediumBackground">${internalDB['Driver Minor Version']}</td> 
   </tr> 
 </table>
@@ -99,52 +101,52 @@
   </tr> 
   <tr> 
   <tr> 
-    <td class="LightBackground" width="20%" nowrap>JDBC Major Version</td> 
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.JDBCMajorVersion"/></td> 
     <td class="LightBackground" width="80%">${internalDB['JDBC Major Version']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">JDBC Minor Version</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.JDBCMinorVersion"/></td> 
     <td class="MediumBackground">${internalDB['JDBC Minor Version']}</td> 
   </tr> 
 </table>
 <br>
 <table width="100%">
   <tr> 
-    <td class="DarkBackground" width="100%" colspan="2" align="center">Etc</td> 
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="internaldb.common.etc"/></td> 
   </tr> 
   <tr> 
     <td class="LightBackground" width="20%" nowrap>URL</td> 
     <td class="LightBackground" width="80%">${internalDB['URL']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">Username</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.userName"/></td> 
     <td class="MediumBackground">${internalDB['Username']}</td> 
   </tr> 
   <tr> 
-    <td class="LightBackground">Read Only</td> 
+    <td class="LightBackground"><fmt:message key="internaldb.common.readOnly"/></td> 
     <td class="LightBackground">${internalDB['Read Only']}</td> 
   </tr> 
 </table>
 <br>
 <table width="100%">
   <tr> 
-    <td class="DarkBackground" width="100%" colspan="2" align="center">Functions</td> 
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="internaldb.common.functions"/></td> 
   </tr> 
   <tr> 
   <tr> 
-    <td class="LightBackground" width="20%" nowrap>Numeric Functions</td> 
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.numericFunctions"/></td> 
     <td class="LightBackground" width="80%">${internalDB['Numeric Functions']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">String Functions</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.stringFunctions"/></td> 
     <td class="MediumBackground">${internalDB['String Functions']}</td> 
   </tr> 
   <tr> 
-    <td class="LightBackground">System Functions</td> 
+    <td class="LightBackground"><fmt:message key="internaldb.common.systemFunctions"/></td> 
     <td class="LightBackground">${internalDB['System Functions']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">Time Date Functions</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.timeDateFunctions"/></td> 
     <td class="MediumBackground">${internalDB['Time Date Functions']}</td> 
   </tr> 
 </table>
@@ -155,31 +157,31 @@
   </tr> 
   <tr> 
   <tr> 
-    <td class="LightBackground" width="20%" nowrap>Supported SQL Keywords</td> 
+    <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.supportedSQLKeywords"/></td> 
     <td class="LightBackground" width="80%">${internalDB['Supported SQL Keywords']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">Supported Types</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.supportedTypes"/></td> 
     <td class="MediumBackground">${internalDB['Supported Types']}</td> 
   </tr> 
   <tr> 
-    <td class="LightBackground">Table Types</td> 
+    <td class="LightBackground"><fmt:message key="internaldb.common.tableTypes"/></td> 
     <td class="LightBackground">${internalDB['Table Types']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">Schemas</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.schemas"/></td> 
     <td class="MediumBackground">${internalDB['Schemas']}</td> 
   </tr> 
   <tr> 
-    <td class="LightBackground">SQL State Type</td> 
+    <td class="LightBackground"><fmt:message key="internaldb.common.SQLStateType"/></td> 
     <td class="LightBackground">${internalDB['SQL State Type']}</td> 
   </tr> 
   <tr> 
-    <td class="MediumBackground">Default Transaction Isolation</td> 
+    <td class="MediumBackground"><fmt:message key="internaldb.common.defaultTransactionIsolation"/></td> 
     <td class="MediumBackground">${internalDB['Default Transaction Isolation']}</td> 
   </tr> 
   <tr> 
-    <td class="LightBackground">Result Set Holdability</td> 
+    <td class="LightBackground"><fmt:message key="internaldb.common.resultSetHoldability"/></td> 
     <td class="LightBackground">${internalDB['Result Set Holdability']}</td> 
   </tr> 
 </table>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabases.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabases.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabases.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabases.jsp Sun Jan 13 23:16:30 2008
@@ -17,19 +17,21 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
 <portlet:defineObjects/>
 
-<center><b>Database List</b></center>
+<center><b><fmt:message key="internaldb.listDatabases.title"/></b></center>
 <table width="100%">
   <tr>
-    <td class="DarkBackground" colspan="1" align="center">Databases</td>
-    <td class="DarkBackground" colspan="2" align="center">View Tables</td>
+    <td class="DarkBackground" colspan="1" align="center"><fmt:message key="internaldb.common.databases"/></td>
+    <td class="DarkBackground" colspan="2" align="center"><fmt:message key="internaldb.common.viewTables"/></td>
   </tr>
   <%-- Check if there are databases to display  --%>
   <c:choose>
     <c:when test="${fn:length(databases) == 0}">
       <tr>
-        <td class="LightBackground" colspan="3" align="center">*** No databases ***</td>
+        <td class="LightBackground" colspan="3" align="center">*** <fmt:message key="internaldb.listDatabases.nodatabases"/> ***</td>
       </tr>
     </c:when>
     <c:otherwise>
@@ -50,14 +52,14 @@
                      <portlet:param name="action" value="listTables" />
                      <portlet:param name="db" value="${db}" />
                      <portlet:param name="viewTables" value="application" />
-                   </portlet:actionURL>">Application</a>
+                   </portlet:actionURL>"><fmt:message key="internaldb.common.application"/></a>
         </td>
         <td class="<c:out value='${tdClass}' />" align="center">
           <a href="<portlet:actionURL portletMode="view">
                      <portlet:param name="action" value="listTables" />
                      <portlet:param name="db" value="${db}" />
                      <portlet:param name="viewTables" value="system" />
-                   </portlet:actionURL>">System</a>
+                   </portlet:actionURL>"><fmt:message key="internaldb.common.system"/></a>
         </td>
       </tr>
       </c:forEach>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/listTables.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/listTables.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/listTables.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/listTables.jsp Sun Jan 13 23:16:30 2008
@@ -17,6 +17,8 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
 <portlet:defineObjects/>
 
 <%-- TODO: Check if datasource is created --%>
@@ -52,16 +54,16 @@
   </sql:query>
 </sql:transaction>
 
-<center><b>DB: <c:out value="${db}" /></b></center>
+<center><b><fmt:message key="internaldb.common.DB"/>: <c:out value="${db}" /></b></center>
 <table width="100%">
   <tr>
-    <td class="DarkBackground" colspan="3" align="center">Tables</td>
+    <td class="DarkBackground" colspan="3" align="center"><fmt:message key="internaldb.common.tables"/></td>
   </tr>
   <%-- Check if there are tables to display  --%>
   <c:choose>
     <c:when test="${tables.rowCount == 0}">
       <tr>
-        <td class="LightBackground" colspan="2" align="center">*** No tables ***</td>
+        <td class="LightBackground" colspan="2" align="center">*** <fmt:message key="internaldb.listTables.noTables"/> ***</td>
       </tr>
     </c:when>
     <c:otherwise>
@@ -86,7 +88,7 @@
                          <portlet:param name="db" value="${db}" />
                          <portlet:param name="tbl" value="${row[0]}.${row[1]}" />
                          <portlet:param name="viewTables" value="${viewTables}" />
-                       </portlet:actionURL>">View Contents</a>
+                       </portlet:actionURL>"><fmt:message key="internaldb.common.viewContents"/></a>
             </td>
       </tr>
       </c:forEach>
@@ -97,5 +99,5 @@
 <br>
 <a href="<portlet:actionURL portletMode="view">
            <portlet:param name="action" value="listDatabases" />
-         </portlet:actionURL>">View Databases
+         </portlet:actionURL>"><fmt:message key="internaldb.common.viewDatabases"/>
 </a>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLHelp.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLHelp.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLHelp.jsp Sun Jan 13 23:16:30 2008
@@ -14,29 +14,28 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
- <p>Allows the user to run SQL commands to manipulate the data in the 
-  tables, create a new database or delete a database. The user can 
-  enter the SQL commands in the &quot;SQL Command(s)&quot; text box and click 
-  on &quot;Run SQL.&quot;<br>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
+<p><fmt:message key="internaldb.runSQLHelp.summary"/><br>
   </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">Create DB: / <br>      
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="internaldb.common.createDB"/>: / <br>      
       <img src="/console/images/create.gif" alt="Create"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Enter the name of the new database to be created, then click on the &quot;Create&quot; button.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.createDBExp"/></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Delete DB: / <br>      
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="internaldb.common.deleteDB"/>: / <br>      
       <img src="/console/images/delete.gif" alt="Delete"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Delete an existing database, by selecting it from the pull-down menu and then clicking on &quot;Delete.&quot;</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.deleteDBExp"/></td>
   </tr>
   <tr>
-    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Use DB:</td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Select a database to update from the pull-down menu.</td>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="internaldb.common.useDB"/>:</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.useDBExp"/></td>
   </tr>
   <tr>
     <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">
       <img src="/console/images/run_sql.gif" alt="Run SQL"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Enter the SQL commands, separated by semicolons, in the&quot;SQL Command/s&quot; text box. To run the SQL command(s), click on the &quot;Run SQL&quot; button.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.runSQLExp"/></td>
   </tr>
 </table>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp Sun Jan 13 23:16:30 2008
@@ -18,6 +18,8 @@
 <%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -36,23 +38,23 @@
 
 <table width="100%"  border="0">
   <tr>
-    <td><div align="right">Create DB:</div></td>
+    <td><div align="right"><fmt:message key="internaldb.common.createDB"/>:</div></td>
     <td><input name="createDB" type="text" size="30">&nbsp;
-      <input type="submit" name="action" value="Create" onClick="return <portlet:namespace/>validateForm();"></td>
+      <input type="submit" name="action" value='<fmt:message key="internaldb.common.create"/>' onClick="return <portlet:namespace/>validateForm();"></td>
     </tr>
   <tr>
-    <td><div align="right">Delete DB:</div></td>
+    <td><div align="right"><fmt:message key="internaldb.common.deleteDB"/>:</div></td>
     <td>
       <select name="deleteDB">
       <c:forEach var="db" items="${databases}" varStatus="status">
         <option value="${db}">${db}</option>
       </c:forEach>
       </select>&nbsp;
-      <input type="submit" name="action" value="Delete" onClick="javascript:return confirm('Are you sure you want to delete this database?')">
+      <input type="submit" name="action" value='<fmt:message key="internaldb.common.delete"/>' onClick="javascript:return confirm('<fmt:message key="internaldb.runSQLNormal.reallyDeleteDatabase"/>')">
     </td>
   </tr>
   <tr>
-    <td><div align="right">Use DB:</div></td>
+    <td><div align="right"><fmt:message key="internaldb.common.useDB"/>:</div></td>
     <td>
       <select name="useDB">
       <c:forEach var="db" items="${databases}" varStatus="status">
@@ -63,7 +65,7 @@
   </tr>
   <tr>
     <td></td>
-    <td><div align="left">SQL Command/s:</td>
+    <td><div align="left"><fmt:message key="internaldb.common.SQLCommands"/>:</td>
   </tr>
   <tr>
     <td></td>
@@ -73,7 +75,7 @@
 
 <%-- Display action result --%>
 <c:if test="${!empty actionResult}">
-  Result:
+  <fmt:message key="internaldb.common.result"/>:
   <hr>
   <c:out value="${actionResult}" />
   <hr>
@@ -82,19 +84,19 @@
 <table width="100%"  border="0">
   <tr>
     <td></td>
-    <td>Note:</td>
+    <td><fmt:message key="internaldb.common.note"/>:</td>
   </tr>
   <tr>
     <td></td>
-    <td>1) Use ';' to separate multiple statements</td>
+    <td><fmt:message key="internaldb.runSQLNormal.note1"/></td>
   </tr>
   <tr>
     <td></td>
-    <td>2) Query results will be displayed for single 'Select' statement</td>
+    <td><fmt:message key="internaldb.runSQLNormal.note2"/></td>
   </tr>
   <tr>
     <td></td>
-    <td>3) Use single quotes to encapsulate literal strings</td>
+    <td><fmt:message key="internaldb.runSQLNormal.note3"/></td>
   </tr>
 </table>
 <br>
@@ -120,7 +122,7 @@
   </sql:query>
 </sql:transaction>
 
-<center><b>Query Result</b></center>
+<center><b><fmt:message key="internaldb.common.queryResult"/></b></center>
 <table width="100%">
   <tr>
   <%-- Get the column names for the header of the table --%>
@@ -133,7 +135,7 @@
   <c:choose>
     <c:when test="${table.rowCount == 0}">
       <tr>
-        <td class="LightBackground" colspan="<c:out value='${fn:length(table.columnNames)}' />" align="center">*** Empty ***</td>
+        <td class="LightBackground" colspan="<c:out value='${fn:length(table.columnNames)}' />" align="center">*** <fmt:message key="internaldb.common.empty"/> ***</td>
       </tr>
     </c:when>
     <c:otherwise>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp Sun Jan 13 23:16:30 2008
@@ -18,6 +18,8 @@
 <%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="systemdatabase"/>
 <portlet:defineObjects/>
 
 <%-- TODO: Check if datasource is created --%>
@@ -40,7 +42,7 @@
   </sql:query>
 </sql:transaction>
 
-<center><b>DB: <c:out value="${db}" />&nbsp;&nbsp;&nbsp;Table: <c:out value="${tbl}" /></b></center>
+<center><b><fmt:message key="internaldb.common.DB"/>: <c:out value="${db}" />&nbsp;&nbsp;&nbsp;<fmt:message key="internaldb.common.table"/>: <c:out value="${tbl}" /></b></center>
 <table width="100%">
   <tr>
   <%-- Get the column names for the header of the table --%>
@@ -53,7 +55,7 @@
   <c:choose>
     <c:when test="${table.rowCount == 0}">
       <tr>
-        <td class="LightBackground" colspan="<c:out value='${fn:length(table.columnNames)}' />" align="center">*** Empty ***</td>
+        <td class="LightBackground" colspan="<c:out value='${fn:length(table.columnNames)}' />" align="center">*** <fmt:message key="internaldb.common.empty"/> ***</td>
       </tr>
     </c:when>
     <c:otherwise>
@@ -84,10 +86,10 @@
            <portlet:param name="action" value="listTables" />
            <portlet:param name="db" value="${db}" />
            <portlet:param name="viewTables" value="${viewTables}" />
-         </portlet:actionURL>">View Tables
+         </portlet:actionURL>"><fmt:message key="internaldb.common.viewTables"/>
 </a>
 &nbsp;&nbsp;|&nbsp;&nbsp;
 <a href="<portlet:actionURL portletMode="view">
            <portlet:param name="action" value="listDatabases" />
-         </portlet:actionURL>">View Databases
+         </portlet:actionURL>"><fmt:message key="internaldb.common.viewDatabases"/>
 </a>



Mime
View raw message