geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r742700 [3/3] - in /geronimo/server/branches/2.1/plugins: activemq/activemq-portlets/src/main/resources/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/ console/console-base-portlets/src/main/resources/ console/console-ba...
Date Mon, 09 Feb 2009 19:43:17 GMT
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp
Mon Feb  9 19:43:14 2009
@@ -42,7 +42,7 @@
   <fmt:message key="car.list.noPlugins" />
   <p>
   <form method="POST">
-    <input type="submit" value="Cancel" onclick="history.go(-1); return false;" />
+    <input type="submit" value='<fmt:message key="consolebase.common.cancel" />'
onclick="history.go(-1); return false;" />
   </form>
 </c:when>
 <c:otherwise>
@@ -61,7 +61,7 @@
 	                                   <portlet:param name="repo-pass" value="${repopass}"/>
 	                                   <portlet:param name="column" value="${column}"/>
 	                                   <portlet:param name="mode" value="index-after"/>
-	                                  </portlet:actionURL>'>${column}</a></th>
+	                                  </portlet:actionURL>'><fmt:message key="car.common.list${column}"
/></a></th>
   </c:forEach>
 </tr>
 <c:forEach var="plugin" items="${plugins}" varStatus="status">
@@ -89,8 +89,8 @@
 </c:forEach>
 </table>
     <p>
-    <input type="submit" value="Install" onclick="if(!checkAllVal('plugin')){return false;}else
return true;"/>
-    <input type="submit" value="Cancel" onclick="history.go(-1); return false;" />
+    <input type="submit" value='<fmt:message key="consolebase.common.install" />'
onclick="if(!checkAllVal('plugin')){return false;}else return true;"/>
+    <input type="submit" value='<fmt:message key="consolebase.common.cancel" />'
onclick="history.go(-1); return false;" />
 </form>
 </c:otherwise>
 </c:choose>

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
Mon Feb  9 19:43:14 2009
@@ -54,8 +54,8 @@
         <th align="right" valign="top"><fmt:message key="car.viewForDownload.license"
/>:</th>
         <td>${license.value}&nbsp;
           <c:choose>
-              <c:when test="${license.osiApproved}">(Open Source)</c:when>
-              <c:otherwise>(Proprietary)</c:otherwise>
+              <c:when test="${license.osiApproved}">(<fmt:message key="car.common.openSource"
/>)</c:when>
+              <c:otherwise>(<fmt:message key="car.common.proprietary" />)</c:otherwise>
           </c:choose>
         </td>
       </tr>

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
Mon Feb  9 19:43:14 2009
@@ -95,7 +95,7 @@
     </script>
     <c:forEach var="option" items="${realm.optionNames}">
       <tr>
-        <th style="min-width: 140px"><div align="right">${optionMap[option].displayName}:</div></th>
+        <th style="min-width: 140px"><div align="right"><fmt:message key="${optionMap[option].displayName}"/>:</div></th>
         <td><input name="option-${option}"
                    type="<c:choose><c:when test="${optionMap[option].password}">password</c:when><c:otherwise>text</c:otherwise></c:choose>"
                    size="${optionMap[option].length}" value="${realm.options[option]}"></td>
@@ -112,7 +112,7 @@
     </c:if>
       <tr>
         <td></td>
-        <td>${optionMap[option].description}</td>
+        <td><fmt:message key="${optionMap[option].description}"/></td>
       </tr>
       <c:if test="${!optionMap[option].blankAllowed}">
         <script language="JavaScript">

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp
Mon Feb  9 19:43:14 2009
@@ -128,10 +128,10 @@
         <th><div align="right"><fmt:message key="realmwizard.common.controlFlag"
/>:</div></th>
         <td>
           <select name="module-control-${status.index}">
