geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r611728 [2/6] - in /geronimo/server/trunk/plugins: activemq/activemq-portlets/src/main/resources/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/activem...
Date Mon, 14 Jan 2008 07:16:36 GMT
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/help.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/help.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/help.jsp Sun Jan 13 23:16:30 2008
@@ -14,43 +14,45 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 
-<p>This portlet is used to create and remove queues/topics.</p>
-<p><span style="font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">Add Queue/Topic</span></p>
-<p>To create a queue/topic click on the &quot;Add Queue/Topic&quot; link. This link brings up a form that allows the user to add a queue or a topic. Fill in the text boxes on the form and click on the &quot;Submit&quot; button. The fields and buttons on the form are defined as follows:</p>
+<p><fmt:message key="jmsmanager.help.title" /></p>
+<p><span style="font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;"><fmt:message key="jmsmanager.common.addQueue_Topic" /></span></p>
+<p><fmt:message key="jmsmanager.help.addQueue_TopicExp" />
+</p>
 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Message Destination Name</strong></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The name of the queue or topic. This is the name used in the admin object gbean name and is linked to by &lt;message-destination-link&gt; in the geronimo-web.xml plan.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong><fmt:message key="jmsmanager.common.messageDestinationName" /></strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="jmsmanager.help.messageDestinationNameExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Destination Physical Name</strong></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The name of the connection factory that ActiveMQ knows about.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong><fmt:message key="jmsmanager.common.destinationPhysicalName" /></strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="jmsmanager.help.destinationPhysicalNameExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Type</strong></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The type of message, either queue or topic.</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong><fmt:message key="jmsmanager.common.type"/></strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="jmsmanager.help.typeExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Application Name</strong></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">This is the &quot;configID&quot; in the geronimo-web.xml file. Or this can be set to the string &quot;null&quot; if the admin object is deployed stand-alone. By default this field contains the string &quot;null.&quot;</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong><fmt:message key="jmsmanager.common.applicationName" /></strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="jmsmanager.help.jmsmanager.help.applicationNameExp" /></td>
   </tr>
   <tr>
-    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Module Name</strong></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">If the module is deployed stand-alone this field is the &quot;configID&quot; in the geronimo-web.xml file. If it is deployed in an application (ear) this field should be the path of the module inside the ear, such as, myResourceAdapter.rar. By default this field contains &quot;defaultJMS.&quot;</td>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong><fmt:message key="jmsmanager.common.moduleName" /></strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="jmsmanager.help.moduleNameExp" /></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><img src="/console/images/submit.gif" alt="Submit"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The Submit button creates a new queue or topic and returns the user to the JMS Destination Manager main page.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="jmsmanager.help.submitBtnExp" /></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><img src="/console/images/clear.gif" alt="Clear"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The Clear button resets all input fields to the default values.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="jmsmanager.help.clearBtnExp" /></td>
   </tr>
   <tr>
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><img src="/console/images/back.gif" alt="Back"/></td>
-    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The Back button returns the user to the &quot;JMS Destination Manager&quot; main page without adding a queue or a topic.</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="jmsmanager.help.backBtnExp" /></td>
   </tr>
 </table>
-<p>On the main JMS Destination Manager pane, there is an &quot;Actions&quot; column that provides three actions which can be performed on a queue or topic. To remove a queue or topic, click on the &quot;remove&quot; link to the right of the queue/topic to be removed. To view a message, click on the &quot;view messages&quot; link to the right of the queue/topic. To view the dead letter queue, click on the &quot;view DLQ&quot; link.</p>
-<p> <strong>Note:</strong> Queues/Topics with no messages will be removed after restarting the server.</p>
+<fmt:message key="jmsmanager.help.summary" />

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp Sun Jan 13 23:16:30 2008
@@ -16,6 +16,8 @@
 --%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -59,12 +61,12 @@
 <!-- Name Field -->
 <c:if test="${mode eq 'add'}">
   <tr>
-    <td><div align="right">Unique Name: </div></td>
+    <td><div align="right"><fmt:message key="jmsmanager.server.connector.editGeneric.uniqueName" />: </div></td>
     <td><input name="name" type="text" size="30"></td>
   </tr>
   <tr>
     <td><div align="right"></div></td>
-    <td>A name that is different than the name for any other JMS connectors in the server</td>
+    <td><fmt:message key="jmsmanager.server.connector.editGeneric.namingJMSConnectors" /></td>
   </tr>
   <script language="JavaScript">
     <portlet:namespace/>requiredFields = new Array("name").concat(<portlet:namespace/>requiredFields);
@@ -72,36 +74,36 @@
 </c:if>
 <!-- Host Field -->
   <tr>
-    <td><div align="right">Host: </div></td>
+    <td><div align="right"><fmt:message key="jmsmanager.common.host"/>: </div></td>
     <td>
       <input name="host" type="text" size="30" value="${host}">
     </td>
   </tr>
   <tr>
     <td><div align="right"></div></td>
-    <td>The host name or IP to bind to.  The normal values are <tt>0.0.0.0</tt> (all interfaces) or <tt>localhost</tt> (local connections only)</td>
+    <td><fmt:message key="jmsmanager.common.hostExp" /></td>
   </tr>
 <!-- Port Field -->
   <tr>
-    <td><div align="right">Port: </div></td>
+    <td><div align="right"><fmt:message key="jmsmanager.common.port" />: </div></td>
     <td>
       <input name="port" type="text" size="5" value="${port}">
     </td>
   </tr>
   <tr>
     <td><div align="right"></div></td>
-    <td>The network port to bind to.</td>
+    <td> <fmt:message key="jmsmanager.common.portExp" /></td>
   </tr>
 <!-- Form buttons -->
   <tr>
     <td><div align="right"></div></td>
     <td>
-      <input name="submit" type="submit" value="Save" onClick="return <portlet:namespace/>validateForm();">
-      <input name="reset" type="reset" value="Reset">
+      <input name="submit" type="submit" value='<fmt:message key="jmsmanager.common.save"/>' onClick="return <portlet:namespace/>validateForm();">
+      <input name="reset" type="reset" value='<fmt:message key="jmsmanager.common.reset"/>' >
     </td>
   </tr>
 </table>
 </form>
 <a href='<portlet:actionURL portletMode="view">
            <portlet:param name="mode" value="list" />
-         </portlet:actionURL>'>List JMS connectors</a>
+         </portlet:actionURL>'><fmt:message key="jmsmanager.common.listJMSConnectors" /></a>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/help.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/help.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/help.jsp Sun Jan 13 23:16:30 2008
@@ -14,5 +14,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>Shows all the network connectors configured for the currently available JMS brokers.
-Lets you start, stop, add, remove, and edit JMS network connectors.</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
+<p>
+<fmt:message key="jmsmanager.server.connector.help.title" />
+</p>
+

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp Sun Jan 13 23:16:30 2008
@@ -16,23 +16,25 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
-<p>Currently available JMS network connectors:</p>
+<p><fmt:message key="jmsmanager.server.connector.normal.title" />:</p>
 
 <!-- Show existing connectors -->
-<c:if test="${empty(connectors)}">There are no JMS network connectors defined</c:if>
+<c:if test="${empty(connectors)}"><fmt:message key="jmsmanager.server.connector.normal.noJMSNetworkConnectors" /></c:if>
 <c:if test="${!empty(connectors)}">
 <table width="100%">
   <tr>
     <td style="padding: 0 20px">
           <tr>
