geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r609207 [8/8] - in /geronimo/server/trunk/plugins/console: console-base-portlets/src/main/resources/ console-base-portlets/src/main/webapp/WEB-INF/view/ajax/ console-base-portlets/src/main/webapp/WEB-INF/view/apache/jk/ console-base-portlet...
Date Sat, 05 Jan 2008 20:22:38 GMT
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
Sat Jan  5 12:22:33 2008
@@ -16,47 +16,49 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 <c:if test="${statsOn}">
 <table width="100%">
   <tr>
-    <th width="25%" class="DarkBackground"><STRONG>Statistic</STRONG></th>
-    <th class="DarkBackground"><strong>Count</strong></th>
+    <th width="25%" class="DarkBackground"><STRONG><fmt:message key="webmanager.normal.statistic"/></STRONG></th>
+    <th class="DarkBackground"><strong><fmt:message key="webmanager.normal.count"/></strong></th>
   </tr>
   <tr>
-    <td align="right"  class="LightBackground"><strong>Total Request Count</strong></td>
+    <td align="right"  class="LightBackground"><strong><fmt:message key="webmanager.normal.totalRequestCount"/></strong></td>
     <td align="center" class="LightBackground">${totalRequestCount}</td>
   </tr>
   <tr>
-    <td align="right"  class="MediumBackground"><strong>Total 1xx Responses</strong></td>
+    <td align="right"  class="MediumBackground"><strong><fmt:message key="webmanager.normal.total1xxResp"/></strong></td>
     <td align="center" class="MediumBackground">${response1xx}</td>
   </tr>
   <tr>
-    <td align="right"  class="LightBackground"><strong>Total 2xx Responses</strong></td>
+    <td align="right"  class="LightBackground"><strong><fmt:message key="webmanager.normal.total2xxResp"/></strong></td>
     <td align="center" class="LightBackground">${response2xx}</td>
   </tr>
   <tr>
-    <td align="right"  class="MediumBackground"><strong>Total 3xx Responses</strong></td>
+    <td align="right"  class="MediumBackground"><strong><fmt:message key="webmanager.normal.total3xxResp"/></strong></td>
     <td align="center" class="MediumBackground">${response3xx}</td>
   </tr>
   <tr>
-    <td align="right"  class="LightBackground"><strong>Total 4xx Responses</strong></td>
+    <td align="right"  class="LightBackground"><strong><fmt:message key="webmanager.normal.total4xxResp"/></strong></td>
     <td align="center" class="LightBackground">${response4xx}</td>
   </tr>
   <tr>
-    <td align="right"  class="MediumBackground"><strong>Total 5xx Responses</strong></td>
+    <td align="right"  class="MediumBackground"><strong><fmt:message key="webmanager.normal.total5xxResp"/></strong></td>
     <td align="center" class="MediumBackground">${response5xx}</td>
   </tr>
 </table>
 <table width="100%">
   <tr>
     <th WIDTH="25%" class="DarkBackground"> &nbsp; </th>
-    <th class="DarkBackground"><strong>Current</strong></th>
-    <th class="DarkBackground"><strong>Low</strong></th>
-    <th class="DarkBackground"><strong>High</strong></th>
+    <th class="DarkBackground"><strong><fmt:message key="webmanager.normal.current"/></strong></th>
+    <th class="DarkBackground"><strong><fmt:message key="webmanager.normal.low"/></strong></th>
+    <th class="DarkBackground"><strong><fmt:message key="webmanager.normal.high"/></strong></th>
   </tr>
   <tr>
-    <td align="right"  class="LightBackground"><strong>Active Request Count</strong></td>
+    <td align="right"  class="LightBackground"><strong><fmt:message key="webmanager.normal.activeRequestCount"/></strong></td>
     <td align="center" class="LightBackground">${activeRequestCountCurrent}</td>
     <td align="center" class="LightBackground">${activeRequestCountLow}</td>
     <td align="center" class="LightBackground">${activeRequestCountHigh}</td>
