geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r742717 [1/3] - in /geronimo/server/branches/2.1/plugins: monitoring/mconsole-jetty/src/main/plan/ monitoring/mconsole-tomcat/src/main/plan/ monitoring/mconsole-war/ monitoring/mconsole-war/src/main/resources/ monitoring/mconsole-war/src/ma...
Date Mon, 09 Feb 2009 20:20:22 GMT
Author: gawor
Date: Mon Feb  9 20:20:21 2009
New Revision: 742717

URL: http://svn.apache.org/viewvc?rev=742717&view=rev
Log:
Port GERONIMO-4474 patches for 2.1. Patches provided by Kan Ogawa. Patches included: mconsole-jetty.patch, mconsole-tomcat.patch, mconsole-war.patch, plancreator-console-jetty.patch, plancreator-console-tomcat.patch, and plancreator-portlets.patch (GERONIMO-4485)

Added:
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/monitor-portlet.properties   (with props)
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties   (with props)
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/plancreator-portlet.properties   (with props)
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties   (with props)
Modified:
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/pom.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEdit.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml Mon Feb  9 20:20:21 2009
@@ -30,6 +30,14 @@
             <!--<name>MonitoringClientDS</name>-->
         <!--</pattern>-->
     <!--</resource-ref>-->
+
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean> 
+
     <gbean name="MonitoringPortlet" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Server/Monitoring</attribute>
         <attribute name="portletContext">/monitoring</attribute>

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml Mon Feb  9 20:20:21 2009
@@ -30,6 +30,14 @@
             <!--<name>MonitoringClientDS</name>-->
         <!--</pattern>-->
     <!--</resource-ref>-->
+
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean> 
+
     <gbean name="MonitoringPortlet" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Server/Monitoring</attribute>
         <attribute name="portletContext">/monitoring</attribute>

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/pom.xml?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/pom.xml Mon Feb  9 20:20:21 2009
@@ -89,6 +89,12 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo.jspc</groupId>

Added: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/monitor-portlet.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/monitor-portlet.properties?rev=742717&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/monitor-portlet.properties (added)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/monitor-portlet.properties Mon Feb  9 20:20:21 2009
@@ -0,0 +1,128 @@
+#=====================================================================
+#  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.
+#=====================================================================
+
+monitor.common.action             = Actions
+monitor.common.add                = Add
+monitor.common.added              = Added
+monitor.common.back               = Back
+monitor.common.cancel             = Cancel
+monitor.common.day                = days
+monitor.common.desc               = Description
+monitor.common.edit               = Edit
+monitor.common.editing            = Editing
+monitor.common.graph              = Graphs
+monitor.common.graphing           = Graphing
+monitor.common.home               = Home
+monitor.common.min                = min.
+monitor.common.minute             = minutes
+monitor.common.modified           = Last Modified
+monitor.common.name               = Name
+monitor.common.nav                = Navigation
+monitor.common.none               = none
+monitor.common.other              = Other
+monitor.common.ret                = To return to the main Monitoring panel select the "view" link from the header of this portlet.
+monitor.common.save               = Save
+monitor.common.seen               = Last Seen
+monitor.common.server             = Servers
+monitor.common.st                 = something
+monitor.common.unknown            = Unknown
+monitor.common.view               = Views
+monitor.edit.desc                 = This is the edit page for the Monitoring Portlet
+monitor.edit.msg01                = Click on 'Monitoring &rarr; Add Server'. Choose
+monitor.edit.msg02                = The Server 'localhost' will appear 'online' i.e. the monitoring console can talk to it.
+monitor.edit.msg03                = Enable data collection by clicking on 'Enable Query'.
+monitor.edit.msg04                = Click on 'localhost' to view live statistics for chosen MBeans. By default 4/5 Mbeans are chosen for statistics collection. Use '<b>x</b>' to remove MBeans from 'Statistics Collected'. Use '<b>+</b>' in 'Statistics Available' to add an MBean to 'Statistics Collected' MBeans.
+monitor.edit.msg05                = To plot a graph for a statistics click on a link in 'Live Statistics'.
+monitor.edit.msg06                = As an example choose 'JMV Heap Size Current'. Choose the following values
+monitor.edit.msg07                = must be a unique name
+monitor.edit.msg08                = The lable for the graph
+monitor.edit.msg09                = Y axis for the graph, e.g. JVM Heap - MB
+monitor.edit.msg10                = Save the graph using 'save'
+monitor.edit.msg11                = To plot a graph for bytes sent each interval click on 'BytesSent' for TomcatWebConnector.  Use the following values
+monitor.edit.msg12                = Y axis for the graph, e.g. Bytes Sent/sec
+monitor.edit.msg13                = i.e. the bytes sent during 5 minutes (300 sec)
+monitor.edit.msg14                = Hint : Try 'Request Count' for JettyWebConnector
+monitor.edit.msg15                = Create a view using 'Add view'. Select all the graphs and save the view.
+monitor.edit.msg16                = To see the graphs use 'Show this view'
+monitor.edit.stuff                = Edit stuff...
+monitor.graph.addGraph            = Add a new graph
+monitor.graph.asis                = As-is
+monitor.graph.change              = Change (Delta) in
+monitor.graph.createGraph         = Create a new graph
+monitor.graph.data                = Data series
+monitor.graph.deleteGraph         = Delete this graph
+monitor.graph.math                = Math operation
+monitor.graph.mbean               = Mbean
+monitor.graph.notExist            = Graph does not exist
+monitor.graph.selectMbeanFirst    = Select MBean First
+monitor.graph.selectOpFirst       = Select Operation First
+monitor.graph.selectServer        = Select Server
+monitor.graph.selectServerFirst   = Select Server First
+monitor.graph.server              = Server
+monitor.graph.showArchive         = Show Archive
+monitor.graph.time                = Timeframe
+monitor.graph.x                   = X Axis label
+monitor.graph.y                   = Y Axis label
+monitor.help.desc                 = The Monitoring Console is designed to monitor a geronimo instance running in a separate JVM. For a quick demo we will look inside the Geronimo instance the Monitoring Console is running on.
+monitor.help.title                = Welcome to Monitoring Console
+monitor.server.addServer          = Add a new server
+monitor.server.deleteServer       = Delete this server
+monitor.server.disable            = Disable
+monitor.server.disableQuery       = Disable Query
+monitor.server.disableServer      = Disable this server
+monitor.server.disabled           = Disabled
+monitor.server.enable             = Enable
+monitor.server.enableQuery        = Enable Query
+monitor.server.enableServer       = Enable this server
+monitor.server.hostname           = Hostname
+monitor.server.ip                 = IP
+monitor.server.liveStat           = Live Statistics
+monitor.server.modifyServer       = Modify this server
+monitor.server.notExist           = Server does not exist
+monitor.server.notExistOrDisabled = Server does not exist or is disabled
+monitor.server.offline            = Offline
+monitor.server.online             = Online
+monitor.server.port               = Port
+monitor.server.protocol           = Protocol
+monitor.server.pwd                = Password
+monitor.server.pwd2               = Password (verify)
+monitor.server.run                = running
+monitor.server.serverOffline      = SERVER IS OFFLINE
+monitor.server.snapshotDuration   = Snapshot Duration
+monitor.server.snapshotRetention  = Snapshot Retention
+monitor.server.snapshotThread     = Snapshot Thread
+monitor.server.statAvailable      = Statistics Available
+monitor.server.statCollected      = Statistics Collected
+monitor.server.statNA             = The statistics bean is not available now.
+monitor.server.statQuery          = Stat. Query
+monitor.server.status             = Status
+monitor.server.stopped            = stopped
+monitor.server.stopping           = Stopping...
+monitor.server.stoppingThread     = Stopping Thread...
+monitor.server.testSetting        = Test these settings
+monitor.server.username           = Username
+monitor.view.add                  = Add a new view
+monitor.view.create               = Create a new view
+monitor.view.created              = Created
+monitor.view.delete               = Delete this view
+monitor.view.disable              = Disable this view
+monitor.view.element              = Elements
+monitor.view.modified             = Modified
+monitor.view.modify               = Modify this view
+monitor.view.notExist             = View does not exist
+monitor.view.notExistOrDisabled   = View does not exist or is disabled
+monitor.view.show                 = Show this view