-            <th class="DarkBackground">Name</th>
-            <th class="DarkBackground" align="center">Broker</th>
-            <th class="DarkBackground" align="center">Protocol</th>
-            <th class="DarkBackground" align="center">Port</th>
-            <th class="DarkBackground" align="center">State</th>
-            <th class="DarkBackground" align="center">Actions</th>
+            <th class="DarkBackground"><fmt:message key="jmsmanager.common.name"/></th>
+            <th class="DarkBackground" align="center"><fmt:message key="jmsmanager.common.broker" /></th>
+            <th class="DarkBackground" align="center"><fmt:message key="jmsmanager.common.protocol" /></th>
+            <th class="DarkBackground" align="center"><fmt:message key="jmsmanager.common.port" /></th>
+            <th class="DarkBackground" align="center"><fmt:message key="jmsmanager.common.state"/></th>
+            <th class="DarkBackground" align="center"><fmt:message key="jmsmanager.common.actions"/></th>
           </tr>
 <c:set var="backgroundClass" value='MediumBackground'/>
 <c:forEach var="info" items="${connectors}">
@@ -57,26 +59,26 @@
                  <portlet:param name="mode" value="stop" />
                  <portlet:param name="brokerURI" value="${info.brokerURI}" />
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
-               </portlet:actionURL>">stop</a>
+               </portlet:actionURL>"><fmt:message key="jmsmanager.common.stop"/></a>
                </c:when>
                <c:otherwise>
                <a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="start" />
                  <portlet:param name="brokerURI" value="${info.brokerURI}" />
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
-               </portlet:actionURL>">start</a>
+               </portlet:actionURL>"><fmt:message key="jmsmanager.common.start"/></a>
                </c:otherwise>
              </c:choose>
                <a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="edit" />
                  <portlet:param name="brokerURI" value="${info.brokerURI}" />
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
-               </portlet:actionURL>">edit</a>
+               </portlet:actionURL>"><fmt:message key="jmsmanager.common.edit"/></a>
                <a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="delete" />
                  <portlet:param name="brokerURI" value="${info.brokerURI}" />
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
-               </portlet:actionURL>" onClick="return confirm('Are you sure you want to delete ${info.connectorName}?');">delete</a>
+               </portlet:actionURL>" onClick="return confirm('<fmt:message key="jmsmanager.server.connector.normal.confirmDelete"><fmt:param value="${info.connectorName}"/></fmt:message>');"><fmt:message key="jmsmanager.common.delete"/></a>
              </td>
           </tr>
 </c:forEach>
@@ -85,13 +87,15 @@
 
 <!-- Links to add new connectors -->
 <c:forEach var="info" items="${brokers}">
-<p>Add connector to ${info.brokerName}:</p>
+<p><fmt:message key="jmsmanager.server.connector.normal.addConnectorTo"><fmt:param value="${info.brokerName}"/></fmt:message>:</p>
 <ul>
 <c:forEach var="protocol" items="${protocols}">
 <li><a href="<portlet:actionURL portletMode="view">
            <portlet:param name="mode" value="new" />
            <portlet:param name="brokerURI" value="${info.brokerURI}" />
            <portlet:param name="protocol" value="${protocol}" />
-         </portlet:actionURL>">Add new <b>${protocol}</b> listener</a></li>
+         </portlet:actionURL>"><fmt:message key="jmsmanager.server.connector.normal.addNewParaListener" >
+         <fmt:param  value="${protocol}"/>
+         </fmt:message></a></li>
 </c:forEach>
 </c:forEach>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/help.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/help.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/help.jsp Sun Jan 13 23:16:30 2008
@@ -14,5 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<p>Shows the available JMS brokers</p>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
+<p><fmt:message key="jmsmanager.server.help.title" /></p>
 <p>&nbsp;</p>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/normal.jsp Sun Jan 13 23:16:30 2008
@@ -16,18 +16,20 @@
 --%>
 <%@ 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="activemq"/>
 <portlet:defineObjects/>
 
-<p>The JMS brokers available in the server are:</p>
+<p><fmt:message key="jmsmanager.server.normal.title" />:</p>
 
 <!-- Show existing connectors -->
-<c:if test="${empty(brokers)}">There are no JMS brokers defined</c:if>
+<c:if test="${empty(brokers)}"><fmt:message key="jmsmanager.server.normal.noJMSBrokers"/></c:if>
 <c:if test="${!empty(brokers)}">
 <table width="50%">
   <tr><td style="padding: 0 20px"></td></tr>
           <tr>
-            <th class="DarkBackground">Name</th>
-            <th class="DarkBackground" align="center">State</th>
+            <th class="DarkBackground"><fmt:message key="jmsmanager.common.name"/></th>
+            <th class="DarkBackground" align="center"><fmt:message key="jmsmanager.common.state"/></th>
 <!--
             <th class="DarkBackground" align="center">Actions</th>
 -->
@@ -79,5 +81,5 @@
 <br />
 <a href="<portlet:actionURL portletMode="view">
            <portlet:param name="mode" value="new" />
-         </portlet:actionURL>">Add new JMS Broker</a>
+         </portlet:actionURL>"><fmt:message key="jmsmanager.server.normal.addJMSBroker"/></a>
 -->

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/statistics.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/statistics.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/statistics.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/statistics.jsp Sun Jan 13 23:16:30 2008
@@ -16,6 +16,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
 <br>
@@ -23,46 +25,49 @@
 <br><br>
  <table width="100%">
         <tr>
-           <th colspan="2"> Statisctic for <c:out value="${statistics.destinationName}"/></th>
+           <th colspan="2"> <fmt:message key="jmsmanager.common.statiscticFor" >
+           <fmt:param value="${statistics.destinationName}"/>
+           </fmt:message>
+           </th>
         </tr>
         <tr>
-            <td width="250">Description</td>
+            <td width="250"><fmt:message key="jmsmanager.common.description"/></td>
             <td width="200"><c:out value="${statistics.description}"/></td>
         </tr>
         <tr>
-            <td width="250">Current Depth</td>
+            <td width="250"><fmt:message key="jmsmanager.common.currentDepth" /></td>
             <td width="200"><c:out value="${statistics.currentDepth}"/></td>
         </tr>
         <tr>
-            <td width="250">Open Output Count</td>
+            <td width="250"><fmt:message key="jmsmanager.common.openOutputCount" /></td>
             <td width="200"><c:out value="${statistics.openOutputCount}"/></td>
         </tr>
         <tr>
-            <td width="250">Open Input Count</td>
+            <td width="250"><fmt:message key="jmsmanager.common.openInputCount" /></td>
             <td width="200"><c:out value="${statistics.openInputCount}"/></td>
         </tr>
         <tr>
-            <td width="250">Inhibit Get</td>
+            <td width="250"><fmt:message key="jmsmanager.common.inhibitGet" /></td>
             <td width="200"><c:out value="${statistics.inhibitGet}"/></td>
         </tr>
         <tr>
-            <td width="250">Inhibit Put</td>
+            <td width="250"><fmt:message key="jmsmanager.common.inhibitPut" /></td>
             <td width="200"><c:out value="${statistics.inhibitPut}"/></td>
         </tr>
         <tr>
-            <td width="250">Sharable</td>
+            <td width="250"><fmt:message key="jmsmanager.common.sharable" /></td>
             <td width="200"><c:out value="${statistics.sharable}"/></td>
         </tr>
         <tr>
-            <td width="250">Maximum Depth</td>
+            <td width="250"><fmt:message key="jmsmanager.common.maximumDepth" /></td>
             <td width="200"><c:out value="${statistics.maximumDepth}"/></td>
         </tr>
         <tr>
-            <td width="250">Trigger Control</td>
+            <td width="250"><fmt:message key="jmsmanager.common.triggerControl" /></td>
             <td width="200"><c:out value="${statistics.triggerControl}"/></td>
         </tr>
         <tr>