@@ -65,13 +67,13 @@
 <table width="100%">
   <tr>
     <th width="25%" class="DarkBackground"> &nbsp; </th>
-    <th class="DarkBackground"><strong>Avg Time (ms) </strong></th>
-    <th class="DarkBackground"><strong>Min Time (ms)</strong></th>
-    <th class="DarkBackground"><strong>Max Time (ms)</strong></th>
-    <th class="DarkBackground"><strong>Total Time (ms)</strong></th>
+    <th class="DarkBackground"><strong><fmt:message key="webmanager.normal.avgTime"/>
</strong></th>
+    <th class="DarkBackground"><strong><fmt:message key="webmanager.normal.minTime"/></strong></th>
+    <th class="DarkBackground"><strong><fmt:message key="webmanager.normal.maxTime"/></strong></th>
+    <th class="DarkBackground"><strong><fmt:message key="webmanager.normal.totalTime"/></strong></th>
   </tr>
   <tr>
-    <td align="right"  class="LightBackground"><strong>Request Duration</strong></td>
+    <td align="right"  class="LightBackground"><strong><fmt:message key="webmanager.normal.requestDuration"/></strong></td>
     <td align="center" class="LightBackground">${requestDurationAvg}</td>
     <td align="center" class="LightBackground">${requestDurationMinTime}</td>
     <td align="center" class="LightBackground">${requestDurationMaxTime}</td>
@@ -79,16 +81,16 @@
   </tr>
   <tr><td colspan="5" align="left">&nbsp;</td></tr>
   <tr>
-    <td colspan="5" align="left"><strong>Elapsed Time Since Collection Started
(hh:mm:ss:SSS):</strong>&nbsp;${elapsedTime}</td>
+    <td colspan="5" align="left"><strong><fmt:message key="webmanager.normal.elapsedTime"/>:</strong>&nbsp;${elapsedTime}</td>
   </tr>
   <tr><td colspan="5" align="left">&nbsp;</td></tr>
   <tr>
     <td colspan="5" align="left"> 
       <c:if test="${statsLazy}">
-        <a href="<portlet:actionURL><portlet:param name="stats" value="false"/></portlet:actionURL>">disable</a>&nbsp;

+        <a href="<portlet:actionURL><portlet:param name="stats" value="false"/></portlet:actionURL>"><fmt:message
key="webmanager.help.disable"/></a>&nbsp; 
       </c:if>
       <a href="<portlet:renderURL/>">refresh</a>&nbsp; 
-      <a href="<portlet:actionURL><portlet:param name="resetStats" value="true"/></portlet:actionURL>">reset</a>

+      <a href="<portlet:actionURL><portlet:param name="resetStats" value="true"/></portlet:actionURL>"><fmt:message
key="consolebase.common.reset"/></a> 
     </td>
   </tr>
 </table>
@@ -96,6 +98,6 @@
 <c:if test="${!statsOn}">
   ${statsMessage}<br/><br/>
   <c:if test="${statsLazy}">
-    <a href="<portlet:actionURL><portlet:param name="stats" value="true"/></portlet:actionURL>">enable</a>
+    <a href="<portlet:actionURL><portlet:param name="stats" value="true"/></portlet:actionURL>"><fmt:message
key="consolebase.common.enable"/></a>
   </c:if>
 </c:if>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeHelp.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeHelp.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeHelp.jsp
Sat Jan  5 12:22:33 2008
@@ -14,9 +14,13 @@
    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="consolebase"/>
 
-<p><font face="Verdana" size="+1"><center><b>This is the help for
the Geronimo Administration Console Welcome.</b></center></font></p>
+<p><font face="Verdana" size="+1">
+<center><b><fmt:message key="welcome.welcomeMaximized.title"/></b></center>
+</font></p>
 
-<P>The welcome portlet is the first page that users see when they log in to the Geronimo
Administration Console.  It contains introductory information about the Administration Console
and links to other information about Apache Geronimo.</P>
+<P><fmt:message key="welcome.welcomeMaximized.fragment1"/></P>
 