-            <option value="OPTIONAL"<c:if test="${module.controlFlag eq 'OPTIONAL'}">
selected</c:if>>Optional</option>
-            <option value="REQUIRED"<c:if test="${module.controlFlag eq 'REQUIRED'}">
selected</c:if>>Required</option>
-            <option value="REQUISITE"<c:if test="${module.controlFlag eq 'REQUISITE'}">
selected</c:if>>Requisite</option>
-            <option value="SUFFICIENT"<c:if test="${module.controlFlag eq 'SUFFICIENT'}">
selected</c:if>>Sufficient</option>
+            <option value="OPTIONAL"<c:if test="${module.controlFlag eq 'OPTIONAL'}">
selected</c:if>><fmt:message key="realmwizard.common.controlFlag.optional" /></option>
+            <option value="REQUIRED"<c:if test="${module.controlFlag eq 'REQUIRED'}">
selected</c:if>><fmt:message key="realmwizard.common.controlFlag.required" /></option>
+            <option value="REQUISITE"<c:if test="${module.controlFlag eq 'REQUISITE'}">
selected</c:if>><fmt:message key="realmwizard.common.controlFlag.requisite" /></option>
+            <option value="SUFFICIENT"<c:if test="${module.controlFlag eq 'SUFFICIENT'}">
selected</c:if>><fmt:message key="realmwizard.common.controlFlag.sufficient" /></option>
           </select>
         </td>
       </tr>
@@ -144,8 +144,8 @@
         <th><div align="right"><fmt:message key="realmwizard.common.supportAdvancedMapping"
/>:</div></th>
         <td>
           <select name="module-wrap-${status.index}">
-            <option value="true"<c:if test="${module.wrapPrincipals}"> selected</c:if>>Yes</option>
-            <option value="false"<c:if test="${!module.wrapPrincipals}"> selected</c:if>>No</option>
+            <option value="true"<c:if test="${module.wrapPrincipals}"> selected</c:if>><fmt:message
key="realmwizard.common.supportAdvancedMapping.yes" /></option>
+            <option value="false"<c:if test="${!module.wrapPrincipals}"> selected</c:if>><fmt:message
key="realmwizard.common.supportAdvancedMapping.no" /></option>
           </select>
         </td>
       </tr>

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp
Mon Feb  9 19:43:14 2009
@@ -28,10 +28,8 @@
 
 <p><b>WEB-INF/web.xml</b></p>
 
-<p>The <tt>web.xml</tt> should have</p>
 <fmt:message key="realmwizard.usage.webXmlShouldHave" />
 
-
 <pre>
 &lt;web-app xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
(original)
+++ geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
Mon Feb  9 19:43:14 2009
@@ -31,18 +31,42 @@
 
 jmxmanager.help.JMXTree           = JMX Tree
 jmxmanager.help.JMXTreeExp1       = <li>You can use this tree to view the different
types of MBeans</li> <li>Each MBean will be represented as a tree node that shows
its object name representation</li><li>'All MBeans' will give you a list of MBeans
grouped by its domain</li> <li>'J2EE MBeans' will give you a list of MBeans grouped
by JSR 77 MBean types:</li>
+jmxmanager.help.abstractName      = Abstract Name
+jmxmanager.help.attributes        = Attributes
 jmxmanager.help.attributesTab     = Attributes Tab
 jmxmanager.help.attributesTabExp  = <ul><li>Lists the MBean attributes</li>
<li>Column headers can be clicked to sort by column</li><li>Each table row
can be mark by clicking it for easier viewing</li><li>It's possible to set an
attribute's value by clicking the Setter button. Results will be displayed.</li> <li><b>Note:</b>
Be careful when setting an MBean's attribute value because it might affect how the server
runs.</li></ul>
+jmxmanager.help.className         = Class Name
+jmxmanager.help.domain            = Domain
 jmxmanager.help.geronimoMBeansExp = 'Geronimo MBeans' will give you a list of MBeans grouped
by Geronimo specific MBean types
+jmxmanager.help.getter            = Getter
+jmxmanager.help.info              = Info
 jmxmanager.help.infoTab           = Info Tab
 jmxmanager.help.infoTabExp        = Lists the MBean basic information