-            <td width="250">Maximum Message Length</td>
+            <td width="250"><fmt:message key="jmsmanager.common.maximumMessageLength" /></td>
             <td width="200"><c:out value="${statistics.maximumMessageLength}"/></td>
         </tr>
 </table>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/view.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/view.jsp Sun Jan 13 23:16:30 2008
@@ -16,6 +16,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
 <br>
@@ -34,22 +36,22 @@
 </c:if>
 <tr class="DarkBackground">
   <th>
-     Message Destination Name
+     <fmt:message key="jmsmanager.common.messageDestinationName" />
   </th>
   <th>
-     Physical Name
+     <fmt:message key="jmsmanager.common.physicalName" />
   </th>
   <th>
-     Type
+     <fmt:message key="jmsmanager.common.type"/>
   </th>
   <th>
-     Application Name
+     <fmt:message key="jmsmanager.common.applicationName" />
   </th>
   <th>
-     Module Name
+     <fmt:message key="jmsmanager.common.moduleName" />
   </th>
   <th>
-     Actions
+     <fmt:message key="jmsmanager.common.actions"/>
   </th>
 </tr>
   <c:set var="backgroundClass" value='MediumBackground'/>
@@ -84,18 +86,18 @@
         <tr>
          <td>
         <c:if test="${destination.removable}">
-         <a href="<portlet:actionURL portletMode="view"><portlet:param name="processaction" value="removeDestination"/><portlet:param name="destinationConfigURI" value="${destination.configURI}"/><portlet:param name="destinationType" value="${destination.type}"/></portlet:actionURL>">remove </a>
+         <a href="<portlet:actionURL portletMode="view"><portlet:param name="processaction" value="removeDestination"/><portlet:param name="destinationConfigURI" value="${destination.configURI}"/><portlet:param name="destinationType" value="${destination.type}"/></portlet:actionURL>"><fmt:message key="jmsmanager.common.remove"/> </a>
          </c:if>
          </td>
          <!--a href="<portlet:actionURL portletMode="view"><portlet:param name="processaction" value="statistics"/><portlet:param name="destinationName" value="${destination.name}"/><portlet:param name="destinationType" value="${destination.type}"/></portlet:actionURL>">statistics</a-->
          <td>
         <c:if test="${destination.viewable}">
-         <a href="<portlet:renderURL portletMode="view"><portlet:param name="processAction" value="viewMessages"/><portlet:param name="destinationName" value="${destination.name}"/><portlet:param name="destinationApplicationName" value="${destination.applicationName}"/><portlet:param name="destinationModuleName" value="${destination.moduleName}"/><portlet:param name="destinationType" value="${destination.type}"/></portlet:renderURL>">view messages</a>
+         <a href="<portlet:renderURL portletMode="view"><portlet:param name="processAction" value="viewMessages"/><portlet:param name="destinationName" value="${destination.name}"/><portlet:param name="destinationApplicationName" value="${destination.applicationName}"/><portlet:param name="destinationModuleName" value="${destination.moduleName}"/><portlet:param name="destinationType" value="${destination.type}"/></portlet:renderURL>"><fmt:message key="jmsmanager.common.viewMessages" /></a>
          </c:if>
          </td>
          <td>
         <c:if test="${destination.viewable}">
-         <a href="<portlet:renderURL portletMode="view"><portlet:param name="processAction" value="viewDLQ"/><portlet:param name="destinationName" value="${destination.name}"/><portlet:param name="destinationApplicationName" value="${destination.applicationName}"/><portlet:param name="destinationModuleName" value="${destination.moduleName}"/><portlet:param name="destinationType" value="${destination.type}"/></portlet:renderURL>">view DLQ</a></td>
+         <a href="<portlet:renderURL portletMode="view"><portlet:param name="processAction" value="viewDLQ"/><portlet:param name="destinationName" value="${destination.name}"/><portlet:param name="destinationApplicationName" value="${destination.applicationName}"/><portlet:param name="destinationModuleName" value="${destination.moduleName}"/><portlet:param name="destinationType" value="${destination.type}"/></portlet:renderURL>"><fmt:message key="jmsmanager.common.viewDLQ" /></a></td>
          </c:if>
         </tr>        
         </table>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/viewDLQ.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/viewDLQ.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/viewDLQ.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/viewDLQ.jsp Sun Jan 13 23:16:30 2008
@@ -21,21 +21,23 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 
 <br>
 
-<strong>Dead Letter Queue Name: </strong><%=request.getAttribute("dlqname")%>
+<strong><fmt:message key="jmsmanager.viewDLQ.deadLetterQueueName" />: </strong><%=request.getAttribute("dlqname")%>
 <br>
 <table cellpadding="1" width="100%">     
     <tr>
-        <td class="DarkBackground" align="center"><b>Priority</b></td>
-        <td class="DarkBackground" align="center"><b>MessageID</b></td>
-        <td class="DarkBackground" align="center"><b>Destination</b></td>
-        <td class="DarkBackground" align="center"><b>Timestamp</b></td>
-        <td class="DarkBackground" align="center"><b>Expiration</b></td>            
-        <td class="DarkBackground" align="center"><b>Type</b></td>
-        <td class="DarkBackground" align="center"><b>ReplyTo</b></td>
-        <td class="DarkBackground" align="center"><b>CorrelationID</b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.priority" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.messageID" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.destination" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.timestamp" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.expiration" /></b></td>            
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.type"/></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.replyTo" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.correlationID" /></b></td>
     </tr>
     <c:choose>
         <c:when test="${fn:length(messages) > 0}"> 
@@ -63,11 +65,11 @@
            </c:when>
         <c:otherwise>
         <tr>    
-            <td colspan="8" align="center">No messages in dead letter queue.</td>
+            <td colspan="8" align="center"><fmt:message key="jmsmanager.viewDLQ.noMessages" /></td>
         </tr>
            </c:otherwise>
     </c:choose>
         <tr>    
-            <td colspan="8" align="center"><a href="<portlet:renderURL/>">Back</a> <a href="">Refresh</a></td>
+            <td colspan="8" align="center"><a href="<portlet:renderURL/>"><fmt:message key="jmsmanager.common.back"/></a> <a href=""><fmt:message key="jmsmanager.common.refresh"/></a></td>
         </tr>
 </table>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/viewmessages.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/viewmessages.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/viewmessages.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/viewmessages.jsp Sun Jan 13 23:16:30 2008
@@ -21,18 +21,20 @@
 <%@ 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/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 
 <br>
 <table cellpadding="1" width="100%">     
     <tr>
-        <td class="DarkBackground" align="center"><b>Priority</b></td>
-        <td class="DarkBackground" align="center"><b>MessageID</b></td>
-        <td class="DarkBackground" align="center"><b>Destination</b></td>
-        <td class="DarkBackground" align="center"><b>Timestamp</b></td>
-        <td class="DarkBackground" align="center"><b>Expiration</b></td>            
-        <td class="DarkBackground" align="center"><b>Type</b></td>
-        <td class="DarkBackground" align="center"><b>ReplyTo</b></td>
-        <td class="DarkBackground" align="center"><b>CorrelationID</b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.priority" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.messageID" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.destination" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.timestamp" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.expiration" /></b></td>            
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.type"/></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.replyTo" /></b></td>
+        <td class="DarkBackground" align="center"><b><fmt:message key="jmsmanager.common.correlationID" /></b></td>
     </tr>
     <c:choose>
         <c:when test="${fn:length(messages) > 0}"> 