-<P>To return to the main Welcome panel select the "view" link from the header of this
portlet.</P>
+<P><fmt:message key="welcome.welcomeMaximized.fragment2"/></P>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
Sat Jan  5 12:22:33 2008
@@ -16,6 +16,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 
@@ -24,35 +26,28 @@
 
         <!-- Body -->
         <td width="90%" align="left" valign="top">
-            <p><font face="Verdana" size="+1"><center><b>Welcome
to the Apache Geronimo&#8482;<BR>Administration Console!</b></center></font></p>
+            <p><font face="Verdana" size="+1"><center><b><fmt:message
key="welcome.welcomeMaximized.title"/></b></center></font></p>
 
-            <p>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.</p>
-
-            <p>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.</p>
+            <p><fmt:message key="welcome.welcomeNormal.about1"/></p>
 
-            <p>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.</p>
+            <p><fmt:message key="welcome.welcomeNormal.about2"/></p>
 
-            <p>Mailing lists are available to get involved in the development of Apache
Geronimo or to ask questions
-                of the community:</p>
+            <p><fmt:message key="welcome.welcomeNormal.about2"/></p>
+
+            <p><fmt:message key="welcome.welcomeNormal.about2"/></p>
 
            <ul>
                <li><b><a href="mailto:user-subscribe@geronimo.apache.org">user@geronimo.apache.org</a></b>
                    (<a href="http://geronimo.apache.org/redirects/userMailingList.html">archives</a>)
-                   for general questions related to configuring and using Geronimo</li>
+                   <fmt:message key="welcome.welcomeNormal.forUsers"/></li>
                <li><b><a href="mailto:dev-subscribe@geronimo.apache.org">dev@geronimo.apache.org</a></b>
                    (<a href="http://geronimo.apache.org/redirects/developerMailingList.html">archives</a>)
-                   for developers working on Geronimo</li>
+                   <fmt:message key="welcome.welcomeNormal.forDevelopers"/></li>
            </ul>
 
-            <p>So share your experiences with us and let us know how we can make Geronimo
even better.</p>
+            <p><fmt:message key="welcome.welcomeNormal.about5"/></p>
 
-            <p style="text-align: center"><b>Thanks for using Geronimo!</b></p>
+            <p style="text-align: center"><b><fmt:message key="welcome.welcomeNormal.thanks"/></b></p>
 
 
         </td>
@@ -65,15 +60,15 @@
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Common Console Actions</font>
+                        <font face="Verdana" size="+1"><fmt:message key="welcome.welcomeNormal.commonActions"/></font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
-                        <img src='/console/images/ico_list_16x16.gif' alt=""/><a
href="/console/portal/Applications/Deploy New">Deploy New Applications</a><br
/>
-                        <img src='/console/images/ico_servcomp_16x16.gif' alt=""/><a
href="/console/portal/Server/Web Server">Web Server Ports</a><br />
-                        <img src='/console/images/ico_look_16x16.gif' alt=""/><a
href="/console/portal/Server/Information">Server Information</a><br />
+                        <img src='/console/images/ico_list_16x16.gif' alt=""/><a
href="/console/portal/Applications/Deploy New"><fmt:message key="welcome.welcomeNormal.deployNew"/></a><br
/>
+                        <img src='/console/images/ico_servcomp_16x16.gif' alt=""/><a
href="/console/portal/Server/Web Server"><fmt:message key="welcome.welcomeNormal.webServerPorts"/></a><br
/>
+                        <img src='/console/images/ico_look_16x16.gif' alt=""/><a
href="/console/portal/Server/Information"><fmt:message key="welcome.welcomeNormal.serverInfo"/></a><br
/>
                         &nbsp;<br />
                     </td>
                 </tr>