Propchange: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/monitor-portlet.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/monitor-portlet.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/monitor-portlet.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties?rev=742717&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties (added)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties Mon Feb  9 20:20:21 2009
@@ -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.
+#=====================================================================
+
+Monitoring = Monitoring

Propchange: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp Mon Feb  9 20:20:21 2009
@@ -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="org.apache.geronimo.monitoring.console.StatsGraph"%>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder"%>
 <%@ page import="java.util.Set"%>
@@ -31,6 +32,7 @@
 <%@ page import="java.sql.SQLException"%>
 <%@ page import="org.apache.geronimo.monitoring.console.util.*"%>
 <%@ page import="org.apache.geronimo.monitoring.console.MRCConnector"%>
+<fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects />
 
 <%
@@ -424,18 +426,18 @@
 	<tr>
 		<!-- Body -->
 		<td width="90%" align="left" valign="top">
-		<p><font face="Verdana" size="+1"> Add a Graph </font></p>
+		<p><font face="Verdana" size="+1"> <fmt:message key="monitor.graph.addGraph"/> </font></p>
 		<p>
 		<form onsubmit="return validate(<%=snapshotDuration/1000/60%>);"
 			name="addGraph" method="POST"
 			action="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="saveAddGraph"/></portlet:actionURL>">
 		<table cellpadding="1" cellspacing="1">
 			<tr>
-				<td>Server:</td>
+				<td><fmt:message key="monitor.graph.server"/>:</td>
 				<td>&nbsp;</td>
 				<td align="right"><select name="server_id"
 					onChange="updateMbeanList(); updateFormula();">
-					<option value="">-Select Server-</option>
+					<option value="">-<fmt:message key="monitor.graph.selectServer"/>-</option>
 				</select> <script type='text/javascript'>
     <% 
     for (int i = 1; i < serverIds.size()+1; i++)
@@ -448,70 +450,70 @@
 				<td></td>
 			</tr>
 			<tr>
-				<td>Name:</td>
+				<td><fmt:message key="monitor.common.name"/>:</td>
 				<td>&nbsp;</td>
 				<td align="right"><input type="text" name="name" value=""></td>
 				<td></td>
 			</tr>
 			<tr>