@@ -60,11 +62,11 @@
            </c:when>
         <c:otherwise>
         <tr>    
-            <td colspan="8" align="center">No messages in destination.</td>
+            <td colspan="8" align="center"><fmt:message key="jmsmanager.viewmessages.jsp.noMessagesInDest" /></td>
         </tr>
            </c:otherwise>
     </c:choose>
         <tr>    
-            <td colspan="8" align="center"><a href="<portlet:renderURL/>">Back</a> <a href="">Refresh</a></td>
+            <td colspan="8" align="center"><a href="<portlet:renderURL/>"><fmt:message key="jmsmanager.common.back"/></a> <a href=""><fmt:message key="jmsmanager.common.refresh"/></a></td>
         </tr>
 </table>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destination.jsp Sun Jan 13 23:16:30 2008
@@ -17,9 +17,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
-<p><b>JMS Resource Group</b> -- Configure Destination</p>
+<p><fmt:message key="jmswizard.destination.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -61,19 +63,18 @@
     <table border="0">
     <!-- ENTRY FIELD: Admin Object Name -->
       <tr>
-        <th><div align="right">Message Destination Name:</div></th>
+        <th><div align="right"><fmt:message key="jmswizard.destination.messageDestinationName" />:</div></th>
         <td><input name="destination.${data.currentDestinationID}.name" type="text" size="20" value="${data.currentDestination.name}" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>A unique name for the connection factory; used to refer to this connection
-            factory when mapping resource references from application components.</td>
+        <td><fmt:message key="jmswizard.common.connectionFactoryExp" /></td>
       </tr>
 
     <!-- ENTRY FIELD: Config Properties -->
 <c:if test="${!empty(provider.adminObjectDefinitions[data.destinationType].configProperties)}">
       <tr>
-        <th colspan="2">Destination Configuration Settings</th>
+        <th colspan="2"><fmt:message key="jmswizard.destination.destinationConfSettings" /></th>
       </tr>
   <c:forEach var="prop" items="${provider.adminObjectDefinitions[data.destinationType].configProperties}" varStatus="status">
       <c:set var="index" value="instance-config-${status.index}" />
@@ -92,7 +93,7 @@
         <td></td>
         <td>
             <input type="hidden" name="nextAction" value="review" />
-            <input type="submit" value="Next" />
+            <input type="submit" value='<fmt:message key="jmswizard.common.next"/>' />
         </td>
       </tr>
     </table>
@@ -100,7 +101,9 @@
 <!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
 
 
-<p><b>Current Status for JMS Resource Group <c:out value="${data.instanceName}" /></b></p>
+<p><b><fmt:message key="jmswizard.common.currentStatusForJMSResourceGroup" >
+<fmt:param value="${data.instanceName}"  />
+</fmt:message></b></p>
 <ul>
   <li><c:out value="${data.connectionFactoryCount}" /> Connection Factor<c:choose><c:when test="${data.connectionFactoryCount == 1}">y</c:when><c:otherwise>ies</c:otherwise></c:choose>
       <c:if test="${data.connectionFactoryCount > 0}">
@@ -109,7 +112,7 @@
                   <li>
                       <c:choose>
                           <c:when test="${empty(factory.instanceName)}">
-                              <i>In Process</i>
+                              <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
                               <c:out value="${factory.instanceName}" />
@@ -127,7 +130,7 @@
                   <li>
                       <c:choose>
                           <c:when test="${empty(dest.name)}">
-                              <i>In Process</i>
+                              <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
                               <c:out value="${dest.name}" />
@@ -143,4 +146,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="jmswizard.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp Sun Jan 13 23:16:30 2008
@@ -17,9 +17,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
-<p><b>JMS Resource Group</b> -- Select Destination Type</p>
+<p><fmt:message key="jmswizard.destinationType.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -58,7 +60,7 @@
     <table border="0">
     <!-- ENTRY FIELD: Destination Type -->
       <tr>
-        <th><div align="right">JMS Destination Type:</div></th>
+        <th><div align="right"><fmt:message key="jmswizard.destinationType.JMSDestinationType" />:</div></th>
         <td>
           <select name="destinationType">
         <c:forEach var="dest" items="${provider.adminObjectDefinitions}" varStatus="status">
@@ -69,21 +71,22 @@
       </tr>
       <tr>
         <td></td>
-        <td>This resource adapter declares several possible destination interfaces.
-            Select the desired interface type for this destination.
+        <td><fmt:message key="jmswizard.destinationType.selectDesiredInterfacetype" />
         </td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" /></td>
+        <td><input type="submit" value='<fmt:message key="jmswizard.common.next"/>'/></td>
       </tr>
     </table>
 </form>
 <!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
 
 
-<p><b>Current Status for JMS Resource Group <c:out value="${data.instanceName}" /></b></p>
+<p><b><fmt:message key="jmswizard.common.currentStatusForJMSResourceGroup" >
+<fmt:param value="${data.instanceName}"  />
+</fmt:message></b></p>
 <ul>
   <li><c:out value="${data.connectionFactoryCount}" /> Connection Factor<c:choose><c:when test="${data.connectionFactoryCount == 1}">y</c:when><c:otherwise>ies</c:otherwise></c:choose>
       <c:if test="${data.connectionFactoryCount > 0}">
@@ -92,7 +95,7 @@
                   <li>
                       <c:choose>
                           <c:when test="${empty(factory.instanceName)}">
-                              <i>In Process</i>
+                              <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
                               <c:out value="${factory.instanceName}" />
@@ -110,7 +113,7 @@
                   <li>
                       <c:choose>
                           <c:when test="${empty(dest.name)}">
-                              <i>In Process</i>
+                              <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
                               <c:out value="${dest.name}" />

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp Sun Jan 13 23:16:30 2008
@@ -17,9 +17,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
-<p><b>JMS Resource Group</b> -- Configure Connection Factory</p>
+<p><fmt:message key="jmswizard.factory.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -61,18 +63,17 @@
     <table border="0">
     <!-- ENTRY FIELD: Factory Instance Name -->
       <tr>
-        <th><div align="right">Connection Factory Name:</div></th>
+        <th><div align="right"><fmt:message key="jmswizard.common.connectionFactoryName" />:</div></th>
         <td><input name="factory.${data.currentFactoryID}.instanceName" type="text" size="20" value="${data.currentFactory.instanceName}" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>A unique name for the connection factory; used to refer to this connection
-            factory when mapping resource references from application components.</td>
+        <td><fmt:message key="jmswizard.common.connectionFactoryExp" /></td>
       </tr>
 
     <!-- ENTRY FIELD: Transactions -->
       <tr>
-        <th><div align="right">Transaction Support:</div></th>
+        <th><div align="right"><fmt:message key="jmswizard.common.transactionSupport" />:</div></th>
         <td>
           <select name="factory.${data.currentFactoryID}.transaction">
             <option value="none"<c:if test="${data.currentFactory.transaction eq 'none'}"> selected</c:if>>None</option>
@@ -83,53 +84,53 @@
       </tr>
       <tr>
         <td></td>
-        <td>Which JMS interface this connection factory should support.</td>
+        <td><fmt:message key="jmswizard.common.transactionSupportExp" /></td>
       </tr>
 
     <tr>
-      <th colspan="2">Connection Pool Parameters</th>
+      <th colspan="2"><fmt:message key="jmswizard.common.connectionPoolParameters" /></th>
     </tr>
   <!-- ENTRY FIELD: Min Size -->
     <tr>
-      <th><div align="right">Pool Min Size:</div></th>
+      <th><div align="right"><fmt:message key="jmswizard.common.poolMinSize" />:</div></th>
       <td><input name="factory.${data.currentFactoryID}.poolMinSize" type="text" size="5" value="${data.currentFactory.poolMinSize}"></td>
     </tr>
     <tr>
       <td></td>