@@ -85,17 +80,17 @@
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Geronimo Online</font>
+                        <font face="Verdana" size="+1"><fmt:message key="welcome.welcomeNormal.online"/></font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
-                        <a href="http://geronimo.apache.org/">The Geronimo Home Page</a><br
/>
-                        <a href="http://geronimo.apache.org/redirects/issues.html">Problem
Tracking Database</a><br />
-                        <a href="http://geronimo.apache.org/redirects/userMailingList.html">Users
Mailing List Archive</a><br />
-                        <a href="http://geronimo.apache.org/redirects/developerMailingList.html">Developers
Mailing List Archive</a><br />
-                        <a href="irc://irc.freenode.net/#geronimo">Geronimo IRC chat</a><br
/>
+                        <a href="http://geronimo.apache.org/"><fmt:message key="welcome.welcomeNormal.homePage"/></a><br
/>
+                        <a href="http://geronimo.apache.org/redirects/issues.html"><fmt:message
key="welcome.welcomeNormal.problemTracker"/></a><br />
+                        <a href="http://geronimo.apache.org/redirects/userMailingList.html"><fmt:message
key="welcome.welcomeNormal.userMaillist"/></a><br />
+                        <a href="http://geronimo.apache.org/redirects/developerMailingList.html"><fmt:message
key="welcome.welcomeNormal.devMaillist"/></a><br />
+                        <a href="irc://irc.freenode.net/#geronimo"><fmt:message
key="welcome.welcomeNormal.irc"/></a><br />
                         &nbsp;<br />
                     </td>
                 </tr>