-				<td>Description:</td>
+				<td><fmt:message key="monitor.common.desc"/>:</td>
 				<td>&nbsp;</td>
 				<td align="right"><textarea rows="5" cols="50"
 					name="description"></textarea></td>
 				<td></td>
 			</tr>
 			<tr>
-				<td>X Axis label:</td>
+				<td><fmt:message key="monitor.graph.x"/>:</td>
 				<td>&nbsp;</td>
 				<td align="right"><input type="text" name="xlabel" value="" /></td>
 				<td></td>
 			</tr>
 			<tr>
-				<td>Y Axis label:</td>
+				<td><fmt:message key="monitor.graph.y"/>:</td>
 				<td>&nbsp;</td>
 				<td align="right"><input type="text" name="ylabel" value="" /></td>
 				<td></td>
 			</tr>
 			<tr>
-				<td>Timeframe:</td>
+				<td><fmt:message key="monitor.graph.time"/>:</td>
 				<td>&nbsp;</td>
 				<td align="right"><input type="text" width="5" size="4"
 					name="timeframe" onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)'
 					value="60" /></td>
-				<td>minutes</td>
+				<td><fmt:message key="monitor.common.minute"/></td>
 			</tr>
 			<tr>
-				<td>Mbean:</td>
+				<td><fmt:message key="monitor.graph.mbean"/>:</td>
 				<td>&nbsp;</td>
 				<td align="right"><select name="mbean"
 					onChange="updateDatanameList(); updateFormula();">
-					<option value="">-Select Server First-</option>
+					<option value="">-<fmt:message key="monitor.graph.selectServerFirst"/>-</option>
 				</select></td>
 				<td></td>
 			</tr>
 			<tr>
-				<td>Data series:</td>
+				<td><fmt:message key="monitor.graph.data"/>:</td>
 				<td>&nbsp;</td>
 				<td align="right"><select name="data1operation"
 					onchange="updateFormula();">
-					<option value="A" selected="selected">As-is</option>
-					<option value="D">Change (Delta) in</option>
+					<option value="A" selected="selected"><fmt:message key="monitor.graph.asis"/></option>
+					<option value="D"><fmt:message key="monitor.graph.change"/></option>
 				</select> <select name="dataname1" onchange="updateFormula();">
-					<option value="">-Select MBean First-</option>
+					<option value="">-<fmt:message key="monitor.graph.selectMbeanFirst"/>-</option>
 				</select></td>
 				<td></td>
 			</tr>
 			<tr>
-				<td>Math operation:</td>
+				<td><fmt:message key="monitor.graph.math"/>:</td>
 				<td>&nbsp;</td>
 				<td align="right"><select name="operation"
 					onChange="checkOtherMath(); updateFormula();">
-					<option value="" selected="selected">none</option>
+					<option value="" selected="selected"><fmt:message key="monitor.common.none"/></option>
 					<option value="+">+</option>
 					<option value="-">-</option>
 					<option value="*">*</option>
 					<option value="/">/</option>
-					<option value="other">Other</option>
+					<option value="other"><fmt:message key="monitor.common.other"/></option>
 				</select></td>
 				<td><input type="text" style="display: none;" width="6"
 					size="8" name="othermath"
@@ -519,15 +521,15 @@
 					onKeyPress='noAlphaMath(this); updateFormula();' value="" /></td>
 			</tr>
 			<tr>
-				<td>Data series 2:</td>
+				<td><fmt:message key="monitor.graph.data"/> 2:</td>
 				<td>&nbsp;</td>
 				<td align="right"><select name="data2operation"
 					disabled="disabled" onchange="updateFormula();">
-					<option value="A" selected="selected">As-is</option>
-					<option value="D">Change (Delta) in</option>
+					<option value="A" selected="selected"><fmt:message key="monitor.graph.asis"/></option>
+					<option value="D"><fmt:message key="monitor.graph.change"/></option>
 				</select> <select name="dataname2" disabled="disabled"
 					onchange="updateFormula(); checkNoData2();">
-					<option value="">-Select Operation First-</option>
+					<option value="">-<fmt:message key="monitor.graph.selectOpFirst"/>-</option>
 				</select> <script type='text/javascript'>
         updateMbeanList();
       </script></td>
@@ -536,12 +538,11 @@
 			<tr>
 				<td></td>
 				<td>&nbsp;</td>
-				<td align="right"><input type="checkbox" name="showArchive">Show
-				Archived</input></td>
+				<td align="right"><input type="checkbox" name="showArchive"><fmt:message key="monitor.graph.showArchive"/></td>
 				<td></td>
 			</tr>
 			<tr>
-				<td>Graphing:</td>
+				<td><fmt:message key="monitor.common.graphing"/>:</td>
 				<td colspan="2"><strong><span
 					id="formulaData1operation"></span> <span id="formulaDataname1"></span>
 				<span id="formulaOperation"></span> <span id="formulaData2operation"></span>
@@ -552,11 +553,11 @@
 			</tr>
 			<tr>
 				<td colspan="1" align="left">
-				<button type="button" value="Cancel"
-					onclick="javascript:history.go(-1)">Cancel</button>
+				<button type="button" value='<fmt:message key="monitor.common.cancel"/>'
+					onclick="javascript:history.go(-1)"><fmt:message key="monitor.common.cancel"/></button>
 				</td>
 				<td>&nbsp;</td>