-      <td>The minimum number of connections in the pool.  Leave blank for default.</td>
+      <td><fmt:message key="jmswizard.common.poolMinSizeExp" /></td>
     </tr>
   <!-- ENTRY FIELD: Max Size -->
     <tr>
-      <th><div align="right">Pool Max Size:</div></th>
+      <th><div align="right"><fmt:message key="jmswizard.common.poolMaxSize" />:</div></th>
       <td><input name="factory.${data.currentFactoryID}.poolMaxSize" type="text" size="5" value="${data.currentFactory.poolMaxSize}"></td>
     </tr>
     <tr>
       <td></td>
-      <td>The maximum number of connections in the pool.  Leave blank for default.</td>
+      <td><fmt:message key="jmswizard.common.poolMaxSizeExp" /></td>
     </tr>
   <!-- ENTRY FIELD: Blocking Timeout -->
     <tr>
-      <th><div align="right">Blocking Timeout:</div></th>
+      <th><div align="right"><fmt:message key="jmswizard.common.blockingTimeout"/>:</div></th>
       <td><input name="factory.${data.currentFactoryID}.poolBlockingTimeout" type="text" size="7" value="${data.currentFactory.poolBlockingTimeout}"> (in milliseconds)</td>
     </tr>
     <tr>
       <td></td>
-      <td>The length of time a caller will wait for a connection.  Leave blank for default.</td>
+      <td><fmt:message key="jmswizard.common.blockingTimeoutExp" /></td>
     </tr>
   <!-- ENTRY FIELD: Idle timeout -->
     <tr>
-      <th><div align="right">Idle Timeout:</div></th>
+      <th><div align="right"><fmt:message key="jmswizard.common.idleTimeout"/>:</div></th>
       <td><input name="factory.${data.currentFactoryID}.poolIdleTimeout" type="text" size="5" value="${data.currentFactory.poolIdleTimeout}"> (in minutes)</td>
     </tr>
     <tr>
       <td></td>
-      <td>How long a connection can be idle before being closed.  Leave blank for default.</td>
+      <td> <fmt:message key="jmswizard.common.idleTimeoutExp" /></td>
     </tr>
 
     <!-- ENTRY FIELD: Config Properties -->
 <c:if test="${!empty(provider.connectionDefinitions[data.factoryType].configProperties)}">
       <tr>
-        <th colspan="2">Connection Factory Configuration Settings</th>
+        <th colspan="2"><fmt:message key="jmswizard.common.connectionFactoryConfigurationSettings" /></th>
       </tr>
   <c:forEach var="prop" items="${provider.connectionDefinitions[data.factoryType].configProperties}" varStatus="status">
       <c:set var="index" value="instance-config-${status.index}" />
@@ -148,7 +149,7 @@
         <td></td>
         <td>
             <input type="hidden" name="nextAction" value="review" />
-            <input type="submit" value="Next" />
+            <input type="submit" value='<fmt:message key="jmswizard.common.next"/>' />
         </td>
       </tr>
     </table>
@@ -156,7 +157,9 @@
 <!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
 
 
-<p><b>Current Status for JMS Resource Group <c:out value="${data.instanceName}" /></b></p>
+<p><b><fmt:message key="jmswizard.common.currentStatusForJMSResourceGroup" >
+<fmt:param value="${data.instanceName}"  />
+</fmt:message></b></p>
 <ul>
   <li><c:out value="${data.connectionFactoryCount}" /> Connection Factor<c:choose><c:when test="${data.connectionFactoryCount == 1}">y</c:when><c:otherwise>ies</c:otherwise></c:choose>
       <c:if test="${data.connectionFactoryCount > 0}">
@@ -165,7 +168,7 @@
                   <li>
                       <c:choose>
                           <c:when test="${empty(factory.instanceName)}">
-                              <i>In Process</i>
+                              <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
                               <c:out value="${factory.instanceName}" />
@@ -183,7 +186,7 @@
                   <li>
                       <c:choose>
                           <c:when test="${empty(dest.name)}">
-                              <i>In Process</i>
+                              <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
                               <c:out value="${dest.name}" />

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factoryType.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factoryType.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factoryType.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factoryType.jsp Sun Jan 13 23:16:30 2008
@@ -17,9 +17,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
-<p><b>JMS Resource Group</b> -- Select Connection Factory Type</p>
+<p><fmt:message key="jmswizard.factoryType.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -58,7 +60,7 @@
     <table border="0">
     <!-- ENTRY FIELD: Connection Factory Type -->
       <tr>
-        <th><div align="right">JMS Factory Type:</div></th>
+        <th><div align="right"><fmt:message key="jmswizard.common.JMSFactoryType" />:</div></th>
         <td>
           <select name="factoryType">
         <c:forEach var="factory" items="${provider.connectionDefinitions}" varStatus="status">
@@ -69,21 +71,22 @@
       </tr>
       <tr>
         <td></td>
-        <td>This resource adapter declares several possible connection factory interfaces.
-            Select the desired interface type for this connection factory.
+        <td><fmt:message key="jmswizard.common.selectJMSFactoryType" />
         </td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" /></td>
+        <td><input type="submit" value='<fmt:message key="jmswizard.common.next"/>' /></td>
       </tr>
     </table>
 </form>
 <!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
 
 
-<p><b>Current Status for JMS Resource Group <c:out value="${data.instanceName}" /></b></p>
+<p><b><fmt:message key="jmswizard.common.currentStatusForJMSResourceGroup" >
+<fmt:param value="${data.instanceName}"  />
+</fmt:message></b></p>
 <ul>
   <li><c:out value="${data.connectionFactoryCount}" /> Connection Factor<c:choose><c:when test="${data.connectionFactoryCount == 1}">y</c:when><c:otherwise>ies</c:otherwise></c:choose>
       <c:if test="${data.connectionFactoryCount > 0}">
@@ -92,7 +95,7 @@
                   <li>
                       <c:choose>
                           <c:when test="${empty(factory.instanceName)}">
-                              <i>In Process</i>
+                              <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
                               <c:out value="${factory.instanceName}" />
@@ -110,7 +113,7 @@
                   <li>
                       <c:choose>
                           <c:when test="${empty(dest.name)}">
-                              <i>In Process</i>
+                              <i><fmt:message key="jmswizard.common.inProcess"/></i>
                           </c:when>
                           <c:otherwise>
                               <c:out value="${dest.name}" />
@@ -126,4 +129,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="jmswizard.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp Sun Jan 13 23:16:30 2008
@@ -16,12 +16,14 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
-<p>This page lists all the available JMS Resource Groups.</p>
+<p><fmt:message key="jmswizard.list.title" /></p>
 
 <c:choose>
-  <c:when test="${empty(resources)}"><p><i>There are no JMS Resource Groups defined</i></p></c:when>
+  <c:when test="${empty(resources)}"><p><i><fmt:message key="jmswizard.list.noJMSResourceGroups" /></i></p></c:when>
   <c:otherwise>
 <!--
 <p>For each resource listed, you can click the <b>usage</b> link to see examples of how
@@ -33,11 +35,11 @@
             <td colspan="5" style="padding-top: 10px"><b><c:out value="${resource.name}"/> (<c:out value="${resource.configurationName}"/>)</b></td>
         </tr>
         <tr>