+jmxmanager.help.j2eeType          = J2EE Type
+jmxmanager.help.manageable        = Manageable
+jmxmanager.help.name              = Name
+jmxmanager.help.objectName        = Object Name
+jmxmanager.help.objectNamePattern = &nbsp;Object&nbsp;Name&nbsp;Pattern
+jmxmanager.help.operations        = Operations
 jmxmanager.help.operationsTab     = Operations Tab
 jmxmanager.help.operationsTabExp  = <ul>    <li>Lists the MBean operations</li><li>You
can execute an MBean operation by providing the different parameter values and clicking the
operation button. Results will be displayed.</li> <li><b>Note:</b>
Be careful when invoking an MBean's operation because it might affect how the server runs.</li></ul>
+jmxmanager.help.paramList         = Paremeter List
+jmxmanager.help.persistent        = Persistent
+jmxmanager.help.refreshStats      = Refresh Stats
+jmxmanager.help.search            = Search...
 jmxmanager.help.searchMBeansExp   = 'Search MBeans' will give you a list of MBeans matching
a pattern from the 'Search' tab
 jmxmanager.help.searchTab         = Search Tab
 jmxmanager.help.searchTabExp      = <ul> <li>You can use this tab to query MBeans
matching a particular pattern</li> <li>Matching MBeans will be added under the
'Search MBeans' tree node. You might need to scroll down the JMX tree to view results.</li>
 <li>Examples of Object Name Patterns:</li>   <ul> <li>"*:*" - will
return all the MBeans <li>"geronimo:*" - will return all MBeans with "geronimo" domain
 <li>"*:j2eeType=GBean,*" - will return all GBeans </ul> </ul>
+jmxmanager.help.setter            = Setter
+jmxmanager.help.stats             = Stats
 jmxmanager.help.statsTab          = Stats Tab
 jmxmanager.help.statsTabExp       = <ul><li>Lists the statistics provided by
a managed object. Statistics can be any of the following types:</li> <ul> <li>Count
Statistic - specifies standard count measurements <li>Time Statistic - specifies standard
timing measurements for a given operation <li>Boundary Statistic - specifies standard
measurements of the upper and lower limits of the value of an attribute <li>Range Statistic
- specifies standard measurements of the lowest and highest values an attribute has held as
well as its current value <li>Bounded Range Statistic - provides standard measurements
of a range that has fixed limits  </ul></ul>
+jmxmanager.help.type              = Type
+jmxmanager.help.value             = Value
+jmxmanager.help.viewAttributes    = View Attributes
+jmxmanager.help.viewInfo          = View Info
+jmxmanager.help.viewOperations    = View Operations
+jmxmanager.help.viewStats         = View Stats
 
 jndiview.help.content            = This view can be used to view JNDI context for various
modules.
 jndiview.help.title              = This is the help for the Geronimo Administration JNDI
VIEW page.
@@ -57,20 +81,27 @@
 ldapmanager.viewLDAPServer.DN             = DN
 ldapmanager.viewLDAPServer.SSL            = SSL
 ldapmanager.viewLDAPServer.anonymousBind  = Anonymous Bind
+ldapmanager.viewLDAPServer.attributes     = Attributes
+ldapmanager.viewLDAPServer.attributesTitle = LDAP Entry Attributes
 ldapmanager.viewLDAPServer.baseDN         = Base DN
 ldapmanager.viewLDAPServer.clearResult    = Clear Result
+ldapmanager.viewLDAPServer.connInfo       = Connect Info
 ldapmanager.viewLDAPServer.connect        = Connect
+ldapmanager.viewLDAPServer.connectionError = \\n** Make sure LDAP server is running and/or
connection properties are correct.
 ldapmanager.viewLDAPServer.filter         = Filter
 ldapmanager.viewLDAPServer.host           = Host
 ldapmanager.viewLDAPServer.name           = Name
 ldapmanager.viewLDAPServer.oneLevel       = One level
 ldapmanager.viewLDAPServer.password       = Password
 ldapmanager.viewLDAPServer.port           = Port
