You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/12/30 20:51:36 UTC

svn commit: r730224 [7/9] - 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...

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp Tue Dec 30 11:51:33 2008
@@ -16,9 +16,11 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <%@ page import="java.util.List" %>
 <%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
 <%@ page import="org.apache.geronimo.monitoring.console.data.Node" %>
+<fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 <%
     String message = (String) request.getAttribute("message"); 
@@ -35,13 +37,13 @@
        <td width="100%" align="left" valign="top">
 <table width="100%" style="border-style: solid;
 border-width: 1px;">
- <thead align="center"><strong>Servers</strong></thead>
+ <thead align="center"><strong><fmt:message key="monitor.common.server"/></strong></thead>
  <tr>
-  <th class="DarkBackground" width="30%">Name</th>
-  <th class="DarkBackground" width="10%">IP/Hostname</th>
-  <th class="DarkBackground" width="15%">Status</th>
-  <th class="DarkBackground" width="15%">Stat. Query</th>
-  <th class="DarkBackground" width="30%" colspan="3">Actions</th>
+  <th class="DarkBackground" width="30%"><fmt:message key="monitor.common.name"/></th>
+  <th class="DarkBackground" width="10%"><fmt:message key="monitor.common.ip"/>/<fmt:message key="monitor.common.hostname"/></th>
+  <th class="DarkBackground" width="15%"><fmt:message key="monitor.server.status"/></th>
+  <th class="DarkBackground" width="15%"><fmt:message key="monitor.server.statQuery"/></th>
+  <th class="DarkBackground" width="30%" colspan="3"><fmt:message key="monitor.common.action"/></th>
  </tr>
  <%
     List<Node> nodes = (List<Node>) request.getAttribute("nodes");
@@ -91,49 +93,49 @@
 }
 if (online) {     // online
 %>
-  <td class="${backgroundClass}" width="15%" align="center" bgcolor="#cccccc">Online</td>
+  <td class="${backgroundClass}" width="15%" align="center" bgcolor="#cccccc"><fmt:message key="monitor.server.online"/></td>
 <%
 } else if(node.isEnabled()){         // offline
 %>
-  <td class="${backgroundClass}" width="15%" align="center"><font color="red"><img border=0 src="/monitoring/images/help-b.png" alt="Offline">Offline</font></td>
+  <td class="${backgroundClass}" width="15%" align="center"><font color="red"><img border=0 src="/monitoring/images/help-b.png" alt="Offline"><fmt:message key="monitor.server.offline"/></font></td>
 <%
 } else {         // Disabled
      %>
-       <td class="${backgroundClass}" width="15%" align="center"><font color="red">Disabled</font></td>
+       <td class="${backgroundClass}" width="15%" align="center"><font color="red"><fmt:message key="monitor.server.disabled"/></font></td>
      <%
      }
 if (collecting == 0) {  // not collecting statistics
 %>
-    <td class="${backgroundClass}" width="15%" align="center"><font color="red">(stopped)</font></td>
+    <td class="${backgroundClass}" width="15%" align="center"><font color="red">(<fmt:message key="monitor.server.stopped"/>)</font></td>
 <%
     if(node.isEnabled()) {   // enable the links
 %>
-        <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="snapshotDuration" value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query">Enable Query</a></td>
+        <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="snapshotDuration" value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query"><fmt:message key="monitor.server.enableQuery"/></a></td>
 <%
     } else {        // do not provide links
 %>
-        <td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query">Enable Query</td>
+        <td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query"><fmt:message key="monitor.server.enableQuery"/></td>
 <%
     }
 %>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
 <%
 } 
 else if (collecting == -1) {  // not collecting statistics
     %>
-        <td class="${backgroundClass}" width="15%" align="center"><font color="red">Stopping...</font></td>
+        <td class="${backgroundClass}" width="15%" align="center"><font color="red"><fmt:message key="monitor.server.stopping"/></font></td>
     <%
         if(node.isEnabled()) {   // enable the links
     %>
-            <td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</td>
+            <td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.disableQuery"/></td>
     <%
         } else {        // do not provide links
     %>
-            <td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query">Enable Query</td>
+            <td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query"><fmt:message key="monitor.server.enableQuery"/></td>
     <%
         }
     %>
-      <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+      <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
     <%
     }
 else {            // collecting statistics
@@ -141,26 +143,26 @@
     {
 %>
   <td class="${backgroundClass}" width="15%" align="center"><%=snapshotDuration/1000/60+" min. (running)"%></td>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</a></td>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.disableQuery"/></a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
 <%
     }
     else
     {
         %>
-        <td class="${backgroundClass}" width="15%" align="center">Stopped</td>
-        <td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query">Disable Query</td>
-        <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+        <td class="${backgroundClass}" width="15%" align="center"><fmt:message key="monitor.server.stopped"/></td>
+        <td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.enableQuery"/></td>
+        <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
       <%        
     }
 }
 if(node.isEnabled()) {   // enabled server
 %>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable">Disable</a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable"><fmt:message key="monitor.server.disable"/></a></td>
 <%
 } else {        // disabled server
 %>
-  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable">Enable</a></td>
+  <td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable"><fmt:message key="monitor.server.enable"/></a></td>
 <%
 }
 %>
@@ -168,7 +170,7 @@
  <%}
 %>
 </table>
-<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Add Server">Add Server</a></div>
+<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Add Server"><fmt:message key="monitor.server.addServer"/></a></div>
         </td>
      
          <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -179,17 +181,17 @@
             <table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Navigation</font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.common.nav"/></font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
                         <ul>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>">Home</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>">Views</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>">Servers</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>">Graphs</a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>"><fmt:message key="monitor.common.home"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>"><fmt:message key="monitor.common.view"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>"><fmt:message key="monitor.common.server"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>"><fmt:message key="monitor.common.graph"/></a></li>
                         </ul>
                         &nbsp;<br />
                     </td>   

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp Tue Dec 30 11:51:33 2008
@@ -16,6 +16,7 @@
 --%>
 <%@ 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"%>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Iterator" %>
@@ -24,6 +25,7 @@
 <%@ page import="javax.management.InstanceNotFoundException" %>
 <%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
 <%@ page import="org.apache.geronimo.monitoring.console.data.Node" %>
+<fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 
 <%
@@ -90,31 +92,31 @@
             <p>
             <table cellpadding="1" cellspacing="1">
                 <tr>
-                    <th align="left">Status:</th>
+                    <th align="left"><fmt:message key="monitor.server.status"/>:</th>
                     <td>&nbsp;</td>
                     <td align="right">
                                 <%if (isOnline)
                 {%>
-                    <font color="green"><strong>Online</strong></font>
+                    <font color="green"><strong><fmt:message key="monitor.server.online"/></strong></font>
                    <%}
                                 else
                                 {%>
-                                <font color="red"><strong>Offline</strong></font>
+                                <font color="red"><strong><fmt:message key="monitor.server.offline"/></strong></font>
                                 <%} %> 
                     </td>
                 </tr>
                 
                                 <tr>