-          <th class="DarkBackground">Type</th>
-          <th class="DarkBackground">Name</th>
-          <th class="DarkBackground" align="center">Deployed As</th>
-          <th class="DarkBackground" align="center">State</th>
-          <th class="DarkBackground" align="center">Actions</th>
+          <th class="DarkBackground"><fmt:message key="jmswizard.common.type"/></th>
+          <th class="DarkBackground"><fmt:message key="jmswizard.common.name"/></th>
+          <th class="DarkBackground" align="center"><fmt:message key="jmswizard.common.deployedAs"/></th>
+          <th class="DarkBackground" align="center"><fmt:message key="jmswizard.common.state"/></th>
+          <th class="DarkBackground" align="center"><fmt:message key="jmswizard.common.actions"/></th>
         </tr>
         <c:set var="backgroundClass" value='MediumBackground'/>
         <c:forEach var="factory" items="${resource.connectionFactories}">
@@ -50,15 +52,15 @@
                 </c:otherwise>
             </c:choose>
             <tr>
-              <td class="${backgroundClass}">Connection Factory</td>
+              <td class="${backgroundClass}"><fmt:message key="jmswizard.common.connFactory" /> </td>
               <td class="${backgroundClass}">${factory.name}</td>
               <td class="${backgroundClass}">
                 <c:choose>
                   <c:when test="${empty resource.parentName}">
-                    Server-wide
+                    <fmt:message key="jmswizard.list.serverWide" /> 
                   </c:when>
                   <c:otherwise>
-                    Application-scoped
+                   <fmt:message key="jmswizard.list.applicationScoped" /> 
                   </c:otherwise>
                 </c:choose>
               </td>
@@ -96,10 +98,10 @@
               <td class="${backgroundClass}">
                 <c:choose>
                   <c:when test="${empty resource.parentName}">
-                    Server-wide
+                    <fmt:message key="jmswizard.list.serverWide" /> 
                   </c:when>
                   <c:otherwise>
-                    Application-scoped
+                    <fmt:message key="jmswizard.list.applicationScoped" /> 
                   </c:otherwise>
                 </c:choose>
               </td>
@@ -139,7 +141,7 @@
 </c:forEach>
   <li><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list-after" />
-            </portlet:actionURL>">For another JMS provider...</a></li>
+            </portlet:actionURL>"><fmt:message key="jmswizard.list.forAnotherJMSProvider" /> </a></li>
 <%--
   <li><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="startImport" />

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

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/provider.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/provider.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/provider.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/provider.jsp Sun Jan 13 23:16:30 2008
@@ -17,9 +17,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> 
+<fmt:setBundle basename="activemq"/> 
 <portlet:defineObjects/>
 
-<p><b>JMS Resource Group</b> -- Select JMS Provider RAR</p>
+<p><fmt:message key="jmswizard.provider.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>">
@@ -27,7 +29,7 @@
     <table border="0">
     <!-- ENTRY FIELD: JMS Connection RAR -->
       <tr>
-        <th><div align="right">JMS Provider RAR:</div></th>
+        <th><div align="right"><fmt:message key="jmswizard.provider.JMSProviderRAR" />:</div></th>
         <td>
           <select name="rar">
             <option></option>
@@ -39,15 +41,13 @@
       </tr>
       <tr>
         <td></td>
-        <td>The Resource Adapter RAR that can be used to connect to the JMS provider
-            in question.  This RAR should be installed under GERONIMO/repository/ in
-            order for it to appear in this list.
+        <td><fmt:message key="jmswizard.provider.JMSProviderRARExp" />
         </td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
-        <td><input type="submit" value="Next" /></td>
+        <td><input type="submit" value='<fmt:message key="jmswizard.common.next"/>' /></td>
       </tr>
     </table>
 </form>
@@ -56,4 +56,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="jmswizard.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/raInstance.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/raInstance.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/raInstance.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/raInstance.jsp Sun Jan 13 23:16:30 2008
@@ -17,14 +17,13 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
-<p><b>JMS Resource Group</b> -- Configure Server Connection</p>
+<p><fmt:message key="jmswizard.raInstance.title" /></p>
 
-<p>The settings on this screen are different for each JMS provider, but they
-  generally configure connectivity to the JMS server.  Connection factories
-  or destinations you create in the next step typically use these settings to
-  communicate with the server.</p>
+<p><fmt:message key="jmswizard.raInstance.titleExp" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -60,18 +59,16 @@
     <table border="0">
     <!-- ENTRY FIELD: RA Instance Name -->
       <tr>
-        <th><div align="right">Resource Group Name:</div></th>
+        <th><div align="right"><fmt:message key="jmswizard.raInstance.resourceGroupName" />:</div></th>
         <td><input name="instanceName" type="text" size="20" value="${data.instanceName}" /></td>
       </tr>
       <tr>
         <td></td>
-        <td>A unique name for the resource adapter; used to generate the configuration name
-          for this resource group as well as to connect Message-Driven Beans to the JMS server
-          using the settings on this page.</td>
+        <td><fmt:message key="jmswizard.raInstance.resourceGroupNameExp" /></td>
       </tr>
     <!-- ENTRY FIELD: Config Properties -->
       <tr>
-        <th colspan="2">Basic Configuration Settings</th>
+        <th colspan="2"><fmt:message key="jmswizard.raInstance.basicConfigSettings" /></th>
       </tr>
   <c:forEach var="prop" items="${provider.instanceConfigProperties}" varStatus="status">
       <c:set var="index" value="instance-config-${status.index}" />
@@ -89,7 +86,7 @@
         <th><div align="right"></div></th>
         <td>
             <input type="hidden" name="nextAction" value="review" />
-            <input type="submit" value="Next" />
+            <input type="submit" value='<fmt:message key="jmswizard.common.next"/>' />
         </td>
       </tr>
     </table>
@@ -99,4 +96,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="jmswizard.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/status.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/status.jsp?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/status.jsp (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/status.jsp Sun Jan 13 23:16:30 2008
@@ -17,41 +17,36 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="activemq"/>
 <portlet:defineObjects/>
 
-<p><b>JMS Resource Group</b> -- Current Progress</p>
+<p><fmt:message key="jmswizard.status.title" /></p>
 
 <c:choose>
     <c:when test="${data.connectionFactoryCount == 0 && data.destinationCount == 0}">
-        <p>So far, you've entered the basic configuration information required for
-          a JMS resource group.  Now you can create connection factories and
-          destinations.  When you're finished adding connection factories and
-          destinations, you can review the Geronimo deployment plan for this JMS
-          resource group, or go ahead and deploy it.</p>
+        <p><fmt:message key="jmswizard.status.noFactoriesDestinations" /></p>
     </c:when>
     <c:otherwise>
-        <p>These are the connection factories and destinations you've added to the
-          JMS resource group so far.  When you're finished adding connection factories and
-          destinations, you can review the Geronimo deployment plan for this resource
-          group, or go ahead and deploy it.</p>
+        <p><fmt:message key="jmswizard.status.factoriesDestinationsAdded" /></p>
 
         <table border="0" width="100%">
-            <tr><th colspan="3">Resource Group <c:out value="${data.instanceName}"/></th></tr>
+            <tr><th colspan="3"><fmt:message key="jmswizard.status.resourceGroup" /> <c:out value="${data.instanceName}"/></th></tr>
             <tr>
-                <td class="DarkBackground">Type</td>
-                <td class="DarkBackground">Name</td>
-                <td class="DarkBackground">Interface</td>
+                <td class="DarkBackground"><fmt:message key="jmswizard.common.type"/></td>
+                <td class="DarkBackground"><fmt:message key="jmswizard.common.name"/></td>
+                <td class="DarkBackground"><fmt:message key="jmswizard.common.interface"/></td>
             </tr>
             <c:forEach var="factory" items="${data.connectionFactories}">
                 <tr>