-				<td colspan="1" align="right"><input type="submit" value="Add" /></td>
+				<td colspan="1" align="right"><input type="submit" value='<fmt:message key="monitor.common.add"/>' /></td>
 				<td></td>
 			</tr>
 		</table>
@@ -576,19 +577,19 @@
 			cellspacing="1" cellpadding="1">
 			<tr>
 				<td class="DarkBackground" align="left" nowrap><font
-					face="Verdana" size="+1">Navigation</font></td>
+					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>
+						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>">Views</a></li>
+						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>">Servers</a></li>
+						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>">Graphs</a></li>
+						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/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp Mon Feb  9 20:20:21 2009
@@ -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="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.Set" %>
@@ -29,6 +30,7 @@
 <%@ page import="java.sql.ResultSet" %>
 <%@ page import="java.sql.SQLException" %>
 <%@ page import="org.apache.geronimo.monitoring.console.util.*" %>
+<fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 
 <%
@@ -123,50 +125,50 @@
         <td width="90%" align="left" valign="top">
             <p>
             <font face="Verdana" size="+1">
-            Add a server
+            <fmt:message key="monitor.server.addServer"/>
             </font>
             </p>         
             <p>
   <form name="addServer" method="POST" action="<portlet:actionURL/>">
   <table cellpadding="1" cellspacing="1">
     <tr>
-      <td>Name:</td>
+      <td><fmt:message key="monitor.common.name"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="name" value=<%= "\"" + name + "\"" %>></td>
       <td></td>
     </tr>
     <tr>
-      <td>IP/Hostname:</td>
+      <td><fmt:message key="monitor.server.ip"/>/<fmt:message key="monitor.server.hostname"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="ip" value="<%=ip%>"/></td>
       <td></td>
     </tr>
     <tr>
-      <td>Protocol</td>
+      <td><fmt:message key="monitor.server.protocol"/></td>
       <td>&nbsp;</td>
       <td align="right"><input type="radio" name="protocol" onchange='setPort()' value="1" <%if (protocol.equals("1")){ %>checked="checked"<%} %>>EJB <input type="radio" name="protocol" onchange='setPort()' value="2" <%if (protocol.equals("2")){ %>checked="checked"<%} %>>JMX</td>
       <td></td>
     </tr>
     <tr>
-      <td>Port:</td>
+      <td><fmt:message key="monitor.server.port"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="port"  onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)' value="<%=port%>"/></td>
       <td></td>
     </tr>
     <tr>
-      <td>Username:</td>
+      <td><fmt:message key="monitor.server.username"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="username" value=<%= "\"" + username + "\"" %>/></td>
       <td></td>
     </tr>
     <tr>
-      <td>Password:</td>
+      <td><fmt:message key="monitor.server.pwd"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="password" name="password" value=<%= "\"" + password + "\"" %>/></td>
       <td></td>
     </tr>
     <tr>
-      <td>Password (verify):</td>
+      <td><fmt:message key="monitor.server.pwd2"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="password" name="password2" value=<%= "\"" + password2 + "\"" %>/></td>
       <td></td>
@@ -175,9 +177,9 @@
     <tr>
       <input type="hidden" name="mode" value="" />
       <input type="hidden" name="action" value="" />
-      <td colspan="1" align="left"><button type="button" value="Cancel" onclick="javascript:history.go(-1)">Cancel</button></td>
+      <td colspan="1" align="left"><button type="button" value='<fmt:message key="monitor.common.cancel"/>' onclick="javascript:history.go(-1)"><fmt:message key="monitor.common.cancel"/></button></td>
       <td>&nbsp;</td>
-      <td colspan="1" align="right"><input type="button" value="Add" onclick="document.addServer.action.value='saveAddServer'; document.addServer.mode.value='edit'; if(validate()) document.addServer.submit();" /></td>
+      <td colspan="1" align="right"><input type="button" value='<fmt:message key="monitor.common.add"/>' onclick="document.addServer.action.value='saveAddServer'; document.addServer.mode.value='edit'; if(validate()) document.addServer.submit();" /></td>
       <td></td>
     </tr>
   </table>
@@ -194,17 +196,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>   
@@ -219,14 +221,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 onclick="document.addServer.action.value='testAddServerConnection'; document.addServer.mode.value='edit'; if(validate()) document.addServer.submit();" href="#">Test these settings</a></li>
+                        <li><a onclick="document.addServer.action.value='testAddServerConnection'; document.addServer.mode.value='edit'; if(validate()) document.addServer.submit();" href="#"><fmt:message key="monitor.server.testSetting"/></a></li>
                         </ul>
                         &nbsp;<br />
                     </td>   

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp Mon Feb  9 20:20:21 2009
@@ -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="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.Set" %>
@@ -30,6 +31,7 @@
 <%@ page import="java.sql.ResultSet" %>
 <%@ page import="java.sql.SQLException" %>
 <%@ page import="org.apache.geronimo.monitoring.console.util.*" %>
+<fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 
 <%
@@ -84,24 +86,24 @@
         <td width="100%" align="left" valign="top">
             <p>
             <font face="Verdana" size="+1">
-            Adding a new view
+            <fmt:message key="monitor.view.add"/>
             </font>
             </p>         
             <p>
   <form onsubmit="return validate();" name="addView" method="POST" action="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="saveAddView"/></portlet:actionURL>">
   <table cellpadding="1" cellspacing="1">
     <tr>