@@ -107,16 +102,16 @@
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Geronimo Documentation&nbsp;&nbsp;&nbsp;</font>
+                        <font face="Verdana" size="+1"><fmt:message key="welcome.welcomeNormal.doc"/>&nbsp;&nbsp;&nbsp;</font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
-                        <a href="http://geronimo.apache.org/faq.html">FAQ</a><br
/>
-                        <a href="http://geronimo.apache.org/redirects/wiki.html">Wiki</a><br
/>
-                        <a href="http://geronimo.apache.org/documentation.html">Geronimo
Documentation</a><br />
-                        <a href="http://geronimo.apache.org/redirects/additionalDocumentation.html">Additional
Documentation</a><br />
+                        <a href="http://geronimo.apache.org/faq.html"><fmt:message
key="welcome.welcomeNormal.faq"/></a><br />
+                        <a href="http://geronimo.apache.org/redirects/wiki.html"><fmt:message
key="welcome.welcomeNormal.wiki"/></a><br />
+                        <a href="http://geronimo.apache.org/documentation.html"><fmt:message
key="welcome.welcomeNormal.doc"/></a><br />
+                        <a href="http://geronimo.apache.org/redirects/additionalDocumentation.html"><fmt:message
key="welcome.welcomeNormal.addiDoc"/></a><br />
                         &nbsp;<br />
                     </td>
                 </tr>

Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties?rev=609207&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties
(added)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties
Sat Jan  5 12:22:33 2008
@@ -0,0 +1,31 @@
+#=====================================================================
+#  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.
+#=====================================================================
+# $Rev$ $Date$
+
+console.common.ConsoleLogIn               = Geronimo Console Login
+console.common.login                      = Login
+console.common.loginToConsole             = Log in to the Geronimo Console
+console.common.password                   = Password
+console.common.username                   = Username
+console.head.title                        = Geronimo Console
+console.login.components                  = <strong>Geronimo&#8482;</strong>
has integrated the following components:<BR/> &nbsp;&nbsp;&#149;&nbsp;
Application server (Apache Geronimo)<br/> &nbsp;&nbsp;&#149;&nbsp; Web
server and servlet engine (Tomcat)<br/> &nbsp;&nbsp;&#149;&nbsp; Web
server and servlet engine (Jetty)<br/> &nbsp;&nbsp;&#149;&nbsp; JSP
compiler (Jasper)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-RPC Web Services
engine (Apache Axis)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services
engine (Apache Axis2)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services
engine (Apache CXF)<br/> &nbsp;&nbsp;&#149;&nbsp; Relational database
(Apache Derby)<br/> &nbsp;&nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/>
&nbsp;&nbsp;&#149;&nbsp; User management services<br/> &nbsp;&nbsp;&#149;&nbsp;
Centralized administration console<br/> 
+console.login.introduction                = <strong>GERONIMO&#8482;</strong>
is a Java-certified, production-grade platform designed to allow developers to rapidly deploy
and manage their applications. The result is an integrated, highly functional application
platform that leverages the latest innovations from the open source community and simplifies
application deployment and maintenance.
+console.login.requireCookies              = Note: Logging onto the Geronimo Console requires
cookies to be enabled in your web browser.
+console.login.welcome                     = Welcome to the Geronimo&#8482; Console
+console.login_error.invalid               = Invalid Username and/or Password!
+console.login_success.loginSuccessful     = Login Successful
+console.login_success.returnToPortalTests = Click here to return to the portal tests.

Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties?rev=609207&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties
(added)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties
Sat Jan  5 12:22:33 2008
@@ -0,0 +1,31 @@
+#=====================================================================
+#  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.
+#=====================================================================
+# $Rev$ $Date$
+
+console.common.ConsoleLogIn               = Geronimo\u63A7\u5236\u53F0\u767B\u5F55
+console.common.login                      = \u767B\u5F55
+console.common.loginToConsole             = \u767B\u5F55Geronimo\u63A7\u5236\u53F0
+console.common.password                   = \u5BC6\u7801
+console.common.username                   = \u7528\u6237\u540D
+console.head.title                        = Geronimo\u63A7\u5236\u53F0
+console.login.components                  = <strong>Geronimo&#8482;</strong>
has integrated the following components:<BR/> &nbsp;&nbsp;&#149;&nbsp;
Application server (Apache Geronimo)<br/> &nbsp;&nbsp;&#149;&nbsp; Web
server and servlet engine (Tomcat)<br/> &nbsp;&nbsp;&#149;&nbsp; Web
server and servlet engine (Jetty)<br/> &nbsp;&nbsp;&#149;&nbsp; JSP
compiler (Jasper)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-RPC Web Services
engine (Apache Axis)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services
engine (Apache Axis2)<br/> &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services
engine (Apache CXF)<br/> &nbsp;&nbsp;&#149;&nbsp; Relational database
(Apache Derby)<br/> &nbsp;&nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/>
&nbsp;&nbsp;&#149;&nbsp; User management services<br/> &nbsp;&nbsp;&#149;&nbsp;
Centralized administration console<br/> 
+console.login.introduction                = <strong>GERONIMO&#8482;</strong>
is a Java-certified, production-grade platform designed to allow developers to rapidly deploy
and manage their applications. The result is an integrated, highly functional application
platform that leverages the latest innovations from the open source community and simplifies
application deployment and maintenance.
+console.login.requireCookies              = \u6CE8\u610F\uFF1A\u9700\u8981\u6FC0\u6D3B\u6D4F\u89C8\u5668\u7684Cookie\u529F\u80FD\uFF0C\u624D\u80FD\u767B\u5F55\u5230Geronimo\u63A7\u5236\u53F0\u3002
+console.login.welcome                     = \u6B22\u8FCE\u5230Geronimo&#8482; \u7BA1\u7406\u63A7\u5236\u53F0
+console.login_error.invalid               = \u65E0\u6548\u7684\u7528\u6237\u540D\u6216\u5BC6\u7801\uFF01
+console.login_success.loginSuccessful     = \u767B\u5F55\u6210\u529F
+console.login_success.returnToPortalTests = \u70B9\u51FB\u8FD9\u91CC\u8FD4\u56DE\u5230portal\u6D4B\u8BD5\u9875\u9762\u3002

Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/head.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/head.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/head.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/head.jsp
Sat Jan  5 12:22:33 2008
@@ -16,8 +16,11 @@
 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="portaldriver"/>
+
 <head>
-    <title>Geronimo Console</title>
+    <title><fmt:message key="console.head.title"/></title>
     <link rel="stylesheet" href="<%=request.getContextPath()%>/main.css" type="text/css"/>
     <link rel="stylesheet" href="<%=request.getContextPath()%>/pluto.css" type="text/css"/>
     <link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