+ldapmanager.viewLDAPServer.refresh        = Refresh
 ldapmanager.viewLDAPServer.restoreDefault = Restore Default
 ldapmanager.viewLDAPServer.search         = Search
 ldapmanager.viewLDAPServer.searchDN       = Search DN
 ldapmanager.viewLDAPServer.searchScope    = Search scope
+ldapmanager.viewLDAPServer.selectTree     = Please select a tree node.
 ldapmanager.viewLDAPServer.subTreeLevel   = Sub-tree level
 ldapmanager.viewLDAPServer.userDN         = User DN
 ldapmanager.viewLDAPServer.value          = Value
 ldapmanager.viewLDAPServer.version        = Version
+ldapmanager.viewLDAPServer.viewEntry      = View Entry

Modified: geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/help.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/help.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/help.jsp
Mon Feb  9 19:43:14 2009
@@ -130,11 +130,11 @@
 <ul>
     <li><fmt:message key="jmxmanager.help.infoTabExp"/>:</li>
     <ul>
-        <li>Abstract Name
-        <li>Object Name
-        <li>Class Name
-        <li>Domain
-        <li>J2EE Type
+        <li><fmt:message key="jmxmanager.help.abstractName"/>
+        <li><fmt:message key="jmxmanager.help.objectName"/>
+        <li><fmt:message key="jmxmanager.help.className"/>
+        <li><fmt:message key="jmxmanager.help.domain"/>
+        <li><fmt:message key="jmxmanager.help.j2eeType"/>
     </ul>
 </ul>
 

Modified: geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
Mon Feb  9 19:43:14 2009
@@ -18,7 +18,9 @@
 <%@ 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"%>
 <%@ page import="org.apache.geronimo.console.jmxmanager.JMXManagerHelper" %>
+<fmt:setBundle basename="debugviews"/>
 <portlet:defineObjects/>
 
     <script type="text/javascript" src="/dojo/0.4/dojo.js"></script>
@@ -794,11 +796,11 @@
 
 <div dojoType="TreeContextMenu" toggle="explode" contextMenuForWindow="false" widgetId="treeContextMenu">
     <!-- <div dojoType="TreeMenuItem" treeActions="refreshNode" widgetId="treeContextMenuRefresh"
caption="Refresh"></div> -->
-    <div dojoType="TreeMenuItem" treeActions="searchNode" widgetId="treeContextMenuSearch"
caption="Search..."></div>
-    <div dojoType="TreeMenuItem" treeActions="view" widgetId="treeContextMenuViewAttribs"
caption="View Attributes"></div>
-    <div dojoType="TreeMenuItem" treeActions="view" widgetId="treeContextMenuViewOps"
caption="View Operations"></div>
-    <div dojoType="TreeMenuItem" treeActions="view" widgetId="treeContextMenuViewInfo"
caption="View Info"></div>
-    <div dojoType="TreeMenuItem" treeActions="view" widgetId="treeContextMenuViewStats"
caption="View Stats"></div>
+    <div dojoType="TreeMenuItem" treeActions="searchNode" widgetId="treeContextMenuSearch"
caption="<fmt:message key="jmxmanager.help.search"/>..."></div>
+    <div dojoType="TreeMenuItem" treeActions="view" widgetId="treeContextMenuViewAttribs"
caption="<fmt:message key="jmxmanager.help.viewAttributes"/>"></div>
+    <div dojoType="TreeMenuItem" treeActions="view" widgetId="treeContextMenuViewOps"
caption="<fmt:message key="jmxmanager.help.viewOperations"/>"></div>
+    <div dojoType="TreeMenuItem" treeActions="view" widgetId="treeContextMenuViewInfo"
caption="<fmt:message key="jmxmanager.help.viewInfo"/>"></div>
+    <div dojoType="TreeMenuItem" treeActions="view" widgetId="treeContextMenuViewStats"
caption="<fmt:message key="jmxmanager.help.viewStats"/>"></div>
 </div>
 
 <div dojoType="TreeSelector" widgetId="treeSelector"></div>
