geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r742700 [1/3] - in /geronimo/server/branches/2.1/plugins: activemq/activemq-portlets/src/main/resources/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/ console/console-base-portlets/src/main/resources/ console/console-ba...
Date Mon, 09 Feb 2009 19:43:17 GMT
Author: gawor
Date: Mon Feb  9 19:43:14 2009
New Revision: 742700

URL: http://svn.apache.org/viewvc?rev=742700&view=rev
Log:
Port GERONIMO-4474 patches for 2.1. Patches provided by Kan Ogawa. Patches included: activemq-portlets.patch, console-base-portlets.patch, plugin-portlets.patch, sysdb-portlets.patch, debugviews-portlets.patch, and console-portal-driver.patch (GERONIMO-4485)

Modified:
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/resources/activemq.properties
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
    geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/help.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
    geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
    geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/pluto.css
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/classes/login-modules.properties
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyConfirm.jsp
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/viewForDownload.jsp
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp
    geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp
    geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
    geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/help.jsp
    geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
    geronimo/server/branches/2.1/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
    geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase.properties
    geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp
    geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/resources/activemq.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/resources/activemq.properties?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/resources/activemq.properties (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/resources/activemq.properties Mon Feb  9 19:43:14 2009
@@ -44,7 +44,9 @@
 jmsmanager.common.addQueue_Topic                            = Add Queue/Topic
 jmsmanager.common.applicationName                           = Application Name
 jmsmanager.common.back                                      = Back
+jmsmanager.common.backToDest                                = Back To Destination List
 jmsmanager.common.broker                                    = Broker
+jmsmanager.common.cancel                                    = Cancel
 jmsmanager.common.clear                                     = Clear
 jmsmanager.common.correlationID                             = CorrelationID
 jmsmanager.common.create                                    = Create
@@ -179,6 +181,7 @@
 jmswizard.plan.deployCommandExp                         = 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:
 jmswizard.plan.deployJMSResource                        = Deploy JMS Resource
 jmswizard.plan.deploymentPlan                           = Deployment Plan
+jmswizard.plan.edit                                     = Edit Configuration
 jmswizard.plan.title                                    = <b>JMS Resource Group</b> -- Show Deployment Plan
 jmswizard.provider.JMSProviderRAR                       = JMS Provider RAR
 jmswizard.provider.JMSProviderRARExp                    = 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.

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/destinationType.jsp Mon Feb  9 19:43:14 2009
@@ -129,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/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/factory.jsp Mon Feb  9 19:43:14 2009
@@ -202,4 +202,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/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp Mon Feb  9 19:43:14 2009
@@ -130,7 +130,7 @@
 </c:choose>
 
 
-<p><b>Create a new JMS Resource Group:</b></p>
+<p><b><fmt:message key="jmswizard.list.createJMSResourceGroup" /></b></p>
 <ul>
 <c:forEach var="provider" items="${providers}">
 

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/plan.jsp Mon Feb  9 19:43:14 2009
@@ -69,7 +69,7 @@
         <td></td>
         <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="button" value='<fmt:message key="jmswizard.plan.edit" />' onclick="document.<portlet:namespace/>JMSForm.nextAction.value='review';document.<portlet:namespace/>JMSForm.submit();return false;" />
             <input type="submit" value='<fmt:message key="jmswizard.plan.deployJMSResource" />' />
         </td>
       </tr>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/resources/consolebase.properties Mon Feb  9 19:43:14 2009
@@ -16,6 +16,10 @@
 #=====================================================================
 # $Rev$ $Date$
 
+apache.javaSysNormal.etc                     = Etc
+apache.javaSysNormal.os                      = Operating System
+apache.javaSysNormal.usr                     = User
+apache.javaSysNormal.vm                      = Virtual Machine
 apache.jk.ajpPort.networkPort                = Network Port for AJP
 apache.jk.ajpPort.networkPortExplanation     = <tt>mod_jk</tt> talks to the Geronimo web container using a protocol called AJP.  Currently, you do not have an AJP protocol listener configured for the web container.  Select a network port here, and an AJP protocol listener will be added for you.
 apache.jk.ajpPort.title                      = <b>Apache mod_jk</b> -- AJP Port
@@ -43,7 +47,7 @@
 apache.jk.results.saveWhereOthwise           = This information should be added to the Apache configuration file.  This is often at a location such as <tt>/etc/httpd/conf/httpd.conf</tt>
 apache.jk.results.step1                      = Step 1: Configure Geronimo for AJP
 apache.jk.results.step2                      = Step 2: Install <tt>mod_jk</tt>
-apache.jk.results.step2_installUsingRPM      = On {0}, you can install <tt>mod_jk</tt> using an RPM.  This does not activate it in Apache,but it at least installs the binary in the right location.  To install, find the following RPM on your install media and run a command like this\uFF1A
+apache.jk.results.step2_installUsingRPM      = On {0}, you can install <tt>mod_jk</tt> using an RPM.  This does not activate it in Apache,but it at least installs the binary in the right location.  To install, find the following RPM on your install media and run a command like this\uff1a
 apache.jk.results.step3                      = Step 3: Create a <tt>workers.properties</tt> file
 apache.jk.results.step4                      = Step 4: Apache Configuration<h2>
 apache.jk.results.step5                      = Step 5: Restart Apache
@@ -131,21 +135,24 @@
 ca.listRequestsVerify.certRequestsAwaitingVerifyExp = This screen shows the certificate requests waiting for verification.
 ca.processCSR.pastePkcs10here                       = ...paste pkcs10 encoded certificate request here...
 ca.processCSR.summary                               = This screen lets you process Certificate Signing Request (CSR) text and view the details of the requestor.  Paste the content of CSR text file you received from the requestor and click on<i>Process CSR</i> button.  The next screen will show the details of the requestor and allow you to input information required to issue a certificate.
-ca.processCSR.title                                 = <b>Issue New Certificate</b> - Step 1: Process Certificate Signing Request (CSR)\r\n
+ca.processCSR.title                                 = <b>Issue New Certificate</b> - Step 1: Process Certificate Signing Request (CSR)
 ca.setupCA.summary                                  = On this screen you can enter the Certification Authority (CA) details, algorithm parameters for CA's keypair, algorithm for CA's self signed certificate and a password to protect the CA's private key. The next screen will let you review this information before generating the CA's keypair and self-signed certificate.
 ca.setupCA.title                                    = <b>Setup Certification Authority</b> - Step 1: Enter CA details
 ca.unlockCA.enterCAPrivateKeyPassword               = Enter the CA's private key password
 ca.unlockCA.summary                                 = This screen lets you unlock the CA by providing the password used to protect the CA's private key.  Once unlocked, the CA functions will be available.
+ca.viewCertificate.backToRequest                    = Back to Requests to be fulfilled
 ca.viewCertificate.enterSerialNumber                = Enter the serial number of the certificate to be viewed and click on <i>View Certificate</i> button.
 ca.viewCertificate.screenShows                      = This screen shows the details of a certificate issued by the CA.  The base64 encoded certificate text should be sent to the requestor as a reply to their Certificate Signing Request (CSR).
 
-configmanager.help.stopStart                     = Stop/Start
-configmanager.help.stopStartExp                  = The stop/start toggle can be clicked to stop or start an application. If the toggle says &quot;Stop&quot; the application is running so clicking on the Stop toggle will stop the application and vice versa.
-configmanager.help.title                         = This page lists the applications that have been installed in the server and whether they are running or stopped. There are four columns; two provide information and the other two allow user action. The first column indicates the state of the application, either &quot;stopped&quot; or &quot;running.&quot; The fourth column shows the configID of the application. The two remaining columns are:
-configmanager.help.uninstallExp                  = The uninstall link will undeploy/remove the application from Geronimo.
-configmanager.normal.childComponents             = Child Components
-configmanager.normal.componentName               = Component Name
-configmanager.normal.parentComponents            = Parent Components
+configmanager.help.stopStart            = Stop/Start
+configmanager.help.stopStartExp         = The stop/start toggle can be clicked to stop or start an application. If the toggle says &quot;Stop&quot; the application is running so clicking on the Stop toggle will stop the application and vice versa.
+configmanager.help.title                = This page lists the applications that have been installed in the server and whether they are running or stopped. There are four columns; two provide information and the other two allow user action. The first column indicates the state of the application, either &quot;stopped&quot; or &quot;running.&quot; The fourth column shows the configID of the application. The two remaining columns are:
+configmanager.help.uninstallExp         = The uninstall link will undeploy/remove the application from Geronimo.
+configmanager.normal.childComponents    = Child Components
+configmanager.normal.componentName      = Component Name
+configmanager.normal.expertMode         = Expert User (enable all actions on Geronimo Provided Components)
+configmanager.normal.parentComponents   = Parent Components
+configmanager.normal.showDependencyMode = Show parent and child components
 
 consolebase.common.JVMVersions     = JVM Versions
 consolebase.common.actions         = Actions
@@ -196,9 +203,14 @@
 consolebase.common.view            = View
 
 infomanager.javaSysHelp.body                   = This page displays the values of the system properties available to the server process.
+infomanager.javaSysNormal.etc                  = Etc
+infomanager.javaSysNormal.operatingSystem      = Operating System
+infomanager.javaSysNormal.user                 = User
+infomanager.javaSysNormal.virtualMachine       = Virtual Machine
 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.build                = Build
 infomanager.svrInfoNormal.cookiesMustBenabled  = Error: Cookies must be enabled
 infomanager.svrInfoNormal.currentMemoryUsed    = Current Memory Used
 infomanager.svrInfoNormal.java                 = Java
@@ -210,6 +222,12 @@
 infomanager.svrInfoNormal.node                 = Node
 infomanager.svrInfoNormal.notAvailable         = Not Yet Available
 infomanager.svrInfoNormal.operatingSystem      = Operating System
+infomanager.svrInfoNormal.os                   = Operating System
+infomanager.svrInfoNormal.os.arch              = Architecture
+infomanager.svrInfoNormal.os.locale            = Locale
+infomanager.svrInfoNormal.os.name              = Name
+infomanager.svrInfoNormal.os.patchlevel        = Patch Level
+infomanager.svrInfoNormal.os.version           = Version
 infomanager.svrInfoNormal.patchLevel           = Patch Level
 infomanager.svrInfoNormal.server               = Server
 infomanager.svrInfoNormal.startTime            = Start Time
@@ -217,16 +235,10 @@
 infomanager.svrInfoNormal.upTime               = Up Time
 infomanager.svrInfoNormal.vendorInfo           = Vendor Information
 infomanager.svrInfoNormal.version              = Version
-infomanager.svrInfoNormal.build			= Build
-infomanager.svrInfoNormal.os			= Operating System
-infomanager.svrInfoNormal.os.arch		= Architecture
-infomanager.svrInfoNormal.os.name		= Name
-infomanager.svrInfoNormal.os.version		= Version
-infomanager.svrInfoNormal.os.patchlevel		= Patch Level
-infomanager.svrInfoNormal.os.locale		= Locale
 
 keystore.certificateDetails.backToKeystore     = Back to keystore
 keystore.certificateDetails.certificateInfo    = Certificate Info
+keystore.certificateDetails.changeKeyPwd       = Change key password
 keystore.certificateDetails.criticalExt        = critical ext
 keystore.certificateDetails.deleteEntry        = Delete Entry
 keystore.certificateDetails.generateCSR        = Generate CSR
@@ -332,12 +344,12 @@
 logmanager.search.numberOfResultsCapped           = number of results capped
 logmanager.search.to                              = To
 logmanager.search.withExceptions                  = With Exceptions
+logmanager.viewhelp.filterResults                 = Filter results
 logmanager.viewhelp.filterResultsExplanationFrag1 = Allows the user to customize the filtering criteria. The user can display any line of the log file starting at the first line of the log file through the end. Note: A browser may limit how many lines can be displayed at once.
 logmanager.viewhelp.filterResultsExplanationFrag2 = The user may filter on the log level to display only log lines at that level.
 logmanager.viewhelp.filterResultsExplanationFrag3 = The user may also enter a string of text to search for.
 logmanager.viewhelp.introduction                  = This portlet displays the Geronimo server log and is helpful for debugging problems with the Geronimo Console and with deployed applications.
 logmanager.viewhelp.refreshExplanation            = Resets the filtering criteria to Geronimo Console's defaults and displays the latest 11 lines in the Geronimo log file.
-logmanager.viewhelp.filterResults                 = Filter results
 
 
 repository.help.addDependencyElement       = To use an artifact in an application, add a dependency element into it's deployment plan. For example, to use Castor XML add the following XML to the plan:
@@ -377,6 +389,7 @@
 securityrealmmanager.derby.users.help.usernameExp          = The username for the user.
 securityrealmmanager.derby.users.maximized.createNewUser   = Create New User
 securityrealmmanager.se.groups.addmaximized.addGroup       = ADD GROUP
+securityrealmmanager.se.groups.addmaximized.updateGroup    = UPDATE GROUP
 securityrealmmanager.se.groups.help.addNewGroupBtnExp      = Clicking this button will create the new group. If users had been put in the new group, clicking &quot;Add&quot; will create the new group with the selected users in it.
 securityrealmmanager.se.groups.help.cancelNewGroupBtnExp   = Cancel the current operation.
 securityrealmmanager.se.groups.help.title                  = This portlet lists all the Console Realm groups and allows the user to add, modify and delete them. To add a new group click on the &quot;Create New Group&quot; link and fill in the fields on that page. To modify an existing group, click on the group link and change the field(s) on the page. To delete a group, click on the &quot;Delete&quot; link to the right of the group to be deleted. <br>  <br>Clicking on the &quot;Create New Group&quot; link allows the user to add a new   group. The fields are defined as follows:
@@ -414,6 +427,7 @@
 threads.monitor.title                     = Thread pools statistics for {0}:
 
 webaccesslogmanager.common.authenticatedUser  = Authenticated User
+webaccesslogmanager.common.filterLog          = Filter Log
 webaccesslogmanager.common.from               = From (MM/DD/YYYY)
 webaccesslogmanager.common.ignoreDates        = Ignore Dates
 webaccesslogmanager.common.remoteAddress      = Remote Address
@@ -423,12 +437,12 @@
 webaccesslogmanager.common.to                 = To (MM/DD/YYYY)
 webaccesslogmanager.help.authenticatedUserExp = A username, such as &quot;system.&quot;
 webaccesslogmanager.help.fromTo               = From/To
-webaccesslogmanager.help.fromToExp            = Display log output from the dates specified.\r\n
+webaccesslogmanager.help.fromToExp            = Display log output from the dates specified.
 webaccesslogmanager.help.ignoreDatesExp       = If this checkbox is checked, filtering will not be done using the date. All log lines that match the other filtering criteria will be displayed regardless of the date.\r\n
-webaccesslogmanager.help.refreshExp           = Retrieves the latest lines from the log file while retaining the user's filtering criteria.\r\n
-webaccesslogmanager.help.remoteAddressExp     = A specific remote host can be entered in this field using it's IP address, e.g., 192.168.1.1.\r\n
-webaccesslogmanager.help.requestMethodExp     = This drop-down box allows the user to filter on &quot;ANY&quot;, &quot;POST&quot; and &quot;GET&quot; methods.\r\n
-webaccesslogmanager.help.requestedURIExp      = Filtering can be done on the Requested URI field by entering a URI, such as, http://localhost:8080/cviewer/jsp/viewclass.jsp\r\n
+webaccesslogmanager.help.refreshExp           = Retrieves the latest lines from the log file while retaining the user's filtering criteria.
+webaccesslogmanager.help.remoteAddressExp     = A specific remote host can be entered in this field using it's IP address, e.g., 192.168.1.1.
+webaccesslogmanager.help.requestMethodExp     = This drop-down box allows the user to filter on &quot;ANY&quot;, &quot;POST&quot; and &quot;GET&quot; methods.
+webaccesslogmanager.help.requestedURIExp      = Filtering can be done on the Requested URI field by entering a URI, such as, http://localhost:8080/cviewer/jsp/viewclass.jsp
 webaccesslogmanager.help.title                = This portlet displays and filters the Jetty log file. The Jetty log file contains HTTP accesses and messages from JSP and servlet applications that are running on Geronimo. By default this portlet displays the contents of the log file for the current date. The user can apply filtering criteria to view only data of interest. The user may enter information into any/all/none of the fields, which are defined next.
 webaccesslogmanager.view.container            = Container
 webaccesslogmanager.view.filterResults        = Filter results
@@ -445,148 +459,274 @@
 webaccesslogmanager.view.searchWebLog         = Search Web Log
 webaccesslogmanager.view.startResult          = Start Result
 
-webmanager.common.HTTPSAlgorithm                     = HTTPS Algorithm
-webmanager.common.HTTPSProtocol                      = HTTPS Protocol
-webmanager.common.SSLSettings                        = SSL Settings
-webmanager.common.acceptCount                        = AcceptCount
-webmanager.common.acceptCountExp                     = The maximum queue length for incoming connection requests when all possible request processing threads are in use. Any requests received when the queue is full will be refused. The default value is 10.
-webmanager.common.all                                = all
-webmanager.common.allowTrace                         = AllowTrace
-webmanager.common.bufferSize                         = BufferSize
-webmanager.common.bufferSizeExp                      = The size (in bytes) of the buffer to be provided for input streams created by this connector. By default, buffers of 2048 bytes will be provided.
-webmanager.common.ciphers                            = Ciphers
-webmanager.common.ciphersExp                         = A comma separated list of the encryption ciphers that may be used. If not specified, then any available cipher may be used.
-webmanager.common.clientAuthRequired                 = Client Auth Required
-webmanager.common.compressableMimeType               = CompressableMimeType
-webmanager.common.compressableMimeTypeExp            = The value is a comma separated list of MIME types for which HTTP compression may be used. The default value is text/html,text/xml,text/plain.
-webmanager.common.compression                        = Compression
-webmanager.common.compressionExp                     = The Connector may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the parameter is "off" (disable compression), "on" (allow compression, which causes text data to be compressed), "force" (forces compression in all cases), or a numerical integer value (which is equivalent to "on", but specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to "on" or more aggressive, the output will also be compressed. If not specified, this attribute is set to "off".
-webmanager.common.confirmPassword                    = Confirm Password
-webmanager.common.connectionLinger                   = ConnectionLinger
-webmanager.common.connectionLingerExp                = The number of milliseconds during which the sockets used by this Connector will linger when they are closed. The default value is -1 (socket linger is disabled).
-webmanager.common.connectionTimeout                  = ConnectionTimeout
-webmanager.common.connectionTimeoutExp               = The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be presented. The default value is 60000 (i.e. 60 seconds).
-webmanager.common.disableUploadTimeout               = DisableUploadTimeout
-webmanager.common.disableUploadTimeoutExp            = This flag allows the servlet container to use a different, longer connection timeout while a servlet is being executed, which in the end allows either the servlet a longer amount of time to complete its execution, or a longer timeout during data upload. If not specified, this attribute is set to "true".
-webmanager.common.emptySessionPath                   = EmptySessionPath
-webmanager.common.emptySessionPathExp                = If checked, all paths for session cookies will be set to /.\r\n
-webmanager.common.enableLookups                      = EnableLookups
-webmanager.common.enableLookupsExp                   = Check if you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client.  By default, DNS lookups are enabled.\r\n
-webmanager.common.fields                             = fields
-webmanager.common.host                               = Host
-webmanager.common.hostExp                            = 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)\r\n
-webmanager.common.keepAliveTimeout                   = KeepAliveTimeout
-webmanager.common.keepAliveTimeoutExp                = The number of milliseconds this Connector will wait, subsequent request before closing the connection. The default value is to use the value that has been set for the connectionTimeout.
-webmanager.common.keyStore                           = Key Store
-webmanager.common.keystoreFile                       = Keystore File
-webmanager.common.keystorePassword                   = Keystore Password\r\n
-webmanager.common.keystoreType                       = Keystore Type
-webmanager.common.list                               = list
-webmanager.common.listConnectors                     = List connectors
-webmanager.common.maxHttpHeaderSize                  = MaxHttpHeaderSize
-webmanager.common.maxHttpHeaderSizeExp               = The maximum size of the request and response HTTP header, specified in bytes. If not specified, this attribute is set to 4096 (4 KB).
-webmanager.common.maxKeepAliveRequests               = MaxKeepAliveRequests
-webmanager.common.maxKeepAliveRequestsExp            = The maximum number of HTTP requests which can be pipelined until the connection is closed by the server. Setting this attribute to 1 will disable HTTP/1.0 keep-alive, as well as HTTP/1.1 keep-alive and pipelining. Setting this to -1 will allow an unlimited amount of pipelined or keep-alive HTTP requests. If not specified, this attribute is set to 100.
-webmanager.common.maxPostSize                        = MaxPostSize
-webmanager.common.maxPostSizeExp                     = The maximum size in bytes of the POST which will be handled by the container FORM URL parameter parsing. The limit can be disabled by setting this attribute to a value less than or equal to 0. Default value is 2097152 (2 megabytes)
-webmanager.common.maxSavePostSize                    = MaxSavePostSize
-webmanager.common.maxSavePostSizeExp                 = The maximum size in bytes of the POST which will be saved/buffered by the container during FORM or CLIENT-CERT authentication. The limit can be disabled by setting this attribute to -1. Setting the attribute to zero will disable the saving of POST data during authentication . Default value is 4096 (4 kilobytes).
-webmanager.common.maxSpareThreads                    = MaxSpareThreads
-webmanager.common.maxSpareThreadsExp                 = The maximum number of unused request processing threads that will be allowed to exist until the thread pool starts stopping the unnecessary threads. The default value is 50.
-webmanager.common.maxThreads                         = Max Threads
-webmanager.common.maxThreadsExp                      = The maximum number of threads this connector should use to handle incoming requests\r\n
-webmanager.common.minSpareThreads                    = MinSpareThreads
-webmanager.common.minSpareThreadsExp                 = The number of request processing threads that will be created when this Connector is first started. The connector will also make sure it has the specified number of idle processing threads available. This attribute should be set to a value smaller than that set for maxThreads. The default value is 4.
-webmanager.common.minThreads                         = Min Threads
-webmanager.common.minThreadsExp                      = The minimum number of threads this connector should use to handle incoming requests
-webmanager.common.noCompressionUserAgents            = NoCompressionUserAgents
-webmanager.common.noCompressionUserAgentsExp         = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation. The default value is an empty String (regexp matching disabled).
-webmanager.common.portExp                            = The network port to bind to.
-webmanager.common.proxyName                          = ProxyName
-webmanager.common.proxyNameExp                       = If this Connector is being used in a proxy configuration, configure this attribute to specify the server name to be returned for calls to request.getServerName().
-webmanager.common.proxyPort                          = ProxyPort
-webmanager.common.proxyPortExp                       = If this Connector is being used in a proxy configuration, configure this attribute to specify the server port to be returned for calls to request.getServerPort().
-webmanager.common.redirectPort                       = RedirectPort
-webmanager.common.redirectPortExp                    = If this Connector is supporting non-SSL requests, and a request is received for which a matching <security-constraint> requires SSL transport, Catalina will automatically redirect the request to the port number specified here.
-webmanager.common.restrictedUserAgents               = RestrictedUserAgents
-webmanager.common.restrictedUserAgentsExp            = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. The default value is an empty String (regexp matching disabled).
-webmanager.common.server                             = Server
-webmanager.common.serverExp                          = The Server header for the http response. Unless your paranoid, you won't need this feature. (No offense.  The description is taken from Tomcat documentation.)
-webmanager.common.show                               = Show
-webmanager.common.showAllFieldsExp                   = Check this box to view and configure all attributes.  Uncheck to hide. Note: Hiding will not remove the field values.\r\n\r\n
-webmanager.common.socketBuffer                       = SocketBuffer
-webmanager.common.socketBufferExp                    = The size (in bytes) of the buffer to be provided for socket output buffering. -1 can be specified to disable the use of a buffer. By default, a buffers of 9000 bytes will be used.
-webmanager.common.strategy                           = Strategy
-webmanager.common.strategyExp                        = The thread pooling strategy which will be used. The default strategy does not use a master thread, but a more conventional strategy using a master listener thread can be used by setting "ms" as this attribute's value. The master strategy will work significantly better using the threadPriority attribute, which will apply only to the thread which listens on the server socket. This is set to lf by default.
-webmanager.common.string                             = String
-webmanager.common.tcpNoDelay                         = TcpNoDelay
-webmanager.common.tcpNoDelayExp                      = If checked, the TCP_NO_DELAY option will be set on the server socket, which improves performance under most circumstances.
-webmanager.common.threadPriority                     = ThreadPriority
-webmanager.common.threadPriorityExp                  = The priority of the request processing threads within the JVM. The default value is java.lang.Thread#NORM_PRIORITY. See the JavaDoc for the java.lang.Thread class for more details on what this priority means.
-webmanager.common.traceExp                           = Check to enable the TRACE HTTP method.\r\n
-webmanager.common.trustStore                         = Trust Store
-webmanager.common.truststoreFile                     = Truststore File
-webmanager.common.truststorePassword                 = Truststore Password
-webmanager.common.truststoreType                     = Truststore Type
-webmanager.common.uniqueName                         = Unique Name
-webmanager.common.uniqueNameExp                      = A name that is different than the name for any other web connectors in the server (no spaces in the name please)
-webmanager.common.uriEncoding                        = URIEncoding
-webmanager.common.uriEncodingExp                     = This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL. Default is ISO-8859-1.
-webmanager.common.useBodyEncodingForURI              = UseBodyEncodingForURI
-webmanager.common.useBodyEncodingForURIExp           = Check this if the encoding specified in contentType should be used for URI query parameters, instead of using the URIEncoding.
-webmanager.common.useIPVHosts                        = UseIPVHosts
-webmanager.common.useIPVHostsExp                     = Check this to cause Tomcat to use the IP address that the request was recieved on to determine the Host to send the request to.
-webmanager.common.xPoweredBy                         = XpoweredBy
-webmanager.common.xPoweredByExp                      = Check this to cause Tomcat to advertise support for the Servlet specification using the header recommended in the specification.
-webmanager.connector.editConnector.addNew            = Add a new {0}
-webmanager.connector.editConnector.editConnector     = Edit connector {0}
-webmanager.connector.editConnector.requiredAttribute = denotes a required attribute
-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.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.normal.avgTime                            = Avg Time (ms)
-webmanager.normal.connectionDuration                 = Connection Duration
-webmanager.normal.connectionRequestCount             = Connection Request Count
-webmanager.normal.count                              = Count
-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.maxTime                            = Max Time (ms)
-webmanager.normal.minTime                            = Min Time (ms)
-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.totalErrorCount                    = Total Error Count
-webmanager.normal.totalRequestCount                  = Total Request Count
-webmanager.normal.totalTime                          = Total Time
-
-welcome.welcomeMaximized.fragment1   = The welcome portlet is the first page that users see when they log in to the Administrative Console. It contains introductory information about the Administrative Console.\r\n\r\n
-welcome.welcomeMaximized.fragment2   = To return to the main Welcome panel select the "view" link from the header of this portlet.\r\n\r\n
-welcome.welcomeMaximized.title       = Welcome to the Apache Geronimo&#8482;<BR>Administration Console!
+webmanager.common.HTTPSAlgorithm                         = HTTPS Algorithm
+webmanager.common.HTTPSProtocol                          = HTTPS Protocol
+webmanager.common.SSLSettings                            = SSL Settings
+webmanager.common.acceptCount                            = AcceptCount
+webmanager.common.acceptCountExp                         = The maximum queue length for incoming connection requests when all possible request processing threads are in use. Any requests received when the queue is full will be refused. The default value is 10.
+webmanager.common.all                                    = all
+webmanager.common.allowTrace                             = AllowTrace
+webmanager.common.bufferSize                             = BufferSize
+webmanager.common.bufferSizeExp                          = The size (in bytes) of the buffer to be provided for input streams created by this connector. By default, buffers of 2048 bytes will be provided.
+webmanager.common.ciphers                                = Ciphers
+webmanager.common.ciphersExp                             = A comma separated list of the encryption ciphers that may be used. If not specified, then any available cipher may be used.
+webmanager.common.clientAuthRequired                     = Client Auth Required
+webmanager.common.compressableMimeType                   = CompressableMimeType
+webmanager.common.compressableMimeTypeExp                = The value is a comma separated list of MIME types for which HTTP compression may be used. The default value is text/html,text/xml,text/plain.
+webmanager.common.compression                            = Compression
+webmanager.common.compressionExp                         = The Connector may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the parameter is "off" (disable compression), "on" (allow compression, which causes text data to be compressed), "force" (forces compression in all cases), or a numerical integer value (which is equivalent to "on", but specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to "on" or more aggressive, the output will also be compressed. If not specified, this attribute is set to "off".
+webmanager.common.confirmPassword                        = Confirm Password
+webmanager.common.connectionLinger                       = ConnectionLinger
+webmanager.common.connectionLingerExp                    = The number of milliseconds during which the sockets used by this Connector will linger when they are closed. The default value is -1 (socket linger is disabled).
+webmanager.common.connectionTimeout                      = ConnectionTimeout
+webmanager.common.connectionTimeoutExp                   = The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be presented. The default value is 60000 (i.e. 60 seconds).
+webmanager.common.disableUploadTimeout                   = DisableUploadTimeout
+webmanager.common.disableUploadTimeoutExp                = This flag allows the servlet container to use a different, longer connection timeout while a servlet is being executed, which in the end allows either the servlet a longer amount of time to complete its execution, or a longer timeout during data upload. If not specified, this attribute is set to "true".
+webmanager.common.emptySessionPath                       = EmptySessionPath
+webmanager.common.emptySessionPathExp                    = If checked, all paths for session cookies will be set to /.
+webmanager.common.enableLookups                          = EnableLookups
+webmanager.common.enableLookupsExp                       = Check if you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client.  By default, DNS lookups are enabled.
+webmanager.common.fields                                 = fields
+webmanager.common.host                                   = Host
+webmanager.common.hostExp                                = 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)
+webmanager.common.keepAliveTimeout                       = KeepAliveTimeout
+webmanager.common.keepAliveTimeoutExp                    = The number of milliseconds this Connector will wait, subsequent request before closing the connection. The default value is to use the value that has been set for the connectionTimeout.
+webmanager.common.keyStore                               = Key Store
+webmanager.common.keystoreFile                           = Keystore File
+webmanager.common.keystorePassword                       = Keystore Password
+webmanager.common.keystoreType                           = Keystore Type
+webmanager.common.list                                   = list
+webmanager.common.listConnectors                         = List connectors
+webmanager.common.maxHttpHeaderSize                      = MaxHttpHeaderSize
+webmanager.common.maxHttpHeaderSizeExp                   = The maximum size of the request and response HTTP header, specified in bytes. If not specified, this attribute is set to 4096 (4 KB).
+webmanager.common.maxKeepAliveRequests                   = MaxKeepAliveRequests
+webmanager.common.maxKeepAliveRequestsExp                = The maximum number of HTTP requests which can be pipelined until the connection is closed by the server. Setting this attribute to 1 will disable HTTP/1.0 keep-alive, as well as HTTP/1.1 keep-alive and pipelining. Setting this to -1 will allow an unlimited amount of pipelined or keep-alive HTTP requests. If not specified, this attribute is set to 100.
+webmanager.common.maxPostSize                            = MaxPostSize
+webmanager.common.maxPostSizeExp                         = The maximum size in bytes of the POST which will be handled by the container FORM URL parameter parsing. The limit can be disabled by setting this attribute to a value less than or equal to 0. Default value is 2097152 (2 megabytes)
+webmanager.common.maxSavePostSize                        = MaxSavePostSize
+webmanager.common.maxSavePostSizeExp                     = The maximum size in bytes of the POST which will be saved/buffered by the container during FORM or CLIENT-CERT authentication. The limit can be disabled by setting this attribute to -1. Setting the attribute to zero will disable the saving of POST data during authentication . Default value is 4096 (4 kilobytes).
+webmanager.common.maxSpareThreads                        = MaxSpareThreads
+webmanager.common.maxSpareThreadsExp                     = The maximum number of unused request processing threads that will be allowed to exist until the thread pool starts stopping the unnecessary threads. The default value is 50.
+webmanager.common.maxThreads                             = Max Threads
+webmanager.common.maxThreadsExp                          = The maximum number of threads this connector should use to handle incoming requests
+webmanager.common.minSpareThreads                        = MinSpareThreads
+webmanager.common.minSpareThreadsExp                     = The number of request processing threads that will be created when this Connector is first started. The connector will also make sure it has the specified number of idle processing threads available. This attribute should be set to a value smaller than that set for maxThreads. The default value is 4.
+webmanager.common.minThreads                             = Min Threads
+webmanager.common.minThreadsExp                          = The minimum number of threads this connector should use to handle incoming requests
+webmanager.common.noCompressionUserAgents                = NoCompressionUserAgents
+webmanager.common.noCompressionUserAgentsExp             = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation. The default value is an empty String (regexp matching disabled).
+webmanager.common.port                                   = Port
+webmanager.common.portExp                                = The network port to bind to.
+webmanager.common.protocol                               = Protocol
+webmanager.common.proxyName                              = ProxyName
+webmanager.common.proxyNameExp                           = If this Connector is being used in a proxy configuration, configure this attribute to specify the server name to be returned for calls to request.getServerName().
+webmanager.common.proxyPort                              = ProxyPort
+webmanager.common.proxyPortExp                           = If this Connector is being used in a proxy configuration, configure this attribute to specify the server port to be returned for calls to request.getServerPort().
+webmanager.common.redirectPort                           = RedirectPort
+webmanager.common.redirectPortExp                        = If this Connector is supporting non-SSL requests, and a request is received for which a matching <security-constraint> requires SSL transport, Catalina will automatically redirect the request to the port number specified here.
+webmanager.common.restrictedUserAgents                   = RestrictedUserAgents
+webmanager.common.restrictedUserAgentsExp                = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. The default value is an empty String (regexp matching disabled).
+webmanager.common.server                                 = Server
+webmanager.common.serverExp                              = The Server header for the http response. Unless your paranoid, you won't need this feature. (No offense.  The description is taken from Tomcat documentation.)
+webmanager.common.show                                   = Show
+webmanager.common.showAllFieldsExp                       = Check this box to view and configure all attributes.  Uncheck to hide. Note: Hiding will not remove the field values.
+webmanager.common.socketBuffer                           = SocketBuffer
+webmanager.common.socketBufferExp                        = The size (in bytes) of the buffer to be provided for socket output buffering. -1 can be specified to disable the use of a buffer. By default, a buffers of 9000 bytes will be used.
+webmanager.common.strategy                               = Strategy
+webmanager.common.strategyExp                            = The thread pooling strategy which will be used. The default strategy does not use a master thread, but a more conventional strategy using a master listener thread can be used by setting "ms" as this attribute's value. The master strategy will work significantly better using the threadPriority attribute, which will apply only to the thread which listens on the server socket. This is set to lf by default.
+webmanager.common.string                                 = String
+webmanager.common.tcpNoDelay                             = TcpNoDelay
+webmanager.common.tcpNoDelayExp                          = If checked, the TCP_NO_DELAY option will be set on the server socket, which improves performance under most circumstances.
+webmanager.common.threadPriority                         = ThreadPriority
+webmanager.common.threadPriorityExp                      = The priority of the request processing threads within the JVM. The default value is java.lang.Thread#NORM_PRIORITY. See the JavaDoc for the java.lang.Thread class for more details on what this priority means.
+webmanager.common.traceExp                               = Check to enable the TRACE HTTP method.
+webmanager.common.trustStore                             = Trust Store
+webmanager.common.truststoreFile                         = Truststore File
+webmanager.common.truststorePassword                     = Truststore Password
+webmanager.common.truststoreType                         = Truststore Type
+webmanager.common.uniqueName                             = Unique Name
+webmanager.common.uniqueNameExp                          = A name that is different than the name for any other web connectors in the server (no spaces in the name please)
+webmanager.common.uriEncoding                            = URIEncoding
+webmanager.common.uriEncodingExp                         = This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL. Default is ISO-8859-1.
+webmanager.common.useBodyEncodingForURI                  = UseBodyEncodingForURI
+webmanager.common.useBodyEncodingForURIExp               = Check this if the encoding specified in contentType should be used for URI query parameters, instead of using the URIEncoding.
+webmanager.common.useIPVHosts                            = UseIPVHosts
+webmanager.common.useIPVHostsExp                         = Check this to cause Tomcat to use the IP address that the request was recieved on to determine the Host to send the request to.
+webmanager.common.xPoweredBy                             = XpoweredBy
+webmanager.common.xPoweredByExp                          = Check this to cause Tomcat to advertise support for the Servlet specification using the header recommended in the specification.
+webmanager.connector.editConnector.TomcatManagerImpl.101 = Set this attribute to true to cause Tomcat to use the IP address that the request was recieved on to determine the Host to send the request to.
+webmanager.connector.editConnector.TomcatManagerImpl.103 = Set this attribute to true to cause Tomcat to advertise support for the Servlet specification using the header recommended in the specification.
+webmanager.connector.editConnector.TomcatManagerImpl.105 = The maximum queue length for incoming connection requests when all possible request processing threads are in use. Any requests received when the queue is full will be refused.
+webmanager.connector.editConnector.TomcatManagerImpl.108 = The host name or IP to bind to. The normal values are 0.0.0.0 (all interfaces) or localhost (local connections only).
+webmanager.connector.editConnector.TomcatManagerImpl.11  = Protocol which may be used for communicating with clients.
+webmanager.connector.editConnector.TomcatManagerImpl.110 = The size (in bytes) of the buffer to be provided for input streams created by this connector.
+webmanager.connector.editConnector.TomcatManagerImpl.113 = The value is a comma separated list of MIME types for which HTTP compression may be used.
+webmanager.connector.editConnector.TomcatManagerImpl.116 = The Connector may use HTTP/1.1 GZIP compression in an attempt to save server bandwidth. The acceptable values for the parameter is <i>off</i> (disable compression), <i>on</i> (allow compression, which causes text data to be compressed), <i>force</i> (forces compression in all cases), or a numerical integer value (which is equivalent to <i>on</i>, but specifies the minimum amount of data before the output is compressed). If the content-length is not known and compression is set to <i>on</i> or more aggressive, the output will also be compressed.
+webmanager.connector.editConnector.TomcatManagerImpl.118 = The number of milliseconds during which the sockets used by this Connector will linger when they are closed. The default value is -1 (socket linger is disabled).
+webmanager.connector.editConnector.TomcatManagerImpl.120 = The number of milliseconds this Connector will wait, after accepting a connection, for the request URI line to be presented.
+webmanager.connector.editConnector.TomcatManagerImpl.122 = A reference to the name in an Executor element. If this attribute is enabled, and the named executor exists, the connector will use the executor, and all the other thread attributes will be ignored.
+webmanager.connector.editConnector.TomcatManagerImpl.124 = The number of milliseconds this Connector will wait for another HTTP request before closing the connection. 
+webmanager.connector.editConnector.TomcatManagerImpl.126 = This flag allows the servlet container to use a different, longer connection timeout while a servlet is being executed, which in the end allows either the servlet a longer amount of time to complete its execution, or a longer timeout during data upload.
+webmanager.connector.editConnector.TomcatManagerImpl.128 = The maximum size of the request and response HTTP header, specified in bytes.
+webmanager.connector.editConnector.TomcatManagerImpl.130 = The maximum number of HTTP requests which can be pipelined until the connection is closed by the server. Setting this attribute to 1 will disable HTTP/1.0 keep-alive, as well as HTTP/1.1 keep-alive and pipelining. Setting this to -1 will allow an unlimited amount of pipelined or keep-alive HTTP requests.
+webmanager.connector.editConnector.TomcatManagerImpl.132 = The maximum number of request processing threads to be created by this Connector, which therefore determines the maximum number of simultaneous requests that can be handled. If not specified, this attribute is set to 40. If an executor is associated with this connector, this attribute is ignored as the connector will execute tasks using the executor rather than an internal thread pool.
+webmanager.connector.editConnector.TomcatManagerImpl.134 = Minimum spare threads
+webmanager.connector.editConnector.TomcatManagerImpl.136 = Maximum spare threads
+webmanager.connector.editConnector.TomcatManagerImpl.139 = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which compression should not be used, because these clients, although they do advertise support for the feature, have a broken implementation.
+webmanager.connector.editConnector.TomcatManagerImpl.14  = Ciphers which may be used for communicating with clients.
+webmanager.connector.editConnector.TomcatManagerImpl.141 = The TCP port number on which this Connector  will create a server socket and await incoming connections. Your operating system will allow only one server application to listen to a particular port number on a particular IP address.
+webmanager.connector.editConnector.TomcatManagerImpl.144 = The value is a comma separated list of regular expressions matching user-agents of HTTP clients for which HTTP/1.1 or HTTP/1.0 keep alive should not be used, even if the clients advertise support for these features. 
+webmanager.connector.editConnector.TomcatManagerImpl.147 = The Server header for the http response.
+webmanager.connector.editConnector.TomcatManagerImpl.149 = The size (in bytes) of the buffer to be provided for socket output buffering. -1 can be specified to disable the use of a buffer.
+webmanager.connector.editConnector.TomcatManagerImpl.151 = If set to true, the TCP_NO_DELAY option will be set on the server socket, which improves performance under most circumstances.
+webmanager.connector.editConnector.TomcatManagerImpl.153 = The priority of the request processing threads within the JVM.
+webmanager.connector.editConnector.TomcatManagerImpl.155 = The certificate encoding algorithm to be used.
+webmanager.connector.editConnector.TomcatManagerImpl.157 = Set to true if you want the SSL stack to require a valid certificate chain from the client before accepting a connection. Set to want if you want the SSL stack to request a client Certificate, but not fail if one isn't presented. A false value (which is the default) will not require a certificate chain unless the client requests a resource protected by a security constraint that uses CLIENT-CERT authentication.
+webmanager.connector.editConnector.TomcatManagerImpl.160 = The file that holds the keystore (relative to the Geronimo install dir)
+webmanager.connector.editConnector.TomcatManagerImpl.162 = Set the password used to access the keystore file. This is also the password used to access the server private key within the keystore (so the two passwords must be set to be the same on the keystore).
+webmanager.connector.editConnector.TomcatManagerImpl.165 = Set the keystore type. There is normally no reason not to use the default (JKS).
+webmanager.connector.editConnector.TomcatManagerImpl.168 = Set the HTTPS protocol. This should normally be set to TLS, though some (IBM) JVMs don't work properly with popular browsers unless it is changed to SSL.
+webmanager.connector.editConnector.TomcatManagerImpl.17  = Name of the file that contains the server certificate. The format is PEM-encoded.
+webmanager.connector.editConnector.TomcatManagerImpl.171 = A comma seperated list of the encryption ciphers that may be used. If not specified, then any available cipher may be used.
+webmanager.connector.editConnector.TomcatManagerImpl.173 = The alias used to for the server certificate in the keystore. If not specified the first key read in the keystore will be used.
+webmanager.connector.editConnector.TomcatManagerImpl.175 = The TrustStore file to use to validate client certificates.
+webmanager.connector.editConnector.TomcatManagerImpl.177 = The password to access the TrustStore.
+webmanager.connector.editConnector.TomcatManagerImpl.179 = Set the truststore type. There is normally no reason not to use the default (JKS).
+webmanager.connector.editConnector.TomcatManagerImpl.181 = Use this attribute to enable or disable sendfile capability.
+webmanager.connector.editConnector.TomcatManagerImpl.183 = Set to true to use the NIO thread pool executor. The default value is true. If set to false, it uses a thread pool based on a stack for its execution. Generally, using the executor yields a little bit slower performance, but yields a better fairness for processing connections in a high load environment as the traffic gets queued through a FIFO queue. If set to true(default) then the max pool size is the maxThreads attribute and the core pool size is the minSpareThreads. This value is ignored if the executor attribute is present and points to a valid shared thread pool.
+webmanager.connector.editConnector.TomcatManagerImpl.185 = The number of threads to be used to accept connections. Increase this value on a multi-CPU machine, although you would never really need more than 2. Also, with a lot of non-keep-alive connections, you might want to increase this value as well. 
+webmanager.connector.editConnector.TomcatManagerImpl.187 = The number of threads to be used to run for the polling events.
+webmanager.connector.editConnector.TomcatManagerImpl.189 = The priority of the poller threads.
+webmanager.connector.editConnector.TomcatManagerImpl.19  = Name of the file that contains the server private key.
+webmanager.connector.editConnector.TomcatManagerImpl.191 = The priority of the acceptor threads. The threads used to accept new connections.
+webmanager.connector.editConnector.TomcatManagerImpl.193 = The time in milliseconds to timeout on a select() for the poller. This value is important, since connection clean up is done on the same thread, so don't set this value to an extremely high one.
+webmanager.connector.editConnector.TomcatManagerImpl.195 = Whether to allow comet servlets or not.
+webmanager.connector.editConnector.TomcatManagerImpl.197 = The protocol handler caches Http11NioProcessor objects to speed up performance. This setting dictates how many of these objects get cached. -1 means unlimited, default is 200. Set this value somewhere close to your maxThreads value.
+webmanager.connector.editConnector.TomcatManagerImpl.199 = Whether to use direct ByteBuffers or java-mapped ByteBuffers. Default is false. When you are using direct buffers, make sure you allocate the appropriate amount of memory for the direct memory space. On Sun's JDK that would be something like -XX:MaxDirectMemorySize=256m
+webmanager.connector.editConnector.TomcatManagerImpl.201 = The socket receive buffer (SO_RCVBUF) size in bytes.
+webmanager.connector.editConnector.TomcatManagerImpl.203 = The socket send buffer (SO_SNDBUF) size in bytes.
+webmanager.connector.editConnector.TomcatManagerImpl.205 = Each connection that is opened up in Tomcat get associated with a read and a write ByteBuffer. This attribute controls the size of these buffers. By default this read buffer is sized at 8192 bytes. For lower concurrency, you can increase this to buffer more data. For an extreme amount of keep-alive connections, decrease this number or increase your heap size.
+webmanager.connector.editConnector.TomcatManagerImpl.207 = Each connection that is opened up in Tomcat get associated with a read and a write ByteBuffer This attribute controls the size of these buffers. By default this write buffer is sized at 8192 bytes. For lower concurrency, you can increase this to buffer more data. For an extreme amount of keep-alive connections, decrease this number or increase your heap size.
+webmanager.connector.editConnector.TomcatManagerImpl.209 = The Nio connector uses a class called NioChannel that holds elements linked to a socket. To reduce garbage collection, the Nio connector caches these channel objects. This value specifies the size of this cache. The default value is 500, and represents that the cache will hold 500 NioChannel objects. Other values are -1. unlimited cache, and 0, no cache.
+webmanager.connector.editConnector.TomcatManagerImpl.21  = Pass phrase for the encrypted private key.
+webmanager.connector.editConnector.TomcatManagerImpl.211 = The NioChannel pool can also be size based, not used object based. The size is calculated as follows: <br>NioChannel buffer size = read buffer size + write buffer size <br>SecureNioChannel buffer size = application read buffer size + application write buffer size + network read buffer size + network write buffer size
+webmanager.connector.editConnector.TomcatManagerImpl.213 = Tomcat will cache SocketProcessor objects to reduce garbage collection. The integer value specifies how many objects to keep in the cache at most. The default is 500. Other values are -1. unlimited cache, and 0, no cache.
+webmanager.connector.editConnector.TomcatManagerImpl.215 = Tomcat will cache KeyAttachment objects to reduce garbage collection. The integer value specifies how many objects to keep in the cache at most. The default is 500. Other values are -1. unlimited cache, and 0, no cache.
+webmanager.connector.editConnector.TomcatManagerImpl.217 = Tomcat will cache PollerEvent objects to reduce garbage collection. The integer value specifies how many objects to keep in the cache at most. The default is 500. Other values are -1. unlimited cache, and 0, no cache.
+webmanager.connector.editConnector.TomcatManagerImpl.219 = Same as the standard setting tcpNoDelay.
+webmanager.connector.editConnector.TomcatManagerImpl.221 = Boolean value for the socket's keep-alive setting (SO_KEEPALIVE).
+webmanager.connector.editConnector.TomcatManagerImpl.223 = Boolean value for the socket OOBINLINE setting.
+webmanager.connector.editConnector.TomcatManagerImpl.225 = Boolean value for the sockets reuse address option (SO_REUSEADDR). 
+webmanager.connector.editConnector.TomcatManagerImpl.227 = Boolean value for the sockets linger option (SO_LINGER). This option is paired with the soLingerTime value.
+webmanager.connector.editConnector.TomcatManagerImpl.229 = Value in seconds for the sockets so linger option (SO_LINGER). This option is paired with the soLingerOn value.
+webmanager.connector.editConnector.TomcatManagerImpl.231 = Value in milliseconds for the sockets read timeout (SO_TIMEOUT). 
+webmanager.connector.editConnector.TomcatManagerImpl.233 = Value between 0 and 255 for the traffic class on the socket, 0x04 | 0x08 | 0x010
+webmanager.connector.editConnector.TomcatManagerImpl.235 = The first value for the performance settings.
+webmanager.connector.editConnector.TomcatManagerImpl.237 = The second value for the performance settings.
+webmanager.connector.editConnector.TomcatManagerImpl.239 = The third value for the performance settings.
+webmanager.connector.editConnector.TomcatManagerImpl.24  = Ask client for certificate.
+webmanager.connector.editConnector.TomcatManagerImpl.241 = The max selectors to be used in the pool, to reduce selector contention. Use this option when the command line org.apache.tomcat.util.net.NioSelectorShared value is set to false.
+webmanager.connector.editConnector.TomcatManagerImpl.243 = The max spare selectors to be used in the pool, to reduce selector contention. When a selector is returned to the pool, the system can decide to keep it or let it be GC:ed. Use this option when the command line org.apache.tomcat.util.net.NioSelectorShared value is set to false.
+webmanager.connector.editConnector.TomcatManagerImpl.245 = The following command line options are available for the NIO connector: <br><i>-Dorg.apache.tomcat.util.net.NioSelectorShared=true|false</i>. Set this value to false if you wish to use a selector for each thread. the property. If you do set it to false, you can control the size of the pool of selectors by using the selectorPool.maxSelectors attribute
+webmanager.connector.editConnector.TomcatManagerImpl.247 = The NIO connector implements an OutOfMemoryError strategy called parachute. It holds a chunk of data as a byte array. In case of an OOM, this chunk of data is released and the error is reported. This will give the VM enough room to clean up. The oomParachute represent the size in bytes of the parachute(the byte array). The default value is 1024*1024(1MB). Please note, this only works for OOM errors regarding the Java Heap space, and there is absolutely no guarantee that you will be able to recover at all. If you have an OOM outside of the Java Heap, then this parachute trick will not help.
+webmanager.connector.editConnector.TomcatManagerImpl.249 = Duration of a poll call. Lowering this value will slightly decrease latency of connections being kept alive in some cases, but will use more CPU as more poll calls are being made.
+webmanager.connector.editConnector.TomcatManagerImpl.251 = Amount of sockets that the poller responsible for polling kept alive connections can hold at a given time. Extra connections will be closed right away.
+webmanager.connector.editConnector.TomcatManagerImpl.253 = Use kernel level sendfile for certain static files.
+webmanager.connector.editConnector.TomcatManagerImpl.255 = Amount of sockets that the poller responsible for sending static files asynchronously can hold at a given time. Extra connections will be closed right away without any data being sent (resulting in a zero length file on the client side). Note that in most cases, sendfile is a call that will return right away (being taken care of synchonously by the kernel), and the sendfile poller will not be used, so the amount of static files which can be sent concurrently is much larger than the specified amount.
+webmanager.connector.editConnector.TomcatManagerImpl.26  = Maximum verification depth for client certificates.
+webmanager.connector.editConnector.TomcatManagerImpl.28  = File of concatenated PEM-encoded CA Certificates for Client Auth.
+webmanager.connector.editConnector.TomcatManagerImpl.30  = Directory of PEM-encoded CA Certificates for Client Auth.
+webmanager.connector.editConnector.TomcatManagerImpl.32  = File of PEM-encoded Server CA Certificates.
+webmanager.connector.editConnector.TomcatManagerImpl.34  = File of concatenated PEM-encoded CA CRLs for Client Auth.
+webmanager.connector.editConnector.TomcatManagerImpl.36  = Directory of PEM-encoded CA CRLs for Client Auth.
+webmanager.connector.editConnector.TomcatManagerImpl.40  = The host name or IP to bind to. The normal values are 0.0.0.0 (all interfaces) or localhost (local connections only)
+webmanager.connector.editConnector.TomcatManagerImpl.42  = The network port to bind to.
+webmanager.connector.editConnector.TomcatManagerImpl.44  = The maximum queue length for incoming connection requests when all possible request processing threads are in use.
+webmanager.connector.editConnector.TomcatManagerImpl.46  = Buffer size
+webmanager.connector.editConnector.TomcatManagerImpl.48  = Connection timeout in milliseconds
+webmanager.connector.editConnector.TomcatManagerImpl.50  = Keep-alive timeout in milliseconds
+webmanager.connector.editConnector.TomcatManagerImpl.52  = The maximum number of threads this connector should use to handle incoming requests
+webmanager.connector.editConnector.TomcatManagerImpl.54  = Minimum spare threads
+webmanager.connector.editConnector.TomcatManagerImpl.56  = Maximum spare threads
+webmanager.connector.editConnector.TomcatManagerImpl.58  = If set to true, the TCP_NO_DELAY option will be set on the server socket, which improves performance under most circumstances.
+webmanager.connector.editConnector.TomcatManagerImpl.60  = If set to true, the authetication will be done in Geronimo. Otherwise, the authenticated principal will be propagated from the native web server and used for authorization in Geronimo.
+webmanager.connector.editConnector.TomcatManagerImpl.80  = A boolean value which can be used to enable or disable the TRACE HTTP method.
+webmanager.connector.editConnector.TomcatManagerImpl.82  = If set to true, all paths for session cookies will be set to /. This can be useful for portlet specification implementations, but will greatly affect performance if many applications are accessed on a given server by the client.
+webmanager.connector.editConnector.TomcatManagerImpl.84  = Set to true if you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client. Set to false to skip the DNS lookup and return the IP address in String form instead (thereby improving performance).
+webmanager.connector.editConnector.TomcatManagerImpl.86  = The maximum size in bytes of the POST which will be handled by the container FORM URL parameter parsing. The limit can be disabled by setting this attribute to a value less than or equal to 0.
+webmanager.connector.editConnector.TomcatManagerImpl.88  = The maximum size in bytes of the POST which will be saved/buffered by the container during FORM or CLIENT-CERT authentication. For both types of authentication, the POST will be saved/buffered before the user is authenticated. For CLIENT-CERT authentication, the POST is buffered for the duration of the SSL handshake and the buffer emptied when the request is processed. For FORM authentication the POST is saved whilst the user is re-directed to the login form and is retained until the user successfully authenticates or the session associated with the authentication request expires. The limit can be disabled by setting this attribute to -1. Setting the attribute to zero will disable the saving of POST data during authentication.
+webmanager.connector.editConnector.TomcatManagerImpl.90  = If this Connector is being used in a proxy configuration, configure this attribute to specify the server name to be returned for calls to request.getServerName().
+webmanager.connector.editConnector.TomcatManagerImpl.92  = If this Connector is being used in a proxy configuration, configure this attribute to specify the server port to be returned for calls to request.getServerPort().
+webmanager.connector.editConnector.TomcatManagerImpl.94  = If this Connector is supporting non-SSL requests, and a request is received for which a matching <security-constraint> requires SSL transport, Catalina will automatically redirect the request to the port number specified here.
+webmanager.connector.editConnector.TomcatManagerImpl.97  = This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL.
+webmanager.connector.editConnector.TomcatManagerImpl.99  = This specifies if the encoding specified in contentType should be used for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x, where the encoding specified in the contentType, or explicitely set using Request.setCharacterEncoding method was also used for the parameters from the URL.
+webmanager.connector.editConnector.JettyManagerImpl.30   = The host name or IP to bind to. The normal values are 0.0.0.0 (all interfaces) or localhost (local connections only)
+webmanager.connector.editConnector.JettyManagerImpl.32   = The network port to bind to.
+webmanager.connector.editConnector.JettyManagerImpl.34   = The maximum number of threads this connector should use to handle incoming requests
+webmanager.connector.editConnector.JettyManagerImpl.36   = Size in bytes of input and output buffers.
+webmanager.connector.editConnector.JettyManagerImpl.38   = The maximum unaccepted connections to queue if no threads are available.
+webmanager.connector.editConnector.JettyManagerImpl.40   = The maximum time in seconds that a connection lingers during close handshaking.
+webmanager.connector.editConnector.JettyManagerImpl.42   = Port to redirect to for confidential connections. 0 if not supported.
+webmanager.connector.editConnector.JettyManagerImpl.44   = If set, then clients connecting through this connector must supply a valid client certificate.
+webmanager.connector.editConnector.JettyManagerImpl.47   = The keystore to use for accessing the server's private key
+webmanager.connector.editConnector.JettyManagerImpl.50   = The keystore containing the trusted certificate entries, including Certification Authority (CA) certificates
+webmanager.connector.editConnector.JettyManagerImpl.53   = This should normally be set to TLS, though some (IBM) JVMs don't work properly with popular browsers unless it is changed to SSL.
+webmanager.connector.editConnector.JettyManagerImpl.56   = This should normally be set to match the JVM vendor.
+webmanager.connector.editConnector.JettyManagerImpl.57   = Size in bytes of the header buffer.
+webmanager.connector.editConnector.addNew                = Add a new
+webmanager.connector.editConnector.attribute             = Attribute
+webmanager.connector.editConnector.desc                  = Description
+webmanager.connector.editConnector.editConnector         = Edit connector
+webmanager.connector.editConnector.requiredAttribute     = (<strong>*</strong> denotes a required attribute)
+webmanager.connector.editConnector.type                  = Type
+webmanager.connector.editConnector.value                 = Value
+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. 
+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.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.normal.avgTime                                = Avg Time (ms)
+webmanager.normal.connectionDuration                     = Connection Duration
+webmanager.normal.connectionRequestCount                 = Connection Request Count
+webmanager.normal.count                                  = Count
+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.maxTime                                = Max Time (ms)
+webmanager.normal.minTime                                = Min Time (ms)
+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.totalErrorCount                        = Total Error Count
+webmanager.normal.totalRequestCount                      = Total Request Count
+webmanager.normal.totalTime                              = Total Time
+
+welcome.welcomeMaximized.fragment1   = The welcome portlet is the first page that users see when they log in to the Administrative Console. It contains introductory information about the Administrative Console.
+welcome.welcomeMaximized.fragment2   = To return to the main Welcome panel select the "view" link from the header of this portlet.
+welcome.welcomeMaximized.title       = Welcome to the Apache Geronimo&#8482; Administration Console!
 welcome.welcomeNormal.about1         = The administration console provides a convenient, user friendly way to administer many aspects of the Geronimo Server.  It is currently a work in progress, and will continue to evolve over time.  The navigation panel on the left-hand side of the screen provides easy access to the individual tasks available in the console.
 welcome.welcomeNormal.about2         = This space is the main content area where the real work happens.  Each view contains one or more portlets (self contained view fragments) that typically include a link for help in the header.  Look at the top of this portlet for an example and try it out.
 welcome.welcomeNormal.about3         = The references on the right are provided so that you can learn more about Apache Geronimo, its capabilities, and what might be coming in future releases.
 welcome.welcomeNormal.about4         = Mailing lists are available to get involved in the development of Apache Geronimo or to ask questions of the community:
 welcome.welcomeNormal.about5         = So share your experiences with us and let us know how we can make Geronimo even better.
 welcome.welcomeNormal.addiDoc        = Additional Documentation
+welcome.welcomeNormal.archive        = archives
 welcome.welcomeNormal.commonActions  = Common Console Actions
 welcome.welcomeNormal.deployNew      = Deploy New Applications
 welcome.welcomeNormal.devMaillist    = Developers Mailing List Archive

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp Mon Feb  9 19:43:14 2009
@@ -138,7 +138,7 @@
             </c:otherwise>
         </c:choose>
         <tr>
-            <th class="${backgroundClass}" align="right">Finger prints:</th>
+            <th class="${backgroundClass}" align="right"><fmt:message key="ca.common.fingerPrints"/>:</th>
             <td class="${backgroundClass}">
   <c:forEach items="${fingerPrints}" var="fp">
                 ${fp.key} = &nbsp; ${fp.value} <br/>
@@ -161,7 +161,7 @@
   <c:when test="${linkToListRequests}">
     <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="listRequestsIssue-before" />
-            </portlet:actionURL>">Back to Requests to be fulfilled</a></p>
+            </portlet:actionURL>"><fmt:message key="ca.viewCertificate.backToRequest"/></a></p>
   </c:when>
   <c:otherwise>
     <p><a href="<portlet:actionURL portletMode="view">



Mime
View raw message