-                    <th align="left">Snapshot Thread:</th>
+                    <th align="left"><fmt:message key="monitor.server.snapshotThread"/>:</th>
                     <td>&nbsp;</td>
                     <td align="right">
                                 <%if (isOnline && collecting == 1)
                 {%>
-                    Running
+                    <fmt:message key="monitor.server.run"/>
                    <%}
                                 else
                                 {%>
-                                <font color="red"><strong>Stopped</strong></font>
+                                <font color="red"><strong><fmt:message key="monitor.server.stopped"/></strong></font>
                                 <%} %> 
                     </td>
                 </tr>
@@ -135,39 +137,39 @@
                     <%--<td align="right"><%=last_seen%></td>--%>
                 <%--</tr>--%>
                 <tr>
-                    <th align="left">IP/Hostname:</th>
+                    <th align="left"><fmt:message key="monitor.server.ip"/>/<fmt:message key="monitor.server.hostname"/>:</th>
                     <td>&nbsp;</td>
                     <td align="right"><%=node.getHost()%></td>
                 </tr>
                 <tr>
-                    <th align="left">Snapshot Duration:</th>
+                    <th align="left"><fmt:message key="monitor.server.snapshotDuration"/>:</th>
                     <td>&nbsp;</td>
                           <%if (isOnline)
                 {%>
-                    <td align="right"><%=snapshotDuration%> minutes</td>
+                    <td align="right"><%=snapshotDuration%> <fmt:message key="monitor.common.minute"/></td>
                      <%}
                                 else
                                 {
                                     %>
-                                    <td align="right">Unknown</td>
+                                    <td align="right"><fmt:message key="monitor.common.unknown"/></td>
                                     <%} %>
                 </tr>
                 <tr>
-                    <th>Snapshot Retention:</th>
+                    <th><fmt:message key="monitor.server.snapshotRetention"/>:</th>
                     <td>&nbsp;</td>
                           <%if (isOnline)
                 {%>
-                    <td align="right"><%=retention%> days</td>
+                    <td align="right"><%=retention%> <fmt:message key="monitor.common.day"/></td>
                      <%}
                                 else
                                 {
                                     %>
-                                    <td align="right">Unknown</td>
+                                    <td align="right"><fmt:message key="monitor.common.unknown"/></td>
                                     <%} %>
                 </tr>
             </table>
             <table>
-            <thead><font size="+1">Live Statistics</font></thead>
+            <thead><font size="+1"><fmt:message key="monitor.server.liveStat"/></font></thead>
             <%
             if (isOnline)
             {
@@ -205,7 +207,7 @@
                     }
                 } else {
                 %>
-                    <tr><td>The statistics bean is not available now.</td></tr>
+                    <tr><td><fmt:message key="monitor.server.statNA"/></td></tr>
                 <%
                 }
                 %>                
@@ -228,7 +230,7 @@
             {
                 %>
                 </table>
-                <font color="red">SERVER IS OFFLINE</font>
+                <font color="red"><fmt:message key="monitor.server.serverOffline"/></font>
                 <%
             }
 %>
@@ -242,17 +244,17 @@
             <table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Navigation</font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.common.nav"/></font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
                         <ul>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>">Home</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>">Views</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>">Servers</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>">Graphs</a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>"><fmt:message key="monitor.common.home"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>"><fmt:message key="monitor.common.view"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>"><fmt:message key="monitor.common.server"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>"><fmt:message key="monitor.common.graph"/></a></li>
                         </ul>
                         &nbsp;<br />
                     </td>   
@@ -263,29 +265,29 @@
             <table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Actions</font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.common.action"/></font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
                         <ul>
-                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>">Modify this server</a></li>
-                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>">Disable this server</a></li>
-                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>">Add a new server</a></li>
+                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><fmt:message key="monitor.server.modifyServer"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><fmt:message key="monitor.server.disableServer"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>"><fmt:message key="monitor.server.addServer"/></a></li>
                         <%
                         if(collecting == 1) {
                         %>
-                            <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServerViewQuery" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>">Disable Query</a></li>
+                            <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServerViewQuery" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><fmt:message key="monitor.server.disableQuery"/></a></li>
                         <%
                         } else if (collecting == 0){
                         %>
-                            <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServerViewQuery" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="snapshotDuration" value='<%= "" + (snapshotDuration * 1000 * 60) %>' /></portlet:actionURL>">Enable Query</a></li>
+                            <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServerViewQuery" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="snapshotDuration" value='<%= "" + (snapshotDuration * 1000 * 60) %>' /></portlet:actionURL>"><fmt:message key="monitor.server.enableQuery"/></a></li>
                         <%
                         }
                         else if (collecting == -1){
                             %>
-                                <li>Stopping Thread...</li>
+                                <li><fmt:message key="monitor.server.stoppingThread"/></li>
                             <%
                             }
                         %>
@@ -299,7 +301,7 @@
             <table style="border-bottom: 1px solid #2581c7;" width="100%" cellspacing="1" cellpadding="1">
                 <tr>
                     <td colspan="2" class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Statistics Collected</font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.server.statCollected"/></font>
                     </td>
                 </tr>
 
@@ -365,7 +367,7 @@
             <table style="border-bottom: 1px solid #2581c7;" width="100%" cellspacing="1" cellpadding="1">
                 <tr>
                     <td colspan="2" class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Statistics Available</font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.server.statAvailable"/></font>
                     </td>
                 </tr>
 
@@ -436,10 +438,10 @@
     <tr>
         <!-- Body -->
         <td width="90%" align="left" valign="top">
-            <a HREF="javascript:history.go(-1)"><< Back</a>
+            <a HREF="javascript:history.go(-1)"><< <fmt:message key="monitor.common.back"/></a>
             <p>
             <font face="Verdana" size="+1">
-            Server does not exist or is disabled
+            <fmt:message key="monitor.server.notExistOrDisabled"/>
             </font>
             </p>         
 
@@ -452,17 +454,17 @@
             <table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Navigation</font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.common.nav"/></font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
                         <ul>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>">Home</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>">Views</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>">Servers</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>">Graphs</a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>"><fmt:message key="monitor.common.home"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>"><fmt:message key="monitor.common.view"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>"><fmt:message key="monitor.common.server"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>"><fmt:message key="monitor.common.graph"/></a></li>
                         </ul>
                         &nbsp;<br />
                     </td>   
@@ -473,14 +475,14 @@
             <table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Actions</font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.common.action"/></font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
                         <ul>
-                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>">Add a new server</a></li>
+                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>"><fmt:message key="monitor.server.addServer"/></a></li>
                         </ul>
                         &nbsp;<br />
                     </td>   

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp Tue Dec 30 11:51:33 2008
@@ -17,8 +17,10 @@
 --%>
 <%@ 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"%>
 <%@ page import="java.util.List" %>
 <%@ page import="org.apache.geronimo.monitoring.console.data.View" %>
+<fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 <%
     String message = (String) request.getAttribute("message"); 
@@ -35,13 +37,13 @@
        <td width="100%" align="left" valign="top">
 <table width="100%" style="border-style: solid;
 border-width: 1px;">