@@ -951,7 +953,7 @@
             sizeShare="60">
             
             <!-- Attributes tab -->
-            <div id="attributesTab" dojoType="ContentPane" title="MBean Attributes" label="Attributes"
style="overflow: auto">
+            <div id="attributesTab" dojoType="ContentPane" title="MBean Attributes" label="<fmt:message
key="jmxmanager.help.attributes"/>" style="overflow: auto">
                 <br>
                 <table dojoType="SortableTable" 
                     widgetId="attribsTable" 
@@ -965,13 +967,13 @@
                     width="100%">
                     <thead>
                         <tr>
-                            <th field="Name" dataType="String" width="10%">&nbsp;Name&nbsp;</th>
-                            <th dataType="html" width="20%">&nbsp;Value&nbsp;</th>
-                            <th field="Type" dataType="String" width="10%">&nbsp;Type&nbsp;</th>
-                            <th field="Getter" dataType="String" width="10%">&nbsp;Getter&nbsp;</th>
-                            <th dataType="html" width="10%">&nbsp;Setter&nbsp;</th>
-                            <th field="Manageable" dataType="String" width="10%" align="center">&nbsp;Manageable&nbsp;</th>
-                            <th field="Persistent" dataType="String" width="10%" align="center">&nbsp;Persistent&nbsp;</th>
+                            <th field="Name" dataType="String" width="10%">&nbsp;<fmt:message
key="jmxmanager.help.name"/>&nbsp;</th>
+                            <th dataType="html" width="20%">&nbsp;<fmt:message
key="jmxmanager.help.value"/>&nbsp;</th>
+                            <th field="Type" dataType="String" width="10%">&nbsp;<fmt:message
key="jmxmanager.help.type"/>&nbsp;</th>
+                            <th field="Getter" dataType="String" width="10%">&nbsp;<fmt:message
key="jmxmanager.help.getter"/>&nbsp;</th>
+                            <th dataType="html" width="10%">&nbsp;<fmt:message
key="jmxmanager.help.setter"/>&nbsp;</th>
+                            <th field="Manageable" dataType="String" width="10%" align="center">&nbsp;<fmt:message
key="jmxmanager.help.manageable"/>&nbsp;</th>
+                            <th field="Persistent" dataType="String" width="10%" align="center">&nbsp;<fmt:message
key="jmxmanager.help.persistent"/>&nbsp;</th>
                             <!--
                             <th field="Readable" dataType="String" width="10%">&nbsp;Readable&nbsp;</th>
                             <th field="Writable" dataType="String" width="10%">&nbsp;Writable&nbsp;</th>
@@ -984,7 +986,7 @@
             </div> <!-- Attributes tab -->
 
             <!-- Operations tab -->
-            <div id="operationsTab" dojoType="ContentPane" title="MBean Operations" label="Operations"
style="overflow: auto">
+            <div id="operationsTab" dojoType="ContentPane" title="MBean Operations" label="<fmt:message
key="jmxmanager.help.operations"/>" style="overflow: auto">
                 <br>
                 <table width="100%">
                     <tr>
@@ -992,8 +994,8 @@
                         <td class="DarkBackground" align="center" width="30%">Name</td>
                         <td class="DarkBackground" align="center" width="70%">Paremeter
List</td>
                         -->
-                        <th style="background: #2581C7; color: #FFFFFF; font-weight: bold;"
align="center" width="30%">Name</td>
-                        <th style="background: #2581C7; color: #FFFFFF; font-weight: bold;"
align="center" width="70%">Paremeter List</td>
+                        <th style="background: #2581C7; color: #FFFFFF; font-weight: bold;"
align="center" width="30%"><fmt:message key="jmxmanager.help.name"/></td>
+                        <th style="background: #2581C7; color: #FFFFFF; font-weight: bold;"
align="center" width="70%"><fmt:message key="jmxmanager.help.paramList"/></td>
                     </tr>
                     <tbody id="operationsTableBody">
                     </tbody>