-      <td>Name:</td>
+      <td><fmt:message key="monitor.common.name"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input size="50" type="text" name="name" value=""></td>
     </tr>
     <tr>
-      <td>Description:</td>
+      <td><fmt:message key="monitor.common.desc"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><textarea rows="5" cols="50" name="description"></textarea></td>
     </tr>
     <tr>
-      <td>Graphs:</td>
+      <td><fmt:message key="monitor.common.graph"/>:</td>
       <td>&nbsp;</td>
       <td align="right">
       <%
@@ -113,10 +115,10 @@
             <table cellpadding="1" cellspacing="1">
             <tr>
             <th width="5%"></th>
-            <th>Name</th>
-            <th>Timeframe</th>
-            <th width="20%">Server</th>
-            <th>Edit</th>
+            <th><fmt:message key="monitor.common.name"/></th>
+            <th><fmt:message key="monitor.graph.time"/></th>
+            <th width="20%"><fmt:message key="monitor.graph.server"/></th>
+            <th><fmt:message key="monitor.common.edit"/></th>
             </tr>
       <%
           while (rs.next())
@@ -129,7 +131,7 @@
             <tr>
             <td align="left" width="5%"><input type="checkbox" name="graph_ids" value="<%=rs.getString("graph_id")%>"></td>
             <td align="left"><a href="javascript: void(0)" onClick="openNewWindow('/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=rs.getString("graph_id")%>','graph','width=800,height=300','title=<%=rs.getString("name") %>')"><%=rs.getString("name") %></a></td>
-            <td align="left"><%=rs.getString("timeframe")%> min.</td>
+            <td align="left"><%=rs.getString("timeframe")%> <fmt:message key="monitor.common.min"/></td>
             <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value='<%=rs.getString("server_id")%>' /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
             <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value='<%=rs.getString("graph_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
             </tr>
@@ -145,9 +147,9 @@
     </tr>
     <tr><td colspan="2"><font size="-2">&nbsp;</font></td></tr>
     <tr>
-      <td colspan="1" align="left"><button type="button" value="Cancel" onclick="javascript:history.go(-1)">Cancel</button></td>
+      <td colspan="1" align="left"><button type="button" value='<fmt:message key="monitor.common.cancel"/>' onclick="javascript:history.go(-1)"><fmt:message key="monitor.common.cancel"/></button></td>
       <td>&nbsp;</td>
-      <td colspan="1" align="right"><input type="submit" value="Save" /></td>
+      <td colspan="1" align="right"><input type="submit" value='<fmt:message key="monitor.common.save"/>' /></td>
     </tr>
   </table>
   </form>
@@ -164,17 +166,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/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEdit.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEdit.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEdit.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEdit.jsp Mon Feb  9 20:20:21 2009
@@ -14,9 +14,10 @@
    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="monitor-portlet"/>
 <p><font face="Verdana" size="+1">
-<center><b>This is the edit page for the Monitoring Portlet</b></center>
+<center><b><fmt:message key="monitor.edit.desc"/></b></center>
 </font></p>
-<P>Edit stuff...</P>
-<P>To return to the main Monitoring panel select the "view" link
-from the header of this portlet.</P>
++<P><fmt:message key="monitor.edit.stuff"/></P>
++<P><fmt:message key="monitor.common.ret"/></P>

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp Mon Feb  9 20:20:21 2009
@@ -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="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.Set" %>
@@ -31,6 +32,7 @@
 <%@ page import="java.sql.SQLException" %>
 <%@ page import="org.apache.geronimo.monitoring.console.util.*" %>
 <%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
+<fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 
 <%
@@ -454,36 +456,36 @@
         <td width="90%" align="left" valign="top">
             <p>
             <font face="Verdana" size="+1">
-            Editing: <%=name%>
+            <fmt:message key="monitor.common.editing"/>: <%=name%>
             </font>
             </p>         
             <p>
    <form onsubmit="return validate(<%=snapshotDuration/1000/60%>);" name="editGraph" method="POST" action="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="saveEditGraph"/></portlet:actionURL>">
    <table cellpadding="1" cellspacing="1">
       <tr>
-      <td>Added:</td>
+      <td><fmt:message key="monitor.common.added"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><%=added%></td>
       <td></td>
     </tr>
     <tr>
-      <td>Last Modified:</td>
+      <td><fmt:message key="monitor.common.modified"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><%=modified%></td>
       <td></td>
     </tr>
     <tr>
-      <td>Last Seen:</td>
+      <td><fmt:message key="monitor.common.seen"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><%=last_seen%></td>
       <td></td>
     </tr>
    <tr>
-      <td>Server:</td>
+      <td><fmt:message key="monitor.graph.server"/>:</td>
       <td>&nbsp;</td>
       <td align="right">
     <select name="server_id" onChange="updateMbeanList(); updateFormula();">
-      <option value="">-Select Server-</option>
+      <option value="">-<fmt:message key="monitor.graph.selectServer"/>-</option>
     </select>    
     <script type='text/javascript'>
     <% 
@@ -498,84 +500,84 @@
       <td></td>
     </tr>
     <tr>
-      <td>Name:</td>
+      <td><fmt:message key="monitor.common.name"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="name" value="<%=name%>"></td>
       <td></td>
     </tr>
     <tr>