- <thead align="center"><strong>Views</strong></thead>
+ <thead align="center"><strong><fmt:message key="monitor.common.view"/></strong></thead>
  <tr>
-  <th class="DarkBackground" width="30%">Name</th>
-  <th class="DarkBackground" width="10%">Elements</th>
-  <th class="DarkBackground" width="10%">Created</th>
-  <th class="DarkBackground" width="10%">Modified</th>
-  <th class="DarkBackground" width="30%" colspan="2">Actions</th>
+  <th class="DarkBackground" width="30%"><fmt:message key="monitor.common.name"/></th>
+  <th class="DarkBackground" width="10%"><fmt:message key="monitor.view.element"/></th>
+  <th class="DarkBackground" width="10%"><fmt:message key="monitor.view.created"/></th>
+  <th class="DarkBackground" width="10%"><fmt:message key="monitor.view.modified"/></th>
+  <th class="DarkBackground" width="30%" colspan="2"><fmt:message key="monitor.common.action"/></th>
  </tr>
  <%
      List<View> views = (List<View>) request.getAttribute("views");
@@ -61,14 +63,14 @@
   <td class="${backgroundClass}" width="10%" align="center"><%=view.getGraphs().size()%></td>
   <%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>--%>
   <%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>--%>
-  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=view.getIdString()%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit">Edit</a></td>
+  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=view.getIdString()%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
  </tr>
  <%
  }
 // rs.close();
  %>
 </table>