@@ -1001,7 +1003,7 @@
             </div> <!-- Operations tab -->
 
             <!-- Info tab -->
-            <div id="infoTab" dojoType="ContentPane" title="MBean Info" label="Info" style="overflow:
auto">
+            <div id="infoTab" dojoType="ContentPane" title="MBean Info" label="<fmt:message
key="jmxmanager.help.info"/>" style="overflow: auto">
                 <br>
                 <table width="100%">
                     <tr>
@@ -1009,8 +1011,8 @@
                         <td class="DarkBackground" align="center" width="30%">Name</td>
                         <td class="DarkBackground" align="center" width="70%">Value</td>
                         -->
-                        <th style="background: #2581C7; color: #FFFFFF; font-weight: bold;"
align="center" width="30%">Name</td>
-                        <th style="background: #2581C7; color: #FFFFFF; font-weight: bold;"
align="center" width="70%">Value</td>
+                        <th style="background: #2581C7; color: #FFFFFF; font-weight: bold;"
align="center" width="30%"><fmt:message key="jmxmanager.help.name"/></td>
+                        <th style="background: #2581C7; color: #FFFFFF; font-weight: bold;"
align="center" width="70%"><fmt:message key="jmxmanager.help.value"/></td>
                     </tr>
                     <tbody id="basicInfoTableBody">
                     </tbody>
@@ -1018,7 +1020,7 @@
             </div> <!-- Info tab -->
 
             <!-- Stats tab -->
-            <div id="statsTab" dojoType="ContentPane" title="MBean Stats" label="Stats"
style="overflow: auto">
+            <div id="statsTab" dojoType="ContentPane" title="MBean Stats" label="<fmt:message
key="jmxmanager.help.stats"/>" style="overflow: auto">
                 <br>
                 <table dojoType="SortableTable" 
                     widgetId="statsTable" 
@@ -1032,25 +1034,25 @@
                     width="100%">
                     <thead>
                         <tr>
-                            <th field="Name" dataType="String" width="30%">&nbsp;Name&nbsp;</th>
-                            <th dataType="html" width="70%">&nbsp;Value&nbsp;</th>
+                            <th field="Name" dataType="String" width="30%">&nbsp;<fmt:message
key="jmxmanager.help.name"/>&nbsp;</th>
+                            <th dataType="html" width="70%">&nbsp;<fmt:message
key="jmxmanager.help.value"/>&nbsp;</th>
                         </tr>
                     </thead>
                     <tbody id="statsTableBody">
                     </tbody>
                 </table>
                 <br>
-                &nbsp;<input type='button' value='Refresh Stats' onclick='refreshStatsBtnClicked()'
/> 
+                &nbsp;<input type='button' value='<fmt:message key="jmxmanager.help.refreshStats"/>'
onclick='refreshStatsBtnClicked()' /> 
             </div> <!-- Stats tab -->
 
             <!-- Search tab -->
-            <div id="searchTab" dojoType="ContentPane" title="Search" label="Search" style="overflow:
auto">
+            <div id="searchTab" dojoType="ContentPane" title="Search" label='<fmt:message
key="jmxmanager.help.search"/>' style="overflow: auto">
                 <!-- JMXSearch Form -->
                 <form name="JMXSearchForm" onsubmit="return false;" method="POST">
                     <br>
                     <table>
                         <tr>
-                            <td width="15%">&nbsp;Object&nbsp;Name&nbsp;Pattern:</td>
+                            <td width="15%"><fmt:message key="jmxmanager.help.objectNamePattern"/></td>
                             <td width="70%">
                                 <select dojoType="combobox" id="jmxQuery" searchType="SUBSTRING"