-      <td>Description:</td>
+      <td><fmt:message key="monitor.common.desc"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><textarea rows="5" cols="50" name="description"><%=description%></textarea></td>
       <td></td>
     </tr>
     <tr>
-      <td>X Axis label:</td>
+      <td><fmt:message key="monitor.graph.x"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="xlabel" value="<%=xlabel%>"/></td>
       <td></td>
     </tr>
     <tr>
-      <td>Y Axis label:</td>
+      <td><fmt:message key="monitor.graph.y"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="ylabel" value="<%=ylabel%>"/></td>
       <td></td>
     </tr>
     <tr>
-        <td>Timeframe:</td>
+        <td><fmt:message key="monitor.graph.time"/>:</td>
         <td>&nbsp;</td>
         <td align="right"><input type="text" width="5" size="4" name="timeframe" onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)' value="<%=timeframe%>"/></td>
         <td> minutes</td>
       </tr>
     <tr>
-      <td>Mbean:</td>
+      <td><fmt:message key="monitor.graph.mbean"/>:</td>
       <td>&nbsp;</td>
       <td align="right">
     <select name="mbean" onChange="updateDatanameList(); updateFormula();">
-      <option value="">-Select Server First-</option>
+      <option value="">-<fmt:message key="monitor.graph.selectServerFirst"/>-</option>
     </select>
     </td>
       <td></td>
     </tr>
     <tr>
-      <td>Data series:</td>
+      <td><fmt:message key="monitor.graph.data"/>:</td>
       <td>&nbsp;</td>
       <td align="right">
       <select name="data1operation" onchange="updateFormula();">
-        <option value="A" <%if (data1operation.equals("A")){  %>selected="selected"<%} %>>As-is</option>
-        <option value="D" <%if (data1operation.equals("D")){  %>selected="selected"<%} %>>Change (Delta) in</option>
-      </select>name
+        <option value="A" <%if (data1operation.equals("A")){  %>selected="selected"<%} %>><fmt:message key="monitor.graph.asis"/></option>
+        <option value="D" <%if (data1operation.equals("D")){  %>selected="selected"<%} %>><fmt:message key="monitor.graph.change"/></option>
+      </select><fmt:message key="monitor.common.name"/>
       <select name="dataname1" onchange="updateFormula();">
-        <option value="">-Select MBean First-</option>
+        <option value="">-<fmt:message key="monitor.graph.selectMbeanFirst"/>-</option>
       </select>
       </td>
       <td></td>
     </tr>
     <tr>
-      <td>Math operation:</td>
+      <td><fmt:message key="monitor.graph.math"/>:</td>
       <td>&nbsp;</td>
         <td align="right">
       <select name="operation" onChange="checkOtherMath(); updateFormula();">
-        <option value="" <%if (operation.equals("null") || operation.equals("") || operation == null){  %>selected="selected"<%} %>>none</option>
+        <option value="" <%if (operation.equals("null") || operation.equals("") || operation == null){  %>selected="selected"<%} %>><fmt:message key="monitor.common.none"/></option>
         <option value="+" <%if (operation.equals("+")){  %>selected="selected"<%} %>>+</option>
         <option value="-" <%if (operation.equals("-")){  %>selected="selected"<%} %>>-</option>
         <option value="*" <%if (operation.equals("*")){  %>selected="selected"<%} %>>*</option>
         <option value="/" <%if (operation.equals("/")){  %>selected="selected"<%} %>>/</option>
-        <option value="other" <%if (!operation.equals("null") && !operation.equals("+") && !operation.equals("-") && !operation.equals("*") && !operation.equals("/") && !operation.equals("") && operation != null){  %>selected="selected"<%} %>>Other</option>
+        <option value="other" <%if (!operation.equals("null") && !operation.equals("+") && !operation.equals("-") && !operation.equals("*") && !operation.equals("/") && !operation.equals("") && operation != null){  %>selected="selected"<%} %>><fmt:message key="monitor.common.other"/></option>
       </select>
       </td>
       <td><input type="text" <%if (!operation.equals("null") && !operation.equals("+") && !operation.equals("-") && !operation.equals("*") && !operation.equals("/") && !operation.equals("") && operation != null){  %><%} else {%>style="display: none;"<%}%> width="6" size="8" name="othermath" onKeyUp='noAlphaMath(this); updateFormula();' onKeyPress='noAlphaMath(this); updateFormula();' value="<%=operation %>"/></td>
     </tr>
     <tr>
-      <td>Data series 2:</td>
+      <td><fmt:message key="monitor.graph.data"/> 2:</td>
       <td>&nbsp;</td>
       <td align="right">
       <select name="data2operation" <%if (operation.equals("null") || operation.equals("") || operation == null){  %>disabled="disabled"<%} %> onchange="updateFormula();">
-        <option value="A" <%if (data2operation.equals("A")){  %>selected="selected"<%} %>>As-is</option>
-        <option value="D" <%if (data2operation.equals("D")){  %>selected="selected"<%} %>>Change (Delta) in</option>
+        <option value="A" <%if (data2operation.equals("A")){  %>selected="selected"<%} %>><fmt:message key="monitor.graph.asis"/></option>
+        <option value="D" <%if (data2operation.equals("D")){  %>selected="selected"<%} %>><fmt:message key="monitor.graph.change"/></option>
       </select>
       <select name="dataname2" <%if (operation.equals("null") || operation.equals("") || operation == null){  %>disabled="disabled"<%} %> onchange=" checkNoData2(); updateFormula();">