-<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Create View">Create View</a></div>
+<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Create View"><fmt:message key="monitor.view.create"/></a></div>
         </td>
      
          <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -79,17 +81,17 @@
             <table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Navigation</font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.common.nav"/></font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
                         <ul>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>">Home</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>">Views</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>">Servers</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>">Graphs</a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>"><fmt:message key="monitor.common.home"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>"><fmt:message key="monitor.common.view"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>"><fmt:message key="monitor.common.server"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>"><fmt:message key="monitor.common.graph"/></a></li>
                         </ul>
                         &nbsp;<br />
                     </td>   

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml Tue Dec 30 11:51:33 2008
@@ -24,6 +24,13 @@
     <!-- required for pluto cross context dispatches -->
     <cross-context />
 
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+
     <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
         <role-mappings>

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet.properties?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet.properties (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet.properties Tue Dec 30 11:51:33 2008
@@ -14,105 +14,99 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
-##
-## $Rev: 520132 $ $Date: 2007-03-20 04:05:23 +0530 (Tue, 20 Mar 2007) $
-##
 
-portlet.openejb.view.containerclass=Container Class
-portlet.openejb.view.containerid=Container Id
-portlet.openejb.view.containerdescription=Container Description
-portlet.openejb.view.displayname=Display Name
-
-portlet.openejb.view.beanclassname=Bean Class Name
-portlet.openejb.view.businesslocalinterfaces=Business Local Interfaces
-portlet.openejb.view.businessremoteinterfaces=Business Remote Interfaces
-portlet.openejb.view.deploymentid=Deployment Id
-portlet.openejb.view.ejbname=EJB Name
-portlet.openejb.view.ejbhomeinterface=EJB Home Interface
-portlet.openejb.view.jndinames=JNDI Names
-portlet.openejb.view.localhomeinterface=Local Home Interface
-portlet.openejb.view.localinterface=Local Interface
-portlet.openejb.view.remoteinterface=Remote Interface
-portlet.openejb.view.primarykeyclass=Primary Key Class
-portlet.openejb.view.primarykeyfield=Primary Key Field
-portlet.openejb.view.sepinterface=Service EndPoint Interface
-
-portlet.openejb.view.message1=The value of {0} should be Numeric;
-portlet.openejb.view.message2=The value of {0} should be either true or false
-portlet.openejb.view.message3=The value of {0} is not valid
-portlet.openejb.view.message4=Please restart the openejb configuration for the changes to take effect
-portlet.openejb.view.message5=The openejb configuration should be restarted for the changes that were made to the fields to take effect. The changed fields are now shown in red color.
-
-portlet.openejb.view.errorMessage1=An unexpected error has occurred and the value cannot be set
-portlet.openejb.view.errorMessage2=Exception when trying to get JNDI name 
-portlet.openejb.view.errorMessage3=GBeanNotFoundException for GBean Name: {0}
-portlet.openejb.view.errorMessage4=InternalKernelException for GBean Name: {0}
-portlet.openejb.view.errorMessage5=IllegalStateException for GBean Name: {0}
-
-portlet.openejb.help.title=The EJB Server portlet allows you to see the different OpenEJB containers deployed on the server. It allows you to set the configurable attributes of those containers as well as view information on the EJBs that are deployed on that container.
-portlet.openejb.help.ejbInfo=EJB Information.
-portlet.openejb.help.ejbInfoDetail=This portlet shows the following information regarding the Enterprise Java Beans deployed in the embedded OpenEJB instance. This information cannot be edited.
-portlet.openejb.help.beanclassname=Bean Class Name
-portlet.openejb.help.beanclassnamedesc=This is the name of the Bean Class.
-
-portlet.openejb.help.businesslocal=Business Local Interfaces
-portlet.openejb.help.businesslocaldesc=Comma separated list of business local interfaces that the bean has.
-portlet.openejb.help.businessremote=Business Remote Interfaces
-portlet.openejb.help.businessremotedesc=Comma separated list of business remote interfaces that the bean has.
-portlet.openejb.help.deploymentId=Deployment Id
-portlet.openejb.help.deploymentIddesc=Deployment Id of the EJB.
-portlet.openejb.help.ejbname=Ejb Name
-portlet.openejb.help.ejbnamedesc=Name of the EJB.
-portlet.openejb.help.ejbhome=EJB Home Interface
-portlet.openejb.help.ejbhomedesc=Home interface of the EJB.
-portlet.openejb.help.jndiname=JNDI Names
-portlet.openejb.help.jndinamedesc=Comma separated list of JNDI names for the EJB.
-portlet.openejb.help.localhome=Local Home Interface
-portlet.openejb.help.localhomedesc=Local Home interface of the EJB.
-portlet.openejb.help.local=Local Interface
-portlet.openejb.help.localdesc=Local interface of the EJB.
-portlet.openejb.help.remote=Remote Interface
-portlet.openejb.help.remotedesc=Remote interface of the EJB.
-portlet.openejb.help.primarykeyclass=Primary Key Class
-portlet.openejb.help.primarykeyclassdesc=Primary Key class of the EJB(if any).
-portlet.openejb.help.primarykeyfield=Primary Key Field
-portlet.openejb.help.primarykeyfielddesc=Primary Key field of the EJB(if any).
-portlet.openejb.help.sei=Service EndPoint Interface
-portlet.openejb.help.seidesc=Service Endpoint Interface if the stateless EJB is exposed as a web service.
-portlet.openejb.help.containerinfo=Container Information
-portlet.openejb.help.containerinfodesc=This portlet also gives us information regarding the different types of OpenEJB containers that are running in Geronimo. We can get this information by clicking on the different containers shown in the tree. The editable fields for each container are shown below
-portlet.openejb.help.statelesscontainer=Stateless Container
-portlet.openejb.help.sltimeout=TimeOut
-portlet.openejb.help.sltimeoutdesc=Specifies the time to wait between invocations. This value is measured in milliseconds. A value of 5 would result in a time-out of 5 milliseconds between invocations.A value of zero would mean no timeout.Default value is 0.
-portlet.openejb.help.slpoolsize=PoolSize
-portlet.openejb.help.slpoolsizedesc=Specifies the size of the bean pools for this stateless SessionBean container. Default value is 10.
-portlet.openejb.help.strictpooling=StrictPooling
-portlet.openejb.help.strictpoolingdesc=StrictPooling tells the container what to do when the pool reaches it's maximum size and there are incoming requests that need instances.With strict pooling, requests will have to wait for instances to become available. The pool size will never grow beyond the the set PoolSize value.Without strict pooling, the container will create temporary instances to meet demand. The instances will last for just one method invocation and then are removed. Default value is true.
-portlet.openejb.help.statefulcontainer=Stateful Container
-portlet.openejb.help.sftimeout=TimeOut
-portlet.openejb.help.sftimeoutdesc=Specifies the time to wait between invocations. This value is measured in minutes. A value of 5 would result in a time-out of 5 minutes between invocations.A value of zero would mean no timeout.Default value is 20.
-portlet.openejb.help.sfpoolsize=PoolSize
-portlet.openejb.help.sfpoolsizedesc=Specifies the size of the bean pools for this stateful SessionBean container.Default value is 1000.
-portlet.openejb.help.passivator=Passivator
-portlet.openejb.help.passivatordesc=The passivator is responsible for writing beans to disk at passivation time. Different passivators can be used by setting this property to the fully qualified class name of the PassivationStrategy implementation. The passivator is not responsible for invoking any callbacks or other processing, its only responsibly is to write the bean state to disk.
-portlet.openejb.help.ki=Known implementations
-portlet.openejb.help.ki1=org.apache.openejb.core.stateful.RAFPassivater
-portlet.openejb.help.ki2=org.apache.openejb.core.stateful.SimplePassivater
-portlet.openejb.help.kid=Default value is org.apache.openejb.core.stateful.SimplePassivater.
-portlet.openejb.help.bulkpassivate=BulkPassivate
-portlet.openejb.help.bulkpassivatedesc=Property name that specifies the number of instances to passivate at one time when doing bulk passivation.Default value is 100.
-portlet.openejb.help.mdbcontainer=MDB Container
-portlet.openejb.help.instancelimit=InstanceLimit
-portlet.openejb.help.instancelimitdesc=Specifies the maximum number of bean instances that are allowed to exist for each MDB deployment.Default value is 10.
-portlet.openejb.help.activation=ActivationSpecClass
-portlet.openejb.help.activationdesc=Specifies the activation spec class Default value is org.apache.activemq.ra.ActiveMQActivationSpec
-portlet.openejb.help.mli=MessageListenerInterface
-portlet.openejb.help.mlidesc=Specifies the message listener interface handled by this container. Default value is javax.jms.MessageListener.
-portlet.openejb.help.ra=ResourceAdapter
-portlet.openejb.help.radesc=The resource adapter delivers messages to the container. Default value is Default JMS Resource Adapter.
-portlet.openejb.help.cmpcontainer=CMP Container
-portlet.openejb.help.cef=CmpEngineFactory
-portlet.openejb.help.cefdesc=Default value is org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory.
-portlet.openejb.help.bmpcontainer=BMP Container
-portlet.openejb.help.bmppoolsize=PoolSize
-portlet.openejb.help.bmppoolsizedesc=Specifies the size of the bean pools for this bmp entity container.Default value is 10.
+portlet.openejb.help.activation               = ActivationSpecClass
+portlet.openejb.help.activationdesc           = Specifies the activation spec class Default value is org.apache.activemq.ra.ActiveMQActivationSpec
+portlet.openejb.help.beanclassname            = Bean Class Name
+portlet.openejb.help.beanclassnamedesc        = This is the name of the Bean Class.
+portlet.openejb.help.bmpcontainer             = BMP Container
+portlet.openejb.help.bmppoolsize              = PoolSize
+portlet.openejb.help.bmppoolsizedesc          = Specifies the size of the bean pools for this bmp entity container.Default value is 10.
+portlet.openejb.help.bulkpassivate            = BulkPassivate
+portlet.openejb.help.bulkpassivatedesc        = Property name that specifies the number of instances to passivate at one time when doing bulk passivation.Default value is 100.
+portlet.openejb.help.businesslocal            = Business Local Interfaces
+portlet.openejb.help.businesslocaldesc        = Comma separated list of business local interfaces that the bean has.
+portlet.openejb.help.businessremote           = Business Remote Interfaces
+portlet.openejb.help.businessremotedesc       = Comma separated list of business remote interfaces that the bean has.
+portlet.openejb.help.cef                      = CmpEngineFactory
+portlet.openejb.help.cefdesc                  = Default value is org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory.
+portlet.openejb.help.cmpcontainer             = CMP Container
+portlet.openejb.help.containerinfo            = Container Information
+portlet.openejb.help.containerinfodesc        = This portlet also gives us information regarding the different types of OpenEJB containers that are running in Geronimo. We can get this information by clicking on the different containers shown in the tree. The editable fields for each container are shown below
+portlet.openejb.help.deploymentId             = Deployment Id
+portlet.openejb.help.deploymentIddesc         = Deployment Id of the EJB.
+portlet.openejb.help.ejbInfo                  = EJB Information.
+portlet.openejb.help.ejbInfoDetail            = This portlet shows the following information regarding the Enterprise Java Beans deployed in the embedded OpenEJB instance. This information cannot be edited.
+portlet.openejb.help.ejbhome                  = EJB Home Interface
+portlet.openejb.help.ejbhomedesc              = Home interface of the EJB.
+portlet.openejb.help.ejbname                  = Ejb Name
+portlet.openejb.help.ejbnamedesc              = Name of the EJB.
+portlet.openejb.help.instancelimit            = InstanceLimit
+portlet.openejb.help.instancelimitdesc        = Specifies the maximum number of bean instances that are allowed to exist for each MDB deployment.Default value is 10.
+portlet.openejb.help.jndiname                 = JNDI Names
+portlet.openejb.help.jndinamedesc             = Comma separated list of JNDI names for the EJB.
+portlet.openejb.help.ki                       = Known implementations
+portlet.openejb.help.ki1                      = org.apache.openejb.core.stateful.RAFPassivater
+portlet.openejb.help.ki2                      = org.apache.openejb.core.stateful.SimplePassivater
+portlet.openejb.help.kid                      = Default value is org.apache.openejb.core.stateful.SimplePassivater.
+portlet.openejb.help.local                    = Local Interface
+portlet.openejb.help.localdesc                = Local interface of the EJB.
+portlet.openejb.help.localhome                = Local Home Interface
+portlet.openejb.help.localhomedesc            = Local Home interface of the EJB.
+portlet.openejb.help.mdbcontainer             = MDB Container
+portlet.openejb.help.mli                      = MessageListenerInterface
+portlet.openejb.help.mlidesc                  = Specifies the message listener interface handled by this container. Default value is javax.jms.MessageListener.
+portlet.openejb.help.passivator               = Passivator
+portlet.openejb.help.passivatordesc           = The passivator is responsible for writing beans to disk at passivation time. Different passivators can be used by setting this property to the fully qualified class name of the PassivationStrategy implementation. The passivator is not responsible for invoking any callbacks or other processing, its only responsibly is to write the bean state to disk.
+portlet.openejb.help.primarykeyclass          = Primary Key Class
+portlet.openejb.help.primarykeyclassdesc      = Primary Key class of the EJB(if any).
+portlet.openejb.help.primarykeyfield          = Primary Key Field
+portlet.openejb.help.primarykeyfielddesc      = Primary Key field of the EJB(if any).
+portlet.openejb.help.ra                       = ResourceAdapter
+portlet.openejb.help.radesc                   = The resource adapter delivers messages to the container. Default value is Default JMS Resource Adapter.
+portlet.openejb.help.remote                   = Remote Interface
+portlet.openejb.help.remotedesc               = Remote interface of the EJB.
+portlet.openejb.help.sei                      = Service EndPoint Interface
+portlet.openejb.help.seidesc                  = Service Endpoint Interface if the stateless EJB is exposed as a web service.
+portlet.openejb.help.sfpoolsize               = PoolSize
+portlet.openejb.help.sfpoolsizedesc           = Specifies the size of the bean pools for this stateful SessionBean container.Default value is 1000.
+portlet.openejb.help.sftimeout                = TimeOut
+portlet.openejb.help.sftimeoutdesc            = Specifies the time to wait between invocations. This value is measured in minutes. A value of 5 would result in a time-out of 5 minutes between invocations.A value of zero would mean no timeout.Default value is 20.
+portlet.openejb.help.slpoolsize               = PoolSize
+portlet.openejb.help.slpoolsizedesc           = Specifies the size of the bean pools for this stateless SessionBean container. Default value is 10.
+portlet.openejb.help.sltimeout                = TimeOut
+portlet.openejb.help.sltimeoutdesc            = Specifies the time to wait between invocations. This value is measured in milliseconds. A value of 5 would result in a time-out of 5 milliseconds between invocations.A value of zero would mean no timeout.Default value is 0.
+portlet.openejb.help.statefulcontainer        = Stateful Container
+portlet.openejb.help.statelesscontainer       = Stateless Container
+portlet.openejb.help.strictpooling            = StrictPooling
+portlet.openejb.help.strictpoolingdesc        = StrictPooling tells the container what to do when the pool reaches it's maximum size and there are incoming requests that need instances.With strict pooling, requests will have to wait for instances to become available. The pool size will never grow beyond the the set PoolSize value.Without strict pooling, the container will create temporary instances to meet demand. The instances will last for just one method invocation and then are removed. Default value is true.
+portlet.openejb.help.title                    = The EJB Server portlet allows you to see the different OpenEJB containers deployed on the server. It allows you to set the configurable attributes of those containers as well as view information on the EJBs that are deployed on that container.
+portlet.openejb.view.beanclassname            = Bean Class Name
+portlet.openejb.view.businesslocalinterfaces  = Business Local Interfaces
+portlet.openejb.view.businessremoteinterfaces = Business Remote Interfaces
+portlet.openejb.view.containerclass           = Container Class
+portlet.openejb.view.containerdescription     = Container Description
+portlet.openejb.view.containerid              = Container Id
+portlet.openejb.view.deploymentid             = Deployment Id
+portlet.openejb.view.displayname              = Display Name
+portlet.openejb.view.ejbhomeinterface         = EJB Home Interface
+portlet.openejb.view.ejbname                  = EJB Name
+portlet.openejb.view.errorMessage1            = An unexpected error has occurred and the value cannot be set
+portlet.openejb.view.errorMessage2            = Exception when trying to get JNDI name 
+portlet.openejb.view.errorMessage3            = GBeanNotFoundException for GBean Name: {0}
+portlet.openejb.view.errorMessage4            = InternalKernelException for GBean Name: {0}
+portlet.openejb.view.errorMessage5            = IllegalStateException for GBean Name: {0}
+portlet.openejb.view.jndinames                = JNDI Names
+portlet.openejb.view.localhomeinterface       = Local Home Interface
+portlet.openejb.view.localinterface           = Local Interface
+portlet.openejb.view.message1                 = The value of {0} should be Numeric;
+portlet.openejb.view.message2                 = The value of {0} should be either true or false
+portlet.openejb.view.message3                 = The value of {0} is not valid
+portlet.openejb.view.message4                 = Please restart the openejb configuration for the changes to take effect
+portlet.openejb.view.message5                 = The openejb configuration should be restarted for the changes that were made to the fields to take effect. The changed fields are now shown in red color.
+portlet.openejb.view.name                     = Name
+portlet.openejb.view.primarykeyclass          = Primary Key Class
+portlet.openejb.view.primarykeyfield          = Primary Key Field
+portlet.openejb.view.remoteinterface          = Remote Interface
+portlet.openejb.view.sepinterface             = Service EndPoint Interface
+portlet.openejb.view.value                    = Value

Added: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet_zh.properties?rev=730224&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet_zh.properties (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet_zh.properties Tue Dec 30 11:51:33 2008
@@ -0,0 +1,112 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+
+portlet.openejb.help.activation               = ActivationSpecClass
+portlet.openejb.help.activationdesc           = \u8BF7\u6307\u5B9AActivationSpecClass,\u9ED8\u8BA4\u503C\u662Forg.apache.activemq.ra.ActiveMQActivationSpec
+portlet.openejb.help.beanclassname            = Bean\u7C7B\u540D
+portlet.openejb.help.beanclassnamedesc        = \u8FD9\u662FBean\u7C7B\u7684\u540D\u79F0
+portlet.openejb.help.bmpcontainer             = BMP\u5BB9\u5668
+portlet.openejb.help.bmppoolsize              = \u6C60\u5927\u5C0F
+portlet.openejb.help.bmppoolsizedesc          = \u4E3ABMP\u5BB9\u5668\u6307\u5B9ABean\u6C60\u7684\u5927\u5C0F.\u9ED8\u8BA4\u503C\u4E3A10.
+portlet.openejb.help.bulkpassivate            = \u6279\u91CF\u949D\u5316
+portlet.openejb.help.bulkpassivatedesc        = \u8BE5\u5C5E\u6027\u53EF\u6307\u5B9A\u5728\u6267\u884C\u6279\u91CF\u949D\u5316\u65F6\u5B9E\u4F8B\u7684\u6570\u76EE, \u9ED8\u8BA4\u503C\u662F100.
+portlet.openejb.help.businesslocal            = \u672C\u5730\u4E1A\u52A1\u63A5\u53E3
+portlet.openejb.help.businesslocaldesc        = \u8BE5Bean\u6240\u6709\u7684\u672C\u5730\u4E1A\u52A1\u63A5\u53E3, \u591A\u4E2A\u63A5\u53E3\u4E4B\u95F4\u4F7F\u7528\u9017\u53F7\u5206\u9694.
+portlet.openejb.help.businessremote           = \u8FDC\u7A0B\u4E1A\u52A1\u63A5\u53E3
+portlet.openejb.help.businessremotedesc       = \u8BE5Bean\u6240\u6709\u7684\u8FDC\u7A0B\u4E1A\u52A1\u63A5\u53E3, \u591A\u4E2A\u63A5\u53E3\u4E4B\u95F4\u4F7F\u7528\u9017\u53F7\u5206\u9694.
+portlet.openejb.help.cef                      = CMP\u5F15\u64CE\u5DE5\u5382
+portlet.openejb.help.cefdesc                  = \u9ED8\u8BA4\u503C\u4E3A org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory.
+portlet.openejb.help.cmpcontainer             = CMP\u5BB9\u5668
+portlet.openejb.help.containerinfo            = \u5BB9\u5668\u4FE1\u606F
+portlet.openejb.help.containerinfodesc        = \u8BE5Portlet\u663E\u793A\u5728\u5728Geronimo\u4E2D\u8FD0\u884C\u7684\u4E0D\u540COpenEJB\u5BB9\u5668\u7684\u4FE1\u606F. \u901A\u8FC7\u6811\u7ED3\u6784\u4E2D\u4E0D\u540C\u5BB9\u5668\u83B7\u53D6\u5176\u76F8\u5173\u4FE1\u606F. \u9009\u4E2D\u5BB9\u5668\u7684\u53EF\u7F16\u8F91\u4FE1\u606F\u4F1A\u5728\u4E0B\u9762\u663E\u793A.
+portlet.openejb.help.deploymentId             = \u90E8\u7F72 Id
+portlet.openejb.help.deploymentIddesc         = EJB\u7684\u90E8\u7F72Id\u503C
+portlet.openejb.help.ejbInfo                  = EJB\u4FE1\u606F
+portlet.openejb.help.ejbInfoDetail            = \u8BE5Portle\u663E\u793A\u4E86\u90E8\u7F72\u5728\u5D4C\u5165OpenEJB\u5B9E\u4F8B\u4E2D\u7684EJB\u4FE1\u606F. \u8FD9\u4E9B\u4FE1\u606F\u4E0D\u53EF\u7F16\u8F91.
+portlet.openejb.help.ejbhome                  = EJB Home \u63A5\u53E3
+portlet.openejb.help.ejbhomedesc              = EJB\u7684Home\u63A5\u53E3
+portlet.openejb.help.ejbname                  = EJB\u7684\u540D\u79F0
+portlet.openejb.help.ejbnamedesc              = EJB\u7684\u540D\u79F0
+portlet.openejb.help.instancelimit            = \u5B9E\u4F8B\u9650\u5236\u6570\u91CF
+portlet.openejb.help.instancelimitdesc        = \u6307\u5B9A\u4E86\u6BCF\u4E00\u4E2A\u90E8\u7F72\u7684MDB\u6240\u5141\u8BB8\u521B\u5EFA\u7684\u6700\u5927Bean\u5B9E\u4F8B\u6570\u76EE. \u9ED8\u8BA4\u503C\u662F10.
+portlet.openejb.help.jndiname                 = JNDI\u540D\u79F0
+portlet.openejb.help.jndinamedesc             = \u8BE5EJB\u7684JNDI\u540D\u79F0\u5217\u8868, \u591A\u4E2A\u540D\u79F0\u4E4B\u95F4\u4F7F\u7528\u9017\u53F7\u5206\u9694.
+portlet.openejb.help.ki                       = \u53EF\u8BC6\u522B\u7684\u5B9E\u73B0
+portlet.openejb.help.ki1                      = org.apache.openejb.core.stateful.RAFPassivater
+portlet.openejb.help.ki2                      = org.apache.openejb.core.stateful.SimplePassivater
+portlet.openejb.help.kid                      = \u9ED8\u8BA4\u503C\u662Forg.apache.openejb.core.stateful.SimplePassivater.
+portlet.openejb.help.local                    = \u672C\u5730\u63A5\u53E3
+portlet.openejb.help.localdesc                = EJB\u7684\u672C\u5730\u63A5\u53E3
+portlet.openejb.help.localhome                = \u672C\u5730Home\u63A5\u53E3
+portlet.openejb.help.localhomedesc            = EJB\u7684\u672C\u5730Home\u63A5\u53E3
+portlet.openejb.help.mdbcontainer             = MDB\u5BB9\u5668
+portlet.openejb.help.mli                      = \u6D88\u606F\u76D1\u542C\u63A5\u53E3
+portlet.openejb.help.mlidesc                  = \u6307\u5B9A\u8BE5\u5BB9\u5668\u5904\u7406\u7684\u6D88\u606F\u76D1\u542C\u63A5\u53E3. \u9ED8\u8BA4\u503C\u662Fjavax.jms.MessageListener.
+portlet.openejb.help.passivator               = Passivator
+portlet.openejb.help.passivatordesc           = Passivator \u8D1F\u8D23\u5728\u949D\u5316\u65F6\u5C06 Bean \u5199\u5165\u78C1\u76D8\u3002\u901A\u8FC7\u8BE5\u5C5E\u6027\u6307\u5B9A\u5B9E\u73B0 PassivationStrategy \u7C7B\u7684\u5168\u540D\u53EF\u4EE5\u4F7F\u7528\u4E0D\u540C\u7684Passivator\u3002  Passivator \u4E0D\u8D1F\u8D23\u56DE\u8C03\u65B9\u6CD5\u7684\u8C03\u7528\u548C\u5176\u4ED6\u76F8\u5173\u5904\u7406, \u5B83\u4EC5\u5C06 Bean \u7684\u72B6\u6001\u5199\u5165\u78C1\u76D8\u3002
+portlet.openejb.help.primarykeyclass          = \u4E3B\u952E\u7C7B
+portlet.openejb.help.primarykeyclassdesc      = EJB\u7684\u4E3B\u952E\u7C7B(\u5982\u679C\u5B58\u5728)
+portlet.openejb.help.primarykeyfield          = \u4E3B\u952E\u5B57\u6BB5
+portlet.openejb.help.primarykeyfielddesc      = EJB\u7684\u4E3B\u952E\u5B57\u6BB5(\u5982\u679C\u5B58\u5728)
+portlet.openejb.help.ra                       = \u8D44\u6E90\u9002\u914D\u5668
+portlet.openejb.help.radesc                   = \u8D44\u6E90\u9002\u914D\u5668\u7528\u4E8E\u5C06\u6D88\u606F\u53D1\u9001\u7ED9\u5BB9\u5668, \u9ED8\u8BA4\u4F7F\u7528JMS\u8D44\u6E90\u9002\u914D\u5668.
+portlet.openejb.help.remote                   = \u8FDC\u7A0B\u63A5\u53E3
+portlet.openejb.help.remotedesc               = EJB\u7684\u8FDC\u7A0B\u63A5\u53E3
+portlet.openejb.help.sei                      = \u670D\u52A1\u7EC8\u7AEF\u63A5\u53E3
+portlet.openejb.help.seidesc                  = \u5982\u679C\u65E0\u72B6\u6001EJB\u4F5C\u4E3AWeb Service\u7684\u7EC8\u7AEF\u670D\u52A1\u63A5\u53E3
+portlet.openejb.help.sfpoolsize               = \u6C60\u5927\u5C0F
+portlet.openejb.help.sfpoolsizedesc           = \u6307\u5B9A\u8BE5\u6709\u72B6\u6001\u4F1A\u8BDDBean\u5BB9\u5668\u7684Bean\u6C60\u7684\u5927\u5C0F, \u9ED8\u8BA4\u503C\u4E3A1000.
+portlet.openejb.help.sftimeout                = \u8D85\u65F6\u65F6\u95F4
+portlet.openejb.help.sftimeoutdesc            = \u6307\u5B9A\u8C03\u7528\u4E4B\u95F4\u7684\u7B49\u5F85\u65F6\u95F4. \u8BE5\u503C\u4F7F\u7528\u5206\u949F\u4E3A\u5355\u4F4D. \u8BBE\u7F6E\u4E3A5\u8868\u793A\u4E24\u6B21\u8C03\u7528\u4E4B\u95F4\u7684\u7B49\u5F85\u65F6\u95F4\u662F5\u5206\u949F. \u8BBE\u7F6E\u4E3A0\u8868\u793A\u7B49\u5F85\u65F6\u95F4\u4E3A0. \u9ED8\u8BA4\u503C\u662F20\u5206\u949F.
+portlet.openejb.help.slpoolsize               = \u6C60\u5927\u5C0F
+portlet.openejb.help.slpoolsizedesc           = \u6307\u5B9A\u8BE5\u65E0\u72B6\u6001\u4F1A\u8BDDBean\u5BB9\u5668Bean\u6C60\u7684\u5927\u5C0F. \u9ED8\u8BA4\u503C\u662F10.
+portlet.openejb.help.sltimeout                = \u8D85\u65F6\u65F6\u95F4
+portlet.openejb.help.sltimeoutdesc            = \u6307\u5B9A\u8C03\u7528\u4E4B\u95F4\u7684\u7B49\u5F85\u65F6\u95F4. \u8BE5\u503C\u4F7F\u7528\u5206\u949F\u4E3A\u5355\u4F4D. \u8BBE\u7F6E\u4E3A5\u8868\u793A\u4E24\u6B21\u8C03\u7528\u4E4B\u95F4\u7684\u7B49\u5F85\u65F6\u95F4\u662F5\u5206\u949F. \u8BBE\u7F6E\u4E3A0\u8868\u793A\u7B49\u5F85\u65F6\u95F4\u4E3A0. \u9ED8\u8BA4\u503C\u662F0.
+portlet.openejb.help.statefulcontainer        = \u6709\u72B6\u6001\u4F1A\u8BDDBean\u5BB9\u5668
+portlet.openejb.help.statelesscontainer       = \u65E0\u72B6\u6001\u4F1A\u8BDDBean\u5BB9\u5668
+portlet.openejb.help.strictpooling            = StrictPooling
+portlet.openejb.help.strictpoolingdesc        = StrictPooling\u8BBE\u7F6E\u4E86\u5F53\u5BB9\u5668\u5728Bean\u6C60\u8FBE\u5230\u5176\u4E0A\u9650\u5E76\u4E14\u4ECD\u6709\u65B0\u7684\u8BF7\u6C42\u65F6\u7684\u884C\u4E3A. \u4F7F\u7528StrictPooling\u5C5E\u6027\u65F6, \u8BF7\u6C42\u4F1A\u5904\u4E8E\u7B49\u5F85\u72B6\u6001\u76F4\u5230\u6709\u53EF\u7528\u7684\u5B9E\u4F8B, \u6C60\u7684\u5927\u5C0F\u4E0D\u4F1A\u8D85\u8FC7\u5176\u4E0A\u9650. \u4E0D\u4F7F\u7528StrictPooling\u5C5E\u6027, \u5BB9\u5668\u4F1A\u521B\u5EFA\u4E34\u65F6\u7684\u5B9E\u4F8B\u6765\u6EE1\u8DB3\u8981\u6C42. \u8FD9\u4E9B\u5B9E\u4F8B\u4F1A\u5728\u4E00\u6B21\u65B9\u6CD5\u8C03\u7528\u7ED3\u675F\u540E\u5220\u9664. \u9ED8\u8BA4\u4F7F\u7528StrictPooling\u5C5E\u6027.
+portlet.openejb.help.title                    = EJB\u670D\u52A1\u5668Portlet\u53EF\u4EE5\u67E5\u770B\u90E8\u7F72\u5728\u670D\u52A1\u5668\u4E0A\u7684\u4E0D\u540COpenEJB\u5BB9\u5668\u7684\u4FE1\u606F, \u540C\u65F6\u5B83\u8FD8\u5141\u8BB8\u8BBE\u7F6E\u8FD9\u4E9B\u5BB9\u5668\u7684\u53EF\u914D\u7F6E\u5C5E\u6027.
+portlet.openejb.view.beanclassname            = Bean\u7C7B\u540D
+portlet.openejb.view.businesslocalinterfaces  = \u672C\u5730\u4E1A\u52A1\u63A5\u53E3
+portlet.openejb.view.businessremoteinterfaces = \u8FDC\u7A0B\u4E1A\u52A1\u63A5\u53E3
+portlet.openejb.view.containerclass           = \u5BB9\u5668\u7C7B
+portlet.openejb.view.containerdescription     = \u5BB9\u5668\u63CF\u8FF0
+portlet.openejb.view.containerid              = \u5BB9\u5668Id
+portlet.openejb.view.deploymentid             = \u90E8\u7F72Id
+portlet.openejb.view.displayname              = \u663E\u793A\u540D\u79F0
+portlet.openejb.view.ejbhomeinterface         = EJB Home \u63A5\u53E3
+portlet.openejb.view.ejbname                  = EJB Home
+portlet.openejb.view.errorMessage1            = \u53D1\u751F\u4E86\u4E0D\u53EF\u9884\u6599\u7684\u9519\u8BEF, \u76F8\u5173\u503C\u6CA1\u6709\u88AB\u4FEE\u6539\u3002
+portlet.openejb.view.errorMessage2            = \u5728\u83B7\u53D6 JNDI \u540D\u79F0\u65F6\u53D1\u751F\u9519\u8BEF
+portlet.openejb.view.errorMessage3            = \u5728\u83B7\u53D6 {0} \u65F6\u53D1\u751F\u4E86GBeanNotFoundException
+portlet.openejb.view.errorMessage4            = \u5728\u83B7\u53D6{0}\u65F6\u53D1\u751F\u4E86 InternalKernelException
+portlet.openejb.view.errorMessage5            = \u5728\u83B7\u53D6{0}\u65F6\u53D1\u751F\u4E86 IllegalStateException
+portlet.openejb.view.jndinames                = JNDI\u540D\u79F0
+portlet.openejb.view.localhomeinterface       = \u672C\u5730Home\u63A5\u53E3
+portlet.openejb.view.localinterface           = \u672C\u5730\u63A5\u53E3
+portlet.openejb.view.message1                 = {0}\u7684\u503C\u5E94\u8BE5\u662F\u6570\u5B57;
+portlet.openejb.view.message2                 = {0}\u7684\u503C\u5E94\u8BE5\u8BBE\u7F6E\u4E3Atrue\u6216\u8005false
+portlet.openejb.view.message3                 = {0}\u7684\u503C\u65E0\u6548
+portlet.openejb.view.message4                 = OpenEJB \u9700\u8981\u91CD\u542F\u4EE5\u4F7F\u914D\u7F6E\u751F\u6548\u3002
+portlet.openejb.view.message5                 = OpenEJB\u914D\u7F6E\u6A21\u5757\u9700\u8981\u91CD\u542F\u4EE5\u4F7F\u5C5E\u6027\u4FEE\u6539\u751F\u6548, \u4FEE\u6539\u4E86\u7684\u5C5E\u6027\u4EE5\u7EA2\u8272\u663E\u793A.
+portlet.openejb.view.name                     = \u540D\u79F0
+portlet.openejb.view.primarykeyclass          = \u4E3B\u952E\u7C7B
+portlet.openejb.view.primarykeyfield          = \u4E3B\u952E\u5B57\u6BB5
+portlet.openejb.view.remoteinterface          = \u8FDC\u7A0B\u63A5\u53E3
+portlet.openejb.view.sepinterface             = \u670D\u52A1\u7EC8\u7AEF\u63A5\u53E3
+portlet.openejb.view.value                    = \u503C

Propchange: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo.properties?rev=730224&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo.properties (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo.properties Tue Dec 30 11:51:33 2008
@@ -0,0 +1,17 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+EJB\ Server = EJB Server

Propchange: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo_zh.properties?rev=730224&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo_zh.properties (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo_zh.properties Tue Dec 30 11:51:33 2008
@@ -0,0 +1,18 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+
+EJB\ Server = EJB \u670D\u52A1\u5668

Propchange: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/view.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/view.jsp (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/view/ejbserver/view.jsp Tue Dec 30 11:51:33 2008
@@ -17,8 +17,10 @@
 <%@ 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"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <%@ page import="org.apache.geronimo.console.util.PortletManager,
                  javax.portlet.RenderRequest"%>
+<fmt:setBundle basename="openejb-portlet"/>
 <portlet:defineObjects/>
 
 <fmt:setBundle basename="openejb-portlet"/>
@@ -198,8 +200,8 @@
             border="0"
             width="100%">
             <thead>                      
-              <th field="Name" dataType="html" width="40%"><B>&nbsp;Name&nbsp;</B></th>
-              <th dataType="html" width="60%"><B>&nbsp;Value&nbsp;</B></th>
+              <th field="Name" dataType="html" width="40%"><B>&nbsp;<fmt:message key="portlet.openejb.view.name" />&nbsp;</B></th>
+              <th dataType="html" width="60%"><B>&nbsp;<fmt:message key="portlet.openejb.view.value" />&nbsp;</B></th>
             </thead>
             <tbody id="ejbInfoTableBody">
             </tbody>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml Tue Dec 30 11:51:33 2008
@@ -33,6 +33,13 @@
         </role-mappings>
     </security>
     
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+    
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Applications/Plan Creator</attribute>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml Tue Dec 30 11:51:33 2008
@@ -39,7 +39,7 @@
         <supported-locale>en</supported-locale>
 
         <portlet-info>
-            <title>Create Geronimo Deployment Plan</title>
+            <title>Create Deployment Plan</title>
             <short-title>Create Deployment Plan</short-title>
             <keywords>Create Deployment Plan</keywords>
         </portlet-info>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp Tue Dec 30 11:51:33 2008
@@ -19,6 +19,8 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="plancreator-portlet"/>
 <portlet:defineObjects />
 
 <script>
@@ -38,7 +40,7 @@
     <div id="<portlet:namespace/>abbrStatusMessage" style="display:inline">
      ${abbrStatusMessage}<br/>
     <c:if test="${!(empty fullStatusMessage)}">
-    <button onclick="<portlet:namespace/>toggleDisplay('fullStatusMessage');<portlet:namespace/>toggleDisplay('abbrStatusMessage');return false;">Show full details</button>
+    <button onclick="<portlet:namespace/>toggleDisplay('fullStatusMessage');<portlet:namespace/>toggleDisplay('abbrStatusMessage');return false;"><fmt:message key="plancreator.status.detail"/></button>
     </c:if>
     </div>
 </c:if>
@@ -52,9 +54,9 @@
 </c:if>
 
 <c:if test="${empty fullStatusMessage}">
-<p><a href="/${data.webApp.contextRoot}">Launch Web App</a></p>
+<p><a href="/${data.webApp.contextRoot}"><fmt:message key="plancreator.status.launch"/></a></p>
 </c:if>
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Finish</a></p>
+            </portlet:actionURL>"><fmt:message key="plancreator.common.finish"/></a></p>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp Tue Dec 30 11:51:33 2008
@@ -19,12 +19,13 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="plancreator-portlet"/>
 <portlet:defineObjects />
 
-<p><b>Created Plan</b> -- Copy/Edit Deployment Plan</p>
+<p><fmt:message key="plancreator.deploy.title"/></p>
 
-<p>The generated Geronimo Deployment Plan is shown below in an edit box. If you would like to make any changes 
-(default should be enough in most scenarios), do it now and then press "Deploy WAR" to deploy the Web application.</p>
+<p><fmt:message key="plancreator.deploy.desc"/></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DisplayPlan" action="<portlet:actionURL/>" method="POST">
@@ -34,19 +35,19 @@
       <tr>
         <td></td>
         <td>
-            <input type="submit" value="Deploy WAR" />
+            <input type="submit" value="<fmt:message key="plancreator.deploy.deploy"/>" />
         </td>
       </tr>
     <!-- STATUS FIELD: Deployment Plan -->
       <tr>
-        <th valign="top" style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>deploymentPlan">Deployment Plan</label>:</div></th>
+        <th valign="top" style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>deploymentPlan"><fmt:message key="plancreator.deploy.plan"/></label>:</div></th>
         <td><textarea rows="30" cols="60" name="deploymentPlan" id="<portlet:namespace/>deploymentPlan">${data.deploymentPlan}</textarea></td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
         <td>
-            <input type="submit" value="Deploy WAR" />
+            <input type="submit" value="<fmt:message key="plancreator.deploy.deploy"/>" />
         </td>
       </tr>
     </table>
@@ -55,4 +56,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="plancreator.common.cancel"/></a></p>