-                    <td>Connection Factory</td>
+                    <td><fmt:message key="jmswizard.common.connFactory" /></td>
                     <td><c:out value="${factory.instanceName}" /></td>
                     <td><c:out value="${provider.connectionDefinitions[factory.factoryType].connectionFactoryInterface}" /></td>
                 </tr>
             </c:forEach>
             <c:forEach var="dest" items="${data.adminObjects}">
                 <tr>
-                    <td>Destination</td>
+                    <td><fmt:message key="jmswizard.common.destination" /></td>
                     <td><c:out value="${dest.name}" /></td>
                     <td><c:out value="${provider.adminObjectDefinitions[dest.destinationType].adminObjectInterface}" /></td>
                 </tr>
@@ -101,11 +96,11 @@
         <td></td>
         <td>
             <input type="hidden" name="nextAction" value="factoryType" />
-            <input type="submit" value="Add Connection Factory" />
-            <input type="button" value="Add Destination" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='destinationType';document.<portlet:namespace/>JMSForm.submit();return false;" />
+            <input type="submit" value='<fmt:message key="jmswizard.status.addConnFactory" />' />
+            <input type="button" value='<fmt:message key="jmswizard.status.addDestination" />' onclick="document.<portlet:namespace/>JMSForm.nextAction.value='destinationType';document.<portlet:namespace/>JMSForm.submit();return false;" />
 <c:if test="${data.connectionFactoryCount > 0 || data.destinationCount > 0}">
-            <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='plan';document.<portlet:namespace/>JMSForm.submit();return false;" />
-            <input type="button" value="Deploy Now" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='deploy';document.<portlet:namespace/>JMSForm.submit();return false;" />
+            <input type="button" value='<fmt:message key="jmswizard.status.showPlan" />'  onclick="document.<portlet:namespace/>JMSForm.nextAction.value='plan';document.<portlet:namespace/>JMSForm.submit();return false;" />
+            <input type="button" value='<fmt:message key="jmswizard.status.deployNow" />' onclick="document.<portlet:namespace/>JMSForm.nextAction.value='deploy';document.<portlet:namespace/>JMSForm.submit();return false;" />
 </c:if>
         </td>
       </tr>
@@ -116,4 +111,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="list-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="jmswizard.common.cancel"/></a></p>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties Sun Jan 13 23:16:30 2008
@@ -181,8 +181,8 @@
 consolebase.common.save            = Save
 consolebase.common.size            = Size
 consolebase.common.start           = Start
-consolebase.common.stop            = Stop
 consolebase.common.state           = State
+consolebase.common.stop            = Stop
 consolebase.common.type            = Type
 consolebase.common.uninstall       = Uninstall
 consolebase.common.update          = Update
@@ -197,12 +197,10 @@
 infomanager.svrInfoHelp.body                   = This page provides information about the uptime of the server and the resources being used by the JVM.
 infomanager.svrInfoNormal.architecture         = Architecture
 infomanager.svrInfoNormal.availableProcessors  = Available Processors
-infomanager.svrInfoNormal.startTime            = Start Time
-infomanager.svrInfoNormal.version              = Version
 infomanager.svrInfoNormal.cookiesMustBenabled  = Error: Cookies must be enabled
 infomanager.svrInfoNormal.currentMemoryUsed    = Current Memory Used
 infomanager.svrInfoNormal.java                 = Java
-infomanager.svrInfoNormal.javaVendor           = Vendor
+infomanager.svrInfoNormal.javaVendor           = Java Vendor
 infomanager.svrInfoNormal.javaVersion          = Java Version
 infomanager.svrInfoNormal.jvm                  = JVM
 infomanager.svrInfoNormal.locale               = Locale
@@ -212,9 +210,11 @@
 infomanager.svrInfoNormal.operatingSystem      = Operating System
 infomanager.svrInfoNormal.patchLevel           = Patch Level
 infomanager.svrInfoNormal.server               = Server
+infomanager.svrInfoNormal.startTime            = Geronimo Start Time
 infomanager.svrInfoNormal.totalMemoryAllocated = Total Memory Allocated
-infomanager.svrInfoNormal.upTime               = Up Time
+infomanager.svrInfoNormal.upTime               = Geronimo Up Time
 infomanager.svrInfoNormal.vendorInfo           = Vendor Information
+infomanager.svrInfoNormal.version              = Geronimo Version
 
 keystore.certificateDetails.backToKeystore     = Back to keystore
 keystore.certificateDetails.certificateInfo    = Certificate Info
@@ -530,36 +530,36 @@
 webmanager.connector.editHTTP.addNewListener         = Add new {0} listener for {1}
 webmanager.connector.help.content                    = The Connector Manager displays connections of all types and provide the capability to modify connections for this web server. \r\n
 webmanager.connector.normal.addNew                   = Add new
-webmanager.connector.normal.addNewListener           = =Add new {0} listener for {1}
-webmanager.connector.normal.connectorsFor            = =Connectors for {0}
+webmanager.connector.normal.addNewListener           = Add new {0} listener for {1}
+webmanager.connector.normal.connectorsFor            = Connectors for {0}
 webmanager.connector.normal.consoleNavailable        = Console application will not be available if {0} is stopped.  Stop {1} ?
-webmanager.connector.normal.noConnectorsDefined      = =There are no connectors defined for {0}
-webmanager.connector.normal.noWebContainers          = =There are no Web Containers defined
-webmanager.connector.normal.reallyDelete             = =Are you sure you want to delete {0} ?
-webmanager.help.disable                              = =disable
-webmanager.help.disableExplanation                   = =Turn off statistics gathering and return the user to the main page.
-webmanager.help.refreshExplanation                   = =Update the display with the latest statistics.
-webmanager.help.resetExplanation                     = =Reset all counts, totals, averages, etc., to 0 and start gathering statistics again.
-webmanager.help.title                                = =Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click on the enable link to monitor the performance of the Geronimo server.
-webmanager.normal.activeRequestCount                 = =Active Request Count
+webmanager.connector.normal.noConnectorsDefined      = There are no connectors defined for {0}
+webmanager.connector.normal.noWebContainers          = There are no Web Containers defined
+webmanager.connector.normal.reallyDelete             = Are you sure you want to delete {0} ?
+webmanager.help.disable                              = disable
+webmanager.help.disableExplanation                   = Turn off statistics gathering and return the user to the main page.
+webmanager.help.refreshExplanation                   = Update the display with the latest statistics.
+webmanager.help.resetExplanation                     = Reset all counts, totals, averages, etc., to 0 and start gathering statistics again.
+webmanager.help.title                                = Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click on the enable link to monitor the performance of the Geronimo server.
+webmanager.normal.activeRequestCount                 = Active Request Count
 webmanager.normal.avgTime                            = Avg Time (ms)
-webmanager.normal.connectionDuration                 = =Connection Duration
-webmanager.normal.connectionRequestCount             = =Connection Request Count
+webmanager.normal.connectionDuration                 = Connection Duration
+webmanager.normal.connectionRequestCount             = Connection Request Count
 webmanager.normal.count                              = Count
-webmanager.normal.current                            = =Current
+webmanager.normal.current                            = Current
 webmanager.normal.elapsedTime                        = Elapsed Time Since Collection Started (hh:mm:ss:SSS)
-webmanager.normal.high                               = =High
-webmanager.normal.low                                = =Low
+webmanager.normal.high                               = High
+webmanager.normal.low                                = Low
 webmanager.normal.maxTime                            = Max Time (ms)
 webmanager.normal.minTime                            = Min Time (ms)