-        <option value="">-Select Operation First-</option>
+        <option value="">-<fmt:message key="monitor.graph.selectOpFirst"/>-</option>
       </select>
       <script type='text/javascript'>
         updateMbeanList();
@@ -588,19 +590,19 @@
         <td></td>
         <td>
             <% if(archive) { %>
-                <input type="checkbox" name="showArchive" checked>Show Archive</input>
+                <input type="checkbox" name="showArchive" checked><fmt:message key="monitor.graph.showArchive"/></input>
             <% } else { %>
-                <input type="checkbox" name="showArchive">Show Archive</input>
+                <input type="checkbox" name="showArchive"><fmt:message key="monitor.graph.showArchive"/></input>
             <% } %>
         </td>
         <td></td>
     </tr>
-    <tr><td>Graphing: </td><td colspan="2"><strong><span id="formulaData1operation"></span> <span id="formulaDataname1"></span> <span id="formulaOperation"></span> <span id="formulaData2operation"></span> <span id="formulaDataname2"></span></strong></td></tr>
+    <tr><td><fmt:message key="monitor.common.graphing"/>: </td><td colspan="2"><strong><span id="formulaData1operation"></span> <span id="formulaDataname1"></span> <span id="formulaOperation"></span> <span id="formulaData2operation"></span> <span id="formulaDataname2"></span></strong></td></tr>
     <tr><td colspan="3"><font size="-2">&nbsp;</font></td></tr>
     <tr>
-      <td colspan="1" align="left"><button type="button" value="Cancel" onclick="javascript:history.go(-1)">Cancel</button></td>
+      <td colspan="1" align="left"><button type="button" value='<fmt:message key="monitor.common.cancel"/>' onclick="javascript:history.go(-1)"><fmt:message key="monitor.common.cancel"/></button></td>
       <td>&nbsp;</td>
-      <td colspan="1" align="right"><input type="submit" value="Save" /></td>
+      <td colspan="1" align="right"><input type="submit" value='<fmt:message key="monitor.common.save"/>' /></td>
       <td></td>
     </tr>
   </table>
@@ -620,17 +622,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>   
@@ -641,14 +643,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="deleteGraph" /><portlet:param name="graph_id" value="<%=graph_id%>" /></portlet:actionURL>">Delete this graph</a></li>
+                            <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="deleteGraph" /><portlet:param name="graph_id" value="<%=graph_id%>" /></portlet:actionURL>"><fmt:message key="monitor.graph.deleteGraph"/></a></li>
                         </ul>
                         &nbsp;<br />
                     </td>   
@@ -667,10 +669,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">
-            Graph does not exist
+            <fmt:message key="monitor.graph.notExist"/>
             </font>
             </p>         
 
@@ -683,17 +685,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>   
@@ -704,14 +706,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="showAddGraph" /></portlet:actionURL>">Add a new graph</a></li>
+                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddGraph" /></portlet:actionURL>"><fmt:message key="monitor.graph.addGraph"/></a></li>
                         </ul>
                         &nbsp;<br />
                     </td>   

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp Mon Feb  9 20:20:21 2009
@@ -18,6 +18,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="org.apache.geronimo.monitoring.console.StatsGraph" %>
 <%@ page import="org.apache.geronimo.monitoring.console.GraphsBuilder" %>
 <%@ page import="java.util.Set" %>
@@ -33,7 +34,7 @@
 <%@ page import="org.apache.geronimo.monitoring.console.util.*" %>
 <%@ page import="org.apache.geronimo.monitoring.console.MRCConnector" %>
 <%@ page import="org.apache.geronimo.crypto.EncryptionManager" %>
-
+<fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 
 <%
@@ -200,50 +201,50 @@
         <td width="90%" align="left" valign="top">
             <p>
             <font face="Verdana" size="+1">
-            Editing: <%=name%> (<%=ip%>)
+            <fmt:message key="monitor.common.edit"/>: <%=name%> (<%=ip%>)
             </font>
             </p>         
             <p>
   <form name="editServer" method="POST" action="<portlet:actionURL/>">
   <table cellpadding="1" cellspacing="1">
     <tr>
-      <td>Added:</td>
+      <td><fmt:message key="monitor.common.added"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><%=added.substring(0,16)%></td>
       <td></td>
     </tr>
     <tr>
-      <td>Last Modified:</td>
+      <td><fmt:message key="monitor.common.modified"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><%=modified.substring(0,16)%></td>
       <td></td>
     </tr>
     <tr>
-      <td>Last Seen:</td>
+      <td><fmt:message key="monitor.common.seen"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><%=last_seen.substring(0,16)%></td>
       <td></td>
     </tr>
     <tr>
-      <td>Name:</td>
+      <td><fmt:message key="monitor.common.name"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="name" value=<%= "\"" + name + "\"" %>></td>
       <td></td>
     </tr>
     <tr>
-      <td>IP/Hostname:</td>
+      <td><fmt:message key="monitor.server.ip"/>/<fmt:message key="monitor.server.hostname"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="ip" value=<%= "\"" + ip + "\"" %>/></td>
       <td></td>
     </tr>
     <tr>