Sat Jan  5 12:22:33 2008
@@ -19,9 +19,12 @@
 
 <%-- $Rev$ $Date$ --%>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="portaldriver"/>
+
 <html>
 <head>
-<title>Geronimo Console Login</title>
+<title><fmt:message key="console.common.ConsoleLogIn"/></title>
 <link href="<%=request.getContextPath()%>/main.css" rel="stylesheet" type="text/css"/>
 <link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
 </head>
@@ -58,7 +61,7 @@
       <TD>
       <table width="550" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="ReallyDarkBackground"><strong>&nbsp;Log In to the Geronimo
Console</td>
+          <td class="ReallyDarkBackground"><strong>&nbsp;<fmt:message
key="console.common.loginToConsole"/></STRONG></td>
         </tr>
         <tr>
           <td class="MediumBackground">&nbsp;</td>
@@ -76,14 +79,14 @@
               </tr>
               <tr>
                 <td class="MediumBackground" ROWSPAN=3 ALIGN="center" ><img border="0"
align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif"/></td>

-                <td align="right" class="MediumBackground"><strong>Username</strong></td>
+                <td align="right" class="MediumBackground"><strong><fmt:message
key="console.common.username"/></strong></td>
                 <td class="MediumBackground"><strong>:</strong></td>
                 <td width="1" class="MediumBackground">&nbsp;</td>
                 <td class="MediumBackground"><input name="j_username" type="text"
class="InputField" value="" size="20px"/></td>
                 <td width="17" class="MediumBackground">&nbsp;</td>
               </tr>
               <tr>
-                <td align="right" class="MediumBackground"><strong>Password</strong></td>
+                <td align="right" class="MediumBackground"><strong><fmt:message
key="console.common.password"/></strong></td>
                 <td class="MediumBackground"><strong>:</strong></td>
                 <td width="1" class="MediumBackground">&nbsp;</td>
                 <td class="MediumBackground"><input name="j_password" type="password"