-webmanager.normal.requestDuration                    = =Request Duration
-webmanager.normal.statistic                          = =Statistic
+webmanager.normal.requestDuration                    = Request Duration
+webmanager.normal.statistic                          = Statistic
 webmanager.normal.total1xxResp                       = Total 1xx Responses
 webmanager.normal.total2xxResp                       = Total 2xx Responses
 webmanager.normal.total3xxResp                       = Total 3xx Responses
 webmanager.normal.total4xxResp                       = Total 4xx Responses
 webmanager.normal.total5xxResp                       = Total 5xx Responses
-webmanager.normal.totalConnectionCount               = =Total Connection Count
+webmanager.normal.totalConnectionCount               = Total Connection Count
 webmanager.normal.totalErrorCount                    = Total Error Count
 webmanager.normal.totalRequestCount                  = Total Request Count
 webmanager.normal.totalTime                          = Total Time

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties?rev=611728&r1=611727&r2=611728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties Sun Jan 13 23:16:30 2008
@@ -181,8 +181,8 @@
 consolebase.common.save            = \u4FDD\u5B58
 consolebase.common.size            = \u5927\u5C0F
 consolebase.common.start           = \u542F\u52A8
-consolebase.common.stop            = \u505C\u6B62
 consolebase.common.state           = \u72B6\u6001
+consolebase.common.stop            = \u505C\u6B62
 consolebase.common.type            = \u7C7B\u578B
 consolebase.common.uninstall       = \u5378\u8F7D
 consolebase.common.update          = \u66F4\u65B0
@@ -197,13 +197,11 @@
 infomanager.svrInfoHelp.body                   = \u8FD9\u4E2A\u9875\u9762\u63D0\u4F9B\u4E86\u5173\u4E8E\u670D\u52A1\u5668\u6B63\u5E38\u8FD0\u884C\u65F6\u95F4\u548CJVM\u4F7F\u7528\u7684\u8D44\u6E90\u7684\u4FE1\u606F\u3002
 infomanager.svrInfoNormal.architecture         = \u67B6\u6784
 infomanager.svrInfoNormal.availableProcessors  = \u53EF\u7528\u5904\u7406\u5668
-infomanager.svrInfoNormal.startTime            = Start Time
-infomanager.svrInfoNormal.version              = Version
 infomanager.svrInfoNormal.cookiesMustBenabled  = \u9519\u8BEF\uFF1A\u5FC5\u987B\u542F\u7528Cookies\u3002
 infomanager.svrInfoNormal.currentMemoryUsed    = \u5F53\u524D\u5360\u6709\u5185\u5B58
 infomanager.svrInfoNormal.java                 = Java
 infomanager.svrInfoNormal.javaVendor           = \u5382\u5546
-infomanager.svrInfoNormal.javaVersion          = Java Version
+infomanager.svrInfoNormal.javaVersion          = Java\u7248\u672C
 infomanager.svrInfoNormal.jvm                  = JVM
 infomanager.svrInfoNormal.locale               = \u8BED\u8A00
 infomanager.svrInfoNormal.mostMemoryUsed       = \u6700\u591A\u5360\u6709\u5185\u5B58
@@ -212,9 +210,11 @@
 infomanager.svrInfoNormal.operatingSystem      = \u64CD\u4F5C\u7CFB\u7EDF
 infomanager.svrInfoNormal.patchLevel           = \u8865\u4E01\u7EA7\u522B
 infomanager.svrInfoNormal.server               = \u670D\u52A1\u5668
+infomanager.svrInfoNormal.startTime            = Geronimo\u542F\u52A8\u65F6\u95F4
 infomanager.svrInfoNormal.totalMemoryAllocated = \u603B\u5171\u5206\u914D\u5185\u5B58
-infomanager.svrInfoNormal.upTime               = \u8FD0\u884C\u65F6\u95F4
+infomanager.svrInfoNormal.upTime               = Geronimo\u8FD0\u884C\u65F6\u95F4
 infomanager.svrInfoNormal.vendorInfo           = \u5382\u5546\u4FE1\u606F
+infomanager.svrInfoNormal.version              = Geronimo\u7248\u672C
 
 keystore.certificateDetails.backToKeystore     = \u8FD4\u56DE\u5230\u5BC6\u94A5\u5B58\u50A8\u5E93
 keystore.certificateDetails.certificateInfo    = \u8BC1\u4E66\u4FE1\u606F
@@ -540,19 +540,19 @@
 webmanager.help.refreshExplanation                   = \u4F7F\u7528\u6700\u8FD1\u7684\u7EDF\u8BA1\u4FE1\u606F\u6765\u66F4\u65B0\u663E\u793A.=
 webmanager.help.resetExplanation                     = \u91CD\u7F6E\u6240\u6709\u7684\u603B\u8BA1\uFF0C\u5E73\u5747\u7B49\u6570\u503C\u4E3A0\uFF0C\u5E76\u518D\u6B21\u542F\u52A8\u7EDF\u8BA1\u529F\u80FD\u3002=
 webmanager.help.title                                = Geronimo\u63A7\u5236\u53F0\u4F1A\u6536\u96C6\u5173\u4E8EGeronimo\u63A7\u5236\u53F0\u63A5\u6536\u5230\u7684\u8BF7\u6C42\u6570\u76EE\uFF0C\u548C\u5230Geronimo\u670D\u52A1\u5668\u7684\u8FDE\u63A5\u6570\u8FD9\u4E9B\u7EDF\u8BA1\u4FE1\u606F\u3002\u70B9\u51FB"enable"\u94FE\u63A5\u6765\u76D1\u89C6Geronimo\u670D\u52A1\u5668\u7684\u6027\u80FD\u3002=
-webmanager.normal.activeRequestCount                 = \u6D3B\u52A8\u8BF7\u6C42\u6570=
+webmanager.normal.activeRequestCount                 = \u6D3B\u52A8\u8BF7\u6C42\u6570
 webmanager.normal.avgTime                            = \u5E73\u5747\u65F6\u95F4 (ms)
 webmanager.normal.connectionDuration                 = \u8FDE\u63A5\u6301\u7EED\u65F6\u95F4=
 webmanager.normal.connectionRequestCount             = \u8BF7\u6C42\u8FDE\u63A5\u6570=
 webmanager.normal.count                              = \u6570\u91CF
-webmanager.normal.current                            = \u5F53\u524D=
+webmanager.normal.current                            = \u5F53\u524D
 webmanager.normal.elapsedTime                        = \u5F00\u59CB\u6536\u96C6\u540E\u7ECF\u5386\u7684\u65F6\u95F4 (hh:mm:ss:SSS)
-webmanager.normal.high                               = \u6700\u9AD8=
-webmanager.normal.low                                = \u6700\u4F4E=
+webmanager.normal.high                               = \u6700\u9AD8
+webmanager.normal.low                                = \u6700\u4F4E
 webmanager.normal.maxTime                            = \u6700\u5927\u65F6\u95F4(ms)
 webmanager.normal.minTime                            = \u6700\u77ED\u65F6\u95F4 (ms)
-webmanager.normal.requestDuration                    = \u8BF7\u6C42\u6301\u7EED\u65F6\u95F4=
-webmanager.normal.statistic                          = \u7EDF\u8BA1=
+webmanager.normal.requestDuration                    = \u8BF7\u6C42\u6301\u7EED\u65F6\u95F4
+webmanager.normal.statistic                          = \u7EDF\u8BA1
 webmanager.normal.total1xxResp                       = Total 1xx Responses
 webmanager.normal.total2xxResp                       = Total 2xx Responses
 webmanager.normal.total3xxResp                       = Total 3xx Responses



Mime
View raw message