style="width: 100%;">
                                     <!-- Domains -->
@@ -1142,7 +1144,7 @@
                                     <option>*:j2eeType=XmlReferenceBuilder,*</option>
                                 </select>                            
                             </td>
-                            <td width="15%"><input type="button" value="Search"
id="jmxSearch" onClick="searchBtnClicked()" style="width: 100%;" /></td>
+                            <td width="15%"><input type="button" value="<fmt:message
key="jmxmanager.help.search"/>" id="jmxSearch" onClick="searchBtnClicked()" style="width:
100%;" /></td>
                         </tr>
                     </table>
                 </form> <!-- JMXSearch Form -->

Modified: geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
Mon Feb  9 19:43:14 2009
@@ -116,7 +116,7 @@
             function (menuItem) {
                 var selectedNode = getSelectedNode();
                 if (selectedNode == null) {
-                    alert('Please select a tree node.');
+                    alert('<fmt:message key="ldapmanager.viewLDAPServer.selectTree" />');
                     return;
                 }
                 if ((selectedNode.state == 'UNCHECKED') && (selectedNode.isExpanded
== false)) {
@@ -143,7 +143,7 @@
             function (menuItem) {
                 var selectedNode = getSelectedNode();
                 if (selectedNode == null) {
-                    alert('Please select a tree node.');
+                    alert('<fmt:message key="ldapmanager.viewLDAPServer.selectTree" />');
                     return;
                 }
                 selectTab('searchTab');
@@ -158,7 +158,7 @@
             function (menuItem) {
                 var selectedNode = getSelectedNode();
                 if (selectedNode == null) {
-                    alert('Please select a tree node.');
+                    alert('<fmt:message key="ldapmanager.viewLDAPServer.selectTree" />');
                     return;
                 }
                 selectTab('attributesTab');
@@ -171,7 +171,7 @@
             function (menuItem) {
                 var selectedNode = getSelectedNode();
                 if (selectedNode == null) {
-                    alert('Please select a tree node.');
+                    alert('<fmt:message key="ldapmanager.viewLDAPServer.selectTree" />');
                     return;
                 }
                 selectTab('connectInfoTab');
@@ -263,7 +263,7 @@
                 window.location = '<portlet:actionURL />';
             } else {
                 // Display error
-                alert(result + '\n** Make sure LDAP server is running and/or connection properties
are correct.');
+                alert(result + '<fmt:message key="ldapmanager.viewLDAPServer.connectionError"
/>');
             }
         }
     );
@@ -319,7 +319,7 @@
 /* Generic error handler */
 DWREngine.setErrorHandler(
     function (errorString) {
-        alert('Error: ' + errorString + '\n** Make sure LDAP server is running and/or connection
properties are correct.');
+        alert('Error: ' + errorString + '<fmt:message key="ldapmanager.viewLDAPServer.connectionError"
/>');
         selectTab('connectInfoTab');
     }
 );
@@ -474,10 +474,10 @@
 </script>
 
 <div dojoType="TreeContextMenu" toggle="explode" contextMenuForWindow="false" widgetId="treeContextMenu">
-    <div dojoType="TreeMenuItem" treeActions="refreshNode" widgetId="treeContextMenuRefresh"
caption="Refresh" ></div>
-    <div dojoType="TreeMenuItem" treeActions="searchNode" widgetId="treeContextMenuSearch"
caption="Search..."></div>
-    <div dojoType="TreeMenuItem" treeActions="viewEntry" widgetId="treeContextMenuViewEntry"
caption="View Entry"></div>
-    <div dojoType="TreeMenuItem" treeActions="viewConnectInfo" widgetId="treeContextMenuConnectInfo"
caption="Connect Info"></div>
+    <div dojoType="TreeMenuItem" treeActions="refreshNode" widgetId="treeContextMenuRefresh"
caption="<fmt:message key="ldapmanager.viewLDAPServer.refresh"/>" ></div>
+    <div dojoType="TreeMenuItem" treeActions="searchNode" widgetId="treeContextMenuSearch"
caption="<fmt:message key="ldapmanager.viewLDAPServer.search"/>..."></div>
+    <div dojoType="TreeMenuItem" treeActions="viewEntry" widgetId="treeContextMenuViewEntry"
caption="<fmt:message key="ldapmanager.viewLDAPServer.viewEntry"/>"></div>
+    <div dojoType="TreeMenuItem" treeActions="viewConnectInfo" widgetId="treeContextMenuConnectInfo"
caption="<fmt:message key="ldapmanager.viewLDAPServer.connInfo"/>"></div>
 </div>
 
 <div dojoType="TreeSelector" widgetId="treeSelector"></div>
@@ -519,7 +519,7 @@
             sizeShare="60">
             
             <!-- Attributes tab -->
-            <div id="attributesTab" dojoType="ContentPane" title="LDAP Entry Attributes"
label="Attributes" style="overflow: auto">
+            <div id="attributesTab" dojoType="ContentPane" title="LDAP Entry Attributes"
label="<fmt:message key="ldapmanager.viewLDAPServer.attributes"/>" style="overflow:
auto">
                 <br>
                 <table width="100%">
                     <tr>
@@ -574,7 +574,7 @@
             </div> <!-- Search tab -->
 
             <!-- Connection Info tab -->
-            <div id="connectInfoTab" dojoType="ContentPane" title = "" label="Connect
Info" style="overflow: auto">
+            <div id="connectInfoTab" dojoType="ContentPane" title = "" label="<fmt:message
key="ldapmanager.viewLDAPServer.connInfo"/>" style="overflow: auto">
                 <br>
                 <form NAME="LDAPConnectForm" method="POST">
                     <table>

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties
(original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties
Mon Feb  9 19:43:14 2009
@@ -15,8 +15,6 @@
 #  limitations under the License.
 #=====================================================================
 
-bwizard.edit.poolName = Pool Name
-
 dbwizard.basicParams.driverConnectionProperties  = Driver Connection Properties
 dbwizard.basicParams.propertyExp                 = A property used to connect to {0}.  May
be optional (see JDBC driver documentation).
 dbwizard.basicParams.seeDocumentation            = See the documentation for your JDBC driver.
@@ -189,6 +187,7 @@
 internaldb.common.readOnly                    = Read Only
 internaldb.common.result                      = Result
 internaldb.common.resultSetHoldability        = Result Set Holdability
+internaldb.common.runSQL                      = Run SQL
 internaldb.common.schemas                     = Schemas
 internaldb.common.stringFunctions             = String Functions
 internaldb.common.supportedSQLKeywords        = Supported SQL Keywords

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp
Mon Feb  9 19:43:14 2009
@@ -145,4 +145,5 @@
 
 <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>
+            

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
Mon Feb  9 19:43:14 2009
@@ -73,7 +73,7 @@
         <option value="${db}"<c:if test="${useDB==db}"> selected="selected"</c:if>>${db}</option>
       </c:forEach>
       </select>&nbsp;
-      <input type="submit" value="Run SQL" onClick="return <portlet:namespace/>validateForm3();"></td>
+      <input type="submit" value='<fmt:message key="internaldb.common.runSQL"/>'
onClick="return <portlet:namespace/>validateForm3();"></td>
   </tr>
  </c:when>
  <c:otherwise>
@@ -85,7 +85,7 @@
         <option value="${dsName}"<c:if test="${useDB==dsName}"> selected="selected"</c:if>>${dsName}</option>
       </c:forEach>
       </select>&nbsp;
-      <input type="submit" value="Run SQL" onClick="return <portlet:namespace/>validateForm3();"></td>
+      <input type="submit" value='<fmt:message key="internaldb.common.runSQL"/>'
onClick="return <portlet:namespace/>validateForm3();"></td>
   </tr>
  </c:otherwise>
 </c:choose>



Mime
View raw message