class="InputField" value="" size="20px"/></td>
@@ -101,10 +104,10 @@
                 <td colspan="4" align="center" class="MediumBackground">
                    <script>
                    if (document.cookie == "") {
-                     document.writeln('<font color="red"><strong>Note: Logging
onto the Geronimo Console requires cookies to be enabled in your web browser.</strong></font><br>');
+                     document.writeln('<font color="red"><strong><fmt:message
key="console.common.password"/></strong></font><br>');
                    }
                    </script>
-                   <input name="submit" type="submit" value="Login"/>
+                   <input name="submit" type="submit" value="<fmt:message key="console.common.login"/>"/>
                 </td>
                 <td class="MediumBackground">&nbsp;</td>
               </tr>
@@ -121,14 +124,14 @@
         </tr>
 
         <tr>
-          <td><font size="1"><STRONG>Welcome to the Geronimo&#8482;
Console</FONT></td>
+          <td><font size="1"><STRONG><fmt:message key="console.login.welcome"/></STRONG></FONT></td>
         </TR>
         <tr>
           <TD>
           <table width="100%"  border="0" cellspacing="1" cellpadding="5">
             <tr>
               <td width="5">&nbsp;</td>
-              <td> <strong>GERONIMO&#8482;</strong> is a Java-certified,
production-grade platform designed to allow developers to rapidly deploy and manage their
applications. The result is an integrated, highly functional application platform that leverages
the latest innovations from the open source community and simplifies application deployment
and maintenance. </td>
+              <td><fmt:message key="console.login.introduction"/></td>
               <td width="5">&nbsp;</td>
             </tr>
 
@@ -140,18 +143,7 @@
 
             <tr>
               <td>&nbsp;</td>
-              <td> <strong>Geronimo&#8482;</strong> has integrated
the following components:<BR/>
-                &nbsp;&nbsp;&#149;&nbsp; Application server (Apache Geronimo)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Tomcat)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Jetty)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; JSP compiler (Jasper)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; JAX-RPC Web Services engine (Apache
Axis)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services engine (Apache
Axis2)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services engine (Apache
CXF)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Relational database (Apache Derby)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; User management services<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Centralized administration console<br/>
+              <td><fmt:message key="console.login.components"/></td>
               <td>&nbsp;</td>
             </tr>
           </table>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login_success.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login_success.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login_success.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login_success.jsp
Sat Jan  5 12:22:33 2008
@@ -1,5 +1,7 @@
 <%@ page language="java" 
          contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="portaldriver"/> 
 <%--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -20,8 +22,8 @@
 <%-- $Rev$ $Date$ --%>
 
 <HTML>
-<HEAD><TITLE>Login Successful</TITLE></HEAD>
+<HEAD><TITLE><fmt:message key="console.login_success.loginSuccessful"/></TITLE></HEAD>
 <BODY>
-Login Successfull. <a href="<%=request.getContextPath()%>/portal/test"> Click
here to return to the portal tests.</A>
+<fmt:message key="console.login_success.loginSuccessful"/>. <a href="<%=request.getContextPath()%>/portal/test"><fmt:message
key="returnToPortalTests"/></A>
 </BODY>
 </HTML>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp?rev=609207&r1=609206&r2=609207&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
Sat Jan  5 12:22:33 2008
@@ -1,5 +1,7 @@
 <%@ page language="java" 
          contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="portaldriver"/> 
 <%--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -21,7 +23,7 @@
 
 <html>
 <head>
-<title>Geronimo Console Login</title>
+<title><fmt:message key="console.common.ConsoleLogIn"/></title>
 <link href="<%=request.getContextPath()%>/main.css" rel="stylesheet" type="text/css">
 <link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
 </head>
@@ -58,10 +60,10 @@
       <TD>
       <table width="550" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="ReallyDarkBackground"><strong>&nbsp;Log In to the Geronimo
Console</td>
+          <td class="ReallyDarkBackground"><strong>&nbsp;<fmt:message
key="console.common.loginToConsole"/></td>
         </tr>
         <tr>
-          <td class="MediumBackground" align="center"><font color="red"><b><i>Invalid
Username and/or Password!</i></b></font></td>
+          <td class="MediumBackground" align="center"><font color="red"><b><i><fmt:message
key="console.login_error.invalid"/></i></b></font></td>
         </tr>
         <tr>
           <td>
@@ -76,14 +78,14 @@
               </tr>
               <tr>
                 <td class="MediumBackground" ROWSPAN=3 ALIGN="center" ><img border="0"
align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif"></td>

-                <td align="right" class="MediumBackground"><strong>Username</strong></td>
+                <td align="right" class="MediumBackground"><strong><fmt:message
key="console.common.username"/></strong></td>
                 <td class="MediumBackground"><strong>:</strong></td>
                 <td width="1" class="MediumBackground">&nbsp;</td>
                 <td class="MediumBackground"><input name="j_username" type="text"
class="InputField" value="" size="20px" maxlength="25"/></td>
                 <td width="17" class="MediumBackground">&nbsp;</td>
               </tr>
               <tr>
-                <td align="right" class="MediumBackground"><strong>Password</strong></td>
+                <td align="right" class="MediumBackground"><strong><fmt:message
key="console.common.password"/></strong></td>
                 <td class="MediumBackground"><strong>:</strong></td>
                 <td width="1" class="MediumBackground">&nbsp;</td>
                 <td class="MediumBackground"><input name="j_password" type="password"
class="InputField" value="" size="20px" maxlength="25"/></td>
@@ -98,7 +100,7 @@
               </tr>
               <tr>
                 <td class="MediumBackground">&nbsp;</td>
-                <td colspan="4" align="center" class="MediumBackground"><input name="submit"
type="submit" value="Login"/></td>
+                <td colspan="4" align="center" class="MediumBackground"><input name="submit"
type="submit" value="<fmt:message key="console.common.login"/>"/></td>
                 <td class="MediumBackground">&nbsp;</td>
               </tr>
               <tr>



Mime
View raw message