-      <td>Protocol</td>
+      <td><fmt:message key="monitor.server.protocol"/></td>
       <td>&nbsp;</td>
       <td align="right"><input type="radio" name="protocol" onchange='setPort()' value="1" <%if (protocol.equals("1")){ %>checked="checked"<%} %>>EJB <input type="radio" name="protocol" onchange='setPort()' value="2" <%if (protocol.equals("2")){ %>checked="checked"<%} %>>JMX</td>
       <td></td>
     </tr>
     <tr>
-      <td>Port:</td>
+      <td><fmt:message key="monitor.server.port"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="port" onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)' value=<%= "\"" + port + "\"" %>/></td>
       <td></td>
@@ -253,16 +254,16 @@
     {
     %>
     <tr>
-      <td>Snapshot Duration:</td>
+      <td><fmt:message key="monitor.server.snapshotDuration"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" width="5" size="4" name="snapshot" onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)' value="<%=snapshot%>"/></td>
-      <td> minutes</td>
+      <td> <fmt:message key="monitor.common.minute"/></td>
     </tr>
     <tr>
-      <td>Snapshot Retention:</td>
+      <td><fmt:message key="monitor.server.snapshotRetention"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" width="5" size="4" name="retention" onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)' value="<%=retention%>"/></td>
-      <td> days</td>
+      <td> <fmt:message key="monitor.common.day"/></td>
     </tr>
 
     <%
@@ -271,35 +272,35 @@
     {
     %>
         <tr>
-            <td>Snapshot Duration:</td>
+            <td><fmt:message key="monitor.server.snapshotDuration"/>:</td>
             <td>&nbsp;</td>
             <td align="right"><input type="text" width="5" size="4" name="snapshot" onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)' disabled="disabled" value="unknown"/></td>
-        <td> minutes</td>
+        <td> <fmt:message key="monitor.common.minute"/></td>
       </tr>
       <tr>
-          <td>Snapshot Retention:</td>
+          <td><fmt:message key="monitor.server.snapshotRetention"/>:</td>
           <td>&nbsp;</td>
           <td align="right"><input type="text" width="5" size="4" name="retention" onKeyUp='noAlpha(this)' onKeyPress='noAlpha(this)' disabled="disabled" value="unknown"/></td>
-      <td> days</td>
+      <td> <fmt:message key="monitor.common.day"/></td>
     </tr>
 
     <%
     }
     %>
     <tr>
-      <td>Username:</td>
+      <td><fmt:message key="monitor.server.username"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="username" value=<%= "\"" + username + "\"" %>/></td>
       <td></td>
     </tr>
     <tr>
-      <td>Password:</td>
+      <td><fmt:message key="monitor.server.pwd"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="password" name="password" value=<%= "\"" + password + "\"" %>/></td>
       <td></td>
     </tr>
     <tr>
-      <td>Password (verify):</td>
+      <td><fmt:message key="monitor.server.pwd2"/>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="password" name="password2" value=<%= "\"" + password2 + "\"" %>/></td>
       <td></td>
@@ -309,9 +310,9 @@
       <input type="hidden" name="mode" value="" />
       <input type="hidden" name="action" value="" />
       <input type="hidden" name="server_id" value=<%= "\"" + server_id + "\"" %> />
-      <td colspan="1" align="left"><button type="button" value="Cancel" onclick="javascript:history.go(-1)">Cancel</button></td>
+      <td colspan="1" align="left"><button type="button" value='<fmt:message key="monitor.common.cancel"/>' onclick="javascript:history.go(-1)"><fmt:message key="monitor.common.cancel"/></button></td>
       <td>&nbsp;</td>
-      <td colspan="1" align="right"><input type="button" value="Save" onclick="document.editServer.action.value='saveEditServer'; document.editServer.mode.value='edit'; if(validate()) document.editServer.submit();" /></td>
+      <td colspan="1" align="right"><input type="button" value='<fmt:message key="monitor.common.save"/>' onclick="document.editServer.action.value='saveEditServer'; document.editServer.mode.value='edit'; if(validate()) document.editServer.submit();" /></td>
       <td></td>
     </tr>
   </table>
@@ -327,17 +328,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>   
@@ -348,27 +349,27 @@
             <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 onclick="document.editServer.action.value='testEditServerConnection'; document.editServer.mode.value='edit'; if(validateTest()) document.editServer.submit();" href="#">Test these settings</a></li>
+                        <li><a onclick="document.editServer.action.value='testEditServerConnection'; document.editServer.mode.value='edit'; if(validateTest()) document.editServer.submit();" href="#"><fmt:message key="monitor.server.testSetting"/></a></li>
                         <% 
                         if(enabled) {
                         %>
-                            <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Disable this server</a></li>
+                            <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="disableEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><fmt:message key="monitor.server.disableServer"/></a></li>
                         <%
                         } else {
                         %>
-                            <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="enableEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Enable this server</a></li>
+                            <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="enableEditServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><fmt:message key="monitor.server.enableServer"/></a></li>
                         <%
                         }
                         %>
-                        <li><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="deleteServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>">Delete 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="deleteServer" /><portlet:param name="server_id" value="<%=server_id%>" /></portlet:actionURL>"><fmt:message key="monitor.server.deleteServer"/></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>   
@@ -388,10 +389,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
+            <fmt:message key="monitor.server.notExist"/>
             </font>
             </p>         
 
@@ -404,17 +405,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>   
@@ -425,14 +426,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>   



Mime
View raw message