geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r731587 - in /geronimo/server/trunk/plugins: console/console-base-portlets/src/main/resources/ console/console-portal-driver/src/main/resources/ console/console-portal-driver/src/main/webapp/ console/plugin-portlets/src/main/resources/ cons...
Date Mon, 05 Jan 2009 14:47:07 GMT
Author: dwoods
Date: Mon Jan  5 06:47:06 2009
New Revision: 731587

URL: http://svn.apache.org/viewvc?rev=731587&view=rev
Log:
GERONIMO-4474 Additional localization patches from Gang Yin.

Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties Mon Jan  5 06:47:06 2009
@@ -590,7 +590,7 @@
 
 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;<BR>Administration Console!
+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.

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties Mon Jan  5 06:47:06 2009
@@ -590,7 +590,7 @@
 
 welcome.welcomeMaximized.fragment1   = \u7528\u6237\u767B\u5F55\u7BA1\u7406\u63A7\u5236\u53F0\u540E\u5C06\u9996\u5148\u770B\u5230\u6B64\u9875\u3002\u5728\u6B64\u9875\u9762\u6709\u6B64\u7BA1\u7406\u63A7\u5236\u53F0\u7684\u4E00\u4E2A\u7B80\u5355\u4ECB\u7ECD\u3002
 welcome.welcomeMaximized.fragment2   = \u8981\u8FD4\u56DE\u6B22\u8FCE\u9875\u9762\uFF0C\u8BF7\u5355\u51FB\u6B64\u5C0F\u7A97\u53E3\u6807\u9898\u680F\u4E2D\u7684\u201Cview\u201D\u3002
-welcome.welcomeMaximized.title       = \u6B22\u8FCE\u6765\u5230Geronimo&#8482;<BR>\u7BA1\u7406\u63A7\u5236\u53F0.
+welcome.welcomeMaximized.title       = \u6B22\u8FCE\u6765\u5230Geronimo&#8482;\u7BA1\u7406\u63A7\u5236\u53F0!
 welcome.welcomeNormal.about1         = \u7BA1\u7406\u63A7\u5236\u53F0\u63D0\u4F9B\u4E86\u4E00\u79CD\u65B9\u4FBF\u7684\u3001\u53CB\u597D\u7684\u65B9\u5F0F\u6765\u7BA1\u7406Geronimo\u670D\u52A1\u5668\u7684\u5F88\u591A\u65B9\u9762\u3002\u5B83\u73B0\u5728\u6B63\u5728\u5B8C\u5584\u4E4B\u4E2D\uFF0C\u5C06\u4F1A\u63D0\u4F9B\u66F4\u591A\u7684\u529F\u80FD\u3002\u53EF\u4EE5\u901A\u8FC7\u5DE6\u8FB9\u7684\u5BFC\u822A\u680F\u6765\u8FDB\u884C\u5404\u9879\u64CD\u4F5C\u3002
 welcome.welcomeNormal.about2         = \u771F\u6B63\u7684\u5DE5\u4F5C\u5728\u8FD9\u91CC\u7684\u4E3B\u5DE5\u4F5C\u533A\u57DF\u8FDB\u884C.\u6BCF\u4E2A\u89C6\u56FE\u5305\u542B\u4E00\u4E2A\u6216\u591A\u4E2Aportlet(\u81EA\u5305\u542B\u7684\u89C6\u56FE\u7247\u6BB5),portlet\u7684\u5934\u90E8\u901A\u5E38\u5305\u542B\u4E86\u4E00\u4E2A\u5E2E\u52A9\u94FE\u63A5.\u67E5\u770B\u5E76\u5C1D\u8BD5\u8FD9\u4E2Aportlet\u5934\u90E8\u7684\u4F8B\u5B50.
 welcome.welcomeNormal.about3         = \u4F60\u53EF\u4EE5\u901A\u8FC7\u53F3\u8FB9\u63D0\u4F9B\u7684\u53C2\u8003\u4E86\u89E3Apache Geronimo,\u5B83\u7684\u529F\u80FD\u548C\u672A\u6765\u7684\u53D1\u884C\u7248\u4E2D\u53EF\u80FD\u589E\u52A0\u7684\u65B0\u5185\u5BB9.

Modified: 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=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties Mon Jan  5 06:47:06 2009
@@ -14,15 +14,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
+
 console.common.ConsoleLogIn               = Geronimo Console Login
+console.common.applications               = Applications
 console.common.login                      = Login
 console.common.loginToConsole             = Log in to the Geronimo Console
+console.common.pages                      = Pages
 console.common.password                   = Password
 console.common.username                   = Username
 console.head.title                        = Geronimo Console
-console.common.pages                      = Pages
-console.common.applications								= Applications
-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.

Modified: 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=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties Mon Jan  5 06:47:06 2009
@@ -26,7 +26,7 @@
 console.login.components                  = <strong>Geronimo&#8482;</strong> \u96C6\u6210\u4E86\u5982\u4E0B\u7EC4\u4EF6:<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>\u662F\u4E00\u4E2A\u901A\u8FC7\u4E86Java\u8BA4\u8BC1\u7684\u3001\u751F\u4EA7\u7EA7\u7684\u5E73\u53F0\u3002\u5176\u521D\u8877\u662F\u4E3A\u4E86\u8BA9\u5F00\u53D1\u8005\u80FD\u591F\u5FEB\u901F\u90E8\u7F72\u548C\u7BA1\u7406\u5176\u5E94\u7528\uFF0C\u7ED3\u679C\u4FBF\u8BDE\u751F\u4E86\u4E00\u4E2A\u5B8C\u6574\u5E76\u4E14\u529F\u80FD\u5F3A\u5927\u7684\u5E94\u7528\u5E73\u53F0\u3002\u5B83\u5229\u7528\u4E86\u5F00\u6E90\u793E\u7684\u6700\u65B0\u521B\u65B0\u4E14\u7B80\u5316\u4E86\u5E94\u7528\u7684\u90E8\u7F72\u548C\u7EF4\u62A4\u3002
 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\u4F7F\u7528Geronimo&#8482; \u7BA1\u7406\u63A7\u5236\u53F0
+console.login.welcome                     = \u6B22\u8FCE\u4F7F\u7528Geronimo&#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

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=731587&r1=731586&r2=731587&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 Mon Jan  5 06:47:06 2009
@@ -124,7 +124,7 @@
         </tr>
 
         <tr>
-          <td><font size="1"><STRONG><fmt:message key="console.login.welcome"/></STRONG></FONT></td>
+          <td><font size="1"><STRONG>&nbsp;<fmt:message key="console.login.welcome"/></STRONG></FONT></td>
         </TR>
         <tr>
           <TD>

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=731587&r1=731586&r2=731587&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 Mon Jan  5 06:47:06 2009
@@ -117,7 +117,7 @@
         </tr>
 
         <tr>
-          <td><font size="1"><STRONG>Welcome to the Geronimo&#8482; Console</FONT></td>
+          <td><font size="1"><STRONG>&nbsp;<fmt:message key="console.login.welcome"/></STRONG></FONT></td>
         </TR>
         <tr>
           <TD>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties Mon Jan  5 06:47:06 2009
@@ -120,8 +120,7 @@
 car.pluginParams.title                        = <b>Export Plugin</b> -- Configure Plugin Data
 car.pluginParams.uniqueIDExp                  = The globally unique ID for this plugin.  This is determined from the installation in the server you're exporting.  This defines the version number for the plugin, so make sure it's correct.
 car.results.filesProcessed                    = Files Processed
-car.results.title                             = The plugin {0} has been installed.
-car.results.titles                            = The following plugin(s) have been installed:
+car.results.titles                            = The following plugin(s) have been installed
 car.viewForDownload.author                    = Author
 car.viewForDownload.category                  = Category
 car.viewForDownload.dependencies              = Dependencies
@@ -208,6 +207,7 @@
 realmwizard.common.JDBCUsername                  = JDBC Username
 realmwizard.common.addSecurityRealm              = Add new security realm
 realmwizard.common.addToEAR                      = Add to EAR
+realmwizard.common.comfirmPwd                    = Confirm password
 realmwizard.common.configurationOptions          = Configuration Options
 realmwizard.common.controlFlag                   = Control Flag
 realmwizard.common.databasePool                  = Database Pool

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties Mon Jan  5 06:47:06 2009
@@ -119,9 +119,8 @@
 car.pluginParams.prerequisiteTypeExp          = \u4E3A\u4E86\u65B9\u4FBF\u7528\u6237\uFF0C\u5BF9\u5148\u51B3\u6761\u4EF6\u7684\u7C7B\u578B\u7684\u7B80\u77ED\u63CF\u8FF0\u3002\u53EF\u53D6\u7684\u503C\u5305\u62EC<tt>Database Pool</tt> \uFF0C<tt>Web Container</tt>\u7B49\u7B49\u3002
 car.pluginParams.title                        = <b>\u5BFC\u51FA\u63D2\u4EF6</b> -- \u914D\u7F6E\u63D2\u4EF6
 car.pluginParams.uniqueIDExp                  = \u8FD9\u4E2A\u63D2\u4EF6\u5168\u5C40\u552F\u4E00\u7684ID\uFF0C\u8FD9\u662F\u7531\u4F60\u8981\u5BFC\u51FA\u7684\u670D\u52A1\u5668\u51B3\u5B9A\u7684\u3002\u8FD9\u4E2AID\u786E\u5B9A\u4E86\u63D2\u4EF6\u7684\u7248\u672C\u53F7\uFF0C\u6240\u4EE5\u8BF7\u786E\u4FDD\u4F60\u8F93\u5165\u7684ID\u7684\u6B63\u786E\u6027\u3002
-car.results.filesProcessed                    = \u6587\u4EF6\u5DF2\u5904\u7406
-car.results.title                             = \u5DF2\u7ECF\u5B89\u88C5\u4E86\u63D2\u4EF6{0}\u3002
-car.results.titles                            = \u5DF2\u5B89\u88C5\u5982\u4E0B\u63D2\u4EF6:
+car.results.filesProcessed                    = \u5DF2\u5904\u7406\u6587\u4EF6
+car.results.titles                            = \u5DF2\u5B89\u88C5\u5982\u4E0B\u63D2\u4EF6
 car.viewForDownload.author                    = \u4F5C\u8005
 car.viewForDownload.category                  = \u7C7B\u522B
 car.viewForDownload.dependencies              = \u4F9D\u8D56
@@ -163,7 +162,7 @@
 consolebase.common.done            = \u5B8C\u6210
 consolebase.common.edit            = \u7F16\u8F91
 consolebase.common.install         = \u5B89\u88C5
-consolebase.common.name            = \u540D\u5B57
+consolebase.common.name            = \u540D\u79F0
 consolebase.common.next            = \u4E0B\u4E00\u6B65
 consolebase.common.password        = \u5BC6\u7801
 consolebase.common.restart         = \u91CD\u542F
@@ -181,26 +180,26 @@
 
 realmwizard._sql.JDBCDriverClassExp              = JDBC \u9A71\u52A8\u7C7B\u7684\u5B8C\u5168\u9650\u5B9A\u540D\u3002\u8981\u6C42\u9A71\u52A8\u7C7B\u5FC5\u987B\u80FD\u5728\u4E0B\u4E00\u4E2A\u5B57\u6BB5\u6307\u5B9A\u7684JAR\u5305\u4E2D\u627E\u5230\u3002
 realmwizard._sql.JDBCPasswordExp                 = \u8FDE\u63A5\u6570\u636E\u5E93\u7684\u5BC6\u7801
-realmwizard._sql.JDBCUrlExp                      = JDBC URL \u786E\u5B9A\u4E86\u8981\u8FDE\u63A5\u6570\u636E\u5E93\u65F6\u7684\u7EC6\u8282\u3002\u5BF9\u4E8E\u4E0D\u540C\u7684 JDBC \u9A71\u52A8\uFF0C\u683C\u5F0F\u5C06\u6709\u6240\u4E0D\u540C\u3002
+realmwizard._sql.JDBCUrlExp                      = JDBC URL \u6307\u5B9A\u4E86\u8981\u8FDE\u63A5\u6570\u636E\u5E93\u65F6\u7684\u7EC6\u8282\u3002\u5BF9\u4E8E\u4E0D\u540C\u7684 JDBC \u9A71\u52A8\uFF0C\u683C\u5F0F\u5C06\u6709\u6240\u4E0D\u540C\u3002
 realmwizard._sql.JDBCUsernameExp                 = \u8FDE\u63A5\u6570\u636E\u5E93\u7684\u7528\u6237\u540D
 realmwizard._sql.databasePoolExp                 = \u767B\u5F55\u6A21\u5757\u7528\u6765\u8FDE\u63A5\u6570\u636E\u5E93\u7684\u6570\u636E\u5E93\u8FDE\u63A5\u6C60\u3002\u5982\u679C\u6307\u5B9A\u4E86\u6570\u636E\u5E93\u8FDE\u63A5\u6C60\u7684\u8BDD\uFF0C\u4E0B\u9762\u7684\u5176\u5B83\u8BBE\u7F6E\u90FD\u4E0D\u662F\u5FC5\u987B\u7684\u3002
 realmwizard._sql.digestAlgorithmExp              = \u5BF9\u4E8E\u6B64\u53E3\u4EE4\u8981\u4F7F\u7528\u7684\u6D88\u606F\u6458\u8981\u7B97\u6CD5 (\u4F8B\u5982 MD5, SHA1 \u7B49).  \u5982\u679C\u4E0D\u4F7F\u7528\u6D88\u606F\u6458\u8981\u7B97\u6CD5\uFF0C\u8BF7\u4F7F\u6B64\u503C\u4E3A\u7A7A\u3002
 realmwizard._sql.digestEncodingExp               = \u5BF9\u6458\u8981\u7684\u7F16\u7801 (\u4F8B\u5982 hex, base64).  \u4EC5\u5F53\u6307\u5B9A\u4E86\u6D88\u606F\u6458\u8981\u7B97\u6CD5\u65F6\u4F7F\u7528\u3002\u5982\u679C\u4E0D\u77E5\u9053\u7F16\u7801\u7B97\u6CD5\uFF0C\u4F1A\u9ED8\u8BA4\u4F7F\u7528hex\u7B97\u6CD5\u3002
 realmwizard._sql.driverJARExp                    = \u5305\u542B\u9009\u5B9A JDBC \u9A71\u52A8\u7684 JAR \u5305\u3002\u5FC5\u987B\u5B89\u88C5\u5230GERONIMO/repository/\u76EE\u5F55\u540E\u624D\u4F1A\u5728\u5217\u8868\u4E2D\u663E\u793A\u3002
 realmwizard._sql.eitherPoolOrJDBC                = SQL \u5B89\u5168\u57DF\u5FC5\u987B\u901A\u8FC7\u6570\u636E\u5E93\u8FDE\u63A5\u6C60\u6216\u8005 JDBC \u8FDE\u63A5\u6765\u8FDE\u5230\u6570\u636E\u5E93\u3002\u8BF7\u9009\u62E9\u662F\u4F7F\u7528\u6570\u636E\u5E93\u8FDE\u63A5\u6C60\uFF0C\u8FD8\u662F\u4F7F\u7528JDBC\u3002
-realmwizard._sql.groupSelectSQLExp               = \u7528\u6765\u83B7\u5F97\u7528\u6237\u6240\u5C5E\u7EC4\u7684\u4FE1\u606F\u3002\u8FD9\u4E2A\u8BED\u53E5\u5E94\u8BE5\u8FD4\u56DE\u4E24\u884C\uFF0C\u7B2C\u4E00\u884C\u662F\u7528\u6237\u540D\uFF0C\u7B2C\u4E8C\u884C\u662F\u7EC4\u540D\u3002\u8FD9\u4E2A\u8BED\u53E5\u53EF\u4EE5\u4F7F\u7528\u9884\u5907\u8BED\u53E5\u7684\u8BED\u6CD5\uFF0C\u7528?\u6765\u8868\u793A\u53C2\u6570\u3002\u4E00\u4E2A\u5178\u578B\u7684\u8BBE\u7F6E\u662F <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt>\u6216\u8005\uFF0C\u4E3A\u4E86\u83B7\u5F97\u66F4\u52A0\u89C4\u8303\u7684\u6A21\u5F0F\uFF0C\u53EF\u7528<tt>SELECT u.username, g.name FROM app_users u, groups g, user_groups ug WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt>\u3002
+realmwizard._sql.groupSelectSQLExp               = \u7528\u6765\u83B7\u5F97\u7528\u6237\u6240\u5C5E\u7EC4\u7684\u4FE1\u606F\u3002\u8FD9\u4E2A\u8BED\u53E5\u5E94\u8BE5\u8FD4\u56DE\u4E24\u5217\u503C\uFF0C\u7B2C\u4E00\u5217\u662F\u7528\u6237\u540D\uFF0C\u7B2C\u4E8C\u5217\u662F\u7EC4\u540D\u3002\u8FD9\u4E2A\u8BED\u53E5\u53EF\u4EE5\u4F7F\u7528 PreparedStatement \u8BED\u6CD5\uFF0C\u7528?\u6765\u8868\u793A\u53C2\u6570\u3002\u4E00\u4E2A\u5178\u578B\u7684\u8BBE\u7F6E\u662F <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt>\u6216\u8005\uFF0C\u4E3A\u4E86\u83B7\u5F97\u66F4\u52A0\u89C4\u8303\u7684\u6A21\u5F0F\uFF0C\u53EF\u7528<tt>SELECT u.username, g.name FROM app_users u, groups g, user_groups ug WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt>\u3002
 realmwizard._sql.selectDatabasePool              = SQL \u5B89\u5168\u57DF\u5FC5\u987B\u901A\u8FC7\u6570\u636E\u5E93\u8FDE\u63A5\u6C60\u6216\u8005 JDBC \u8FDE\u63A5\u6765\u8FDE\u5230\u6570\u636E\u5E93\u3002\u8BF7\u9009\u62E9\u662F\u4F7F\u7528\u6570\u636E\u5E93\u8FDE\u63A5\u6C60\uFF0C\u8FD8\u662F\u4F7F\u7528JDBC\u3002
-realmwizard._sql.userSelectSQLExp                = \u7528\u6765\u83B7\u5F97\u7528\u6237\u540D/\u5BC6\u7801\u7684 SQL \u8BED\u53E5\u3002\u8FD9\u4E2A\u8BED\u53E5\u5E94\u8BE5\u8FD4\u56DE\u4E24\u5217\u503C\uFF0C\u7B2C\u4E00\u5217\u662F\u7528\u6237\u540D\uFF0C\u7B2C\u4E8C\u5217\u662F\u5BC6\u7801\u3002\u8FD9\u4E2A\u8BED\u53E5\u53EF\u4EE5\u4F7F\u7528\u9884\u5907\u8BED\u53E5\u7684\u8BED\u6CD5\uFF0C\u7528 ? \u6765\u8868\u793A\u53C2\u6570\u3002\u4E00\u4E2A\u5178\u578B\u7684\u8BBE\u7F6E\u662F<tt>SELECT username, password FROM app_users WHERE username=?</tt>
-realmwizard.advanced.AuditEnabledExp             = \u5982\u679C\u542F\u7528\uFF0C\u6BCF\u6B21\u767B\u5F55\u5C1D\u8BD5\u90FD\u4F1A\u88AB\u8BB0\u5F55\u5230\u4E00\u4E2A\u7279\u5B9A\u7684\u6587\u4EF6\u3002\u6587\u4EF6\u8DEF\u5F84\u5E94\u8BE5\u662F\u76F8\u5BF9\u4E8E Geronimo \u7684\u5B89\u88C5\u76EE\u5F55\uFF08\u901A\u5E38\u7684\u53D6\u503C\u53EF\u80FD\u662F<tt>var/log/login-attempts.log</tt>\uFF09\u3002
+realmwizard._sql.userSelectSQLExp                = \u7528\u6765\u83B7\u5F97\u7528\u6237\u540D/\u5BC6\u7801\u7684 SQL \u8BED\u53E5\u3002\u8FD9\u4E2A\u8BED\u53E5\u5E94\u8BE5\u8FD4\u56DE\u4E24\u5217\u503C\uFF0C\u7B2C\u4E00\u5217\u662F\u7528\u6237\u540D\uFF0C\u7B2C\u4E8C\u5217\u662F\u5BC6\u7801\u3002\u8FD9\u4E2A\u8BED\u53E5\u53EF\u4EE5\u4F7F\u7528 PreparedStatement \u8BED\u6CD5\uFF0C\u7528 ? \u6765\u8868\u793A\u53C2\u6570\u3002\u4E00\u4E2A\u5178\u578B\u7684\u8BBE\u7F6E\u662F<tt>SELECT username, password FROM app_users WHERE username=?</tt>
+realmwizard.advanced.AuditEnabledExp             = \u5982\u679C\u542F\u7528\uFF0C\u6BCF\u6B21\u5C1D\u8BD5\u767B\u5F55\u90FD\u4F1A\u88AB\u8BB0\u5F55\u5230\u7279\u5B9A\u7684\u6587\u4EF6\u3002\u6587\u4EF6\u8DEF\u5F84\u5E94\u76F8\u5BF9\u4E8E Geronimo \u7684\u5BB6\u76EE\u5F55\uFF08\u901A\u5E38\u7684\u53D6\u503C\u53EF\u80FD\u662F<tt>var/log/login-attempts.log</tt>\uFF09\u3002
 realmwizard.advanced.credentialName              = \u8BC1\u4E66\u540D\u79F0
-realmwizard.advanced.credentialNameExp           = \u5982\u679C\u542F\u7528,\u5B89\u5168\u57DF\u5C06\u5B58\u50A8\u6BCF\u4E2A\u7528\u6237\u540D\u548C\u5BC6\u7801\u5230\u4E00\u4E2A\u79C1\u6709\u8BC1\u4E66,\u8BE5\u8BC1\u4E66\u4F4D\u4E8E\u7279\u5B9A\u8BC1\u4E66\u540D\u79F0\u4E0B\u7684Subject\u4E2D.
+realmwizard.advanced.credentialNameExp           = \u5982\u679C\u542F\u7528\uFF0C\u5B89\u5168\u57DF\u5C06\u5B58\u50A8\u6BCF\u4E2A\u7528\u6237\u540D\u548C\u5BC6\u7801\u5230\u4E00\u4E2A\u79C1\u6709\u8BC1\u4E66,\u8BE5\u8BC1\u4E66\u4F4D\u4E8E\u7279\u5B9A\u8BC1\u4E66\u540D\u79F0\u4E0B\u7684Subject\u4E2D.
 realmwizard.advanced.failuresWithin              = \u6B21\u767B\u5F55\u5931\u8D25\u540E\uFF0C\u5728
 realmwizard.advanced.failuresWithinSeconds       = \u79D2\u5185
 realmwizard.advanced.keepAccountLockedFor        = \u5E76\u4FDD\u6301\u5E10\u53F7\u9501\u5B9A
 realmwizard.advanced.keepAccountLockedForSeconds = \u79D2
 realmwizard.advanced.lockUserAfter               = \u9501\u5B9A\u7528\u6237\u5728
-realmwizard.advanced.lockoutEnabledExp           = \u5982\u679C\u542F\u7528\uFF0C\u7528\u6237\u5728\u67D0\u4E00\u7279\u5B9A\u65F6\u95F4\u6BB5\u767B\u5F55\u5931\u8D25\u4E00\u5B9A\u6B21\u6570\u3002\u7528\u6237\u7684\u5E10\u53F7\u5C06\u4F1A\u88AB\u9501\u5B9A\u4EE5\u7279\u5B9A\u65F6\u95F4\u6BB5\u3002\u8FD9\u53EF\u4EE5\u7528\u6765\u9632\u6B62\u66B4\u529B\u7834\u89E3\u5E10\u53F7\u7684\u653B\u51FB\u3002
-realmwizard.advanced.namedCredential             = \u5DF2\u547D\u540D\u7684\u8BC1\u4E66
+realmwizard.advanced.lockoutEnabledExp           = \u5982\u679C\u542F\u7528\uFF0C\u7528\u6237\u5728\u4E00\u5B9A\u65F6\u95F4\u6BB5\u5185\u767B\u5F55\u5931\u8D25\u4E00\u5B9A\u6B21\u6570\u540E\u7528\u6237\u7684\u5E10\u53F7\u5C06\u4F1A\u88AB\u9501\u5B9A\u4E00\u6BB5\u65F6\u95F4\u3002\u8FD9\u53EF\u4EE5\u7528\u6765\u9632\u6B62\u66B4\u529B\u7834\u89E3\u5E10\u53F7\u7684\u653B\u51FB\u3002
+realmwizard.advanced.namedCredential             = Named Credential
 realmwizard.advanced.storePasswordEnabledExp     = \u5982\u679C\u542F\u7528\uFF0C\u6BCF\u4E2A\u7528\u6237\u7684\u5BC6\u7801\u4F1A\u4FDD\u5B58\u5728Subject\u7684\u79C1\u6709credential\u4E2D\u3002\u8FD9\u5C06\u5141\u8BB8\u5728\u767B\u5F55\u5B8C\u6210\u4EE5\u540E\uFF0C\u53EF\u4EE5\u5F97\u5230\u5BC6\u7801\u3002 \u8FD9\u901A\u5E38\u4E0D\u662F\u5FC5\u987B\u7684\u3002
 realmwizard.advanced.title                       = <b>\u521B\u5EFA\u5B89\u5168\u57DF</b> -- \u6B65\u9AA43:\u9AD8\u7EA7\u914D\u7F6E\u9009\u9879
 realmwizard.common.JDBCDriverClass               = JDBC\u9A71\u52A8\u7C7B
@@ -209,6 +208,7 @@
 realmwizard.common.JDBCUsername                  = JDBC\u7528\u6237\u540D
 realmwizard.common.addSecurityRealm              = \u6DFB\u52A0\u65B0\u7684\u5B89\u5168\u57DF
 realmwizard.common.addToEAR                      = \u6DFB\u52A0\u5230EAR\u4E2D
+realmwizard.common.comfirmPwd                    = \u786E\u8BA4\u5BC6\u7801
 realmwizard.common.configurationOptions          = \u914D\u7F6E\u9009\u9879
 realmwizard.common.controlFlag                   = \u63A7\u5236\u6807\u5FD7
 realmwizard.common.databasePool                  = \u6570\u636E\u5E93\u8FDE\u63A5\u6C60
@@ -244,7 +244,7 @@
 realmwizard.common.userSelectSQL                 = User SELECT SQL
 realmwizard.configure.title                      = <b>\u521B\u5EFA\u5B89\u5168\u57DF</b> --\u6B65\u9AA4 2:\u914D\u7F6E\u767B\u5F55\u6A21\u5757
 realmwizard.edit.configurationOptionsExp         = \u767B\u5F55\u6A21\u5757\u5FC5\u987B\u7684\u4EFB\u4F55\u914D\u7F6E\u9009\u9879\uFF0C\u4EE5\u6807\u51C6\u7684Java\u5C5E\u6027\u6587\u4EF6\u683C\u5F0F\uFF08\u4E00\u884C\u4E00\u4E2A\uFF0C\u5982\uFF1A<tt>name=value</tt>\uFF09
-realmwizard.edit.controlFlagExp                  = \u767B\u5F55\u6A21\u5757\u7684\u63A7\u5236\u6807\u5FD7\uFF0C\u7528\u6765\u63A7\u5236\u5F53\u767B\u5F55\u6A21\u5757\u6210\u529F\u6216\u5931\u8D25\u65F6\uFF0C\u603B\u7684\u767B\u5F55\u8FC7\u7A0B\u4F1A\u600E\u4E48\u6837\u3002\u66F4\u8BE6\u7EC6\u7684\u4FE1\u606F\uFF0C\u8BF7\u770B
+realmwizard.edit.controlFlagExp                  = \u767B\u5F55\u6A21\u5757\u7684\u63A7\u5236\u6807\u5FD7\uFF0C\u7528\u6765\u63A7\u5236\u5F53\u767B\u5F55\u6A21\u5757\u6210\u529F\u6216\u5931\u8D25\u65F6\uFF0C\u603B\u7684\u767B\u5F55\u8FC7\u7A0B\u4F1A\u600E\u6837\u3002\u66F4\u8BE6\u7EC6\u7684\u4FE1\u606F\uFF0C\u8BF7\u770B
 realmwizard.edit.ifLeaveBlank                    = \u5982\u679C\u4F60\u4E0D\u9700\u8981\u4F7F\u7528\u4E0B\u5217\u6240\u6709\u7684\u767B\u5F55\u6A21\u5757\uFF0C\u53EA\u9700\u8981\u628A\u989D\u5916\u7684\u6A21\u5757\u7559\u7A7A\u5373\u53EF\u3002
 realmwizard.edit.loginDomainExp                  = \u8FD9\u4E2A\u767B\u5F55\u6A21\u5757\u5BF9\u5E94\u7684\u767B\u5F55\u57DF\uFF0C\u6A21\u5757\u540D\u79F0\u5728\u5B89\u5168\u57DF\u7684\u6240\u6709\u6A21\u5757\u4E2D\u5FC5\u987B\u662F\u552F\u4E00\u7684\u3002\u8FD9\u6837\u5C31\u53EF\u4EE5\u901A\u8FC7\u4E3B\u4F53(principal) \u6765\u533A\u5206\u4E24\u4E2A\u76F8\u540C\u7684\u767B\u5F55\u6A21\u5757\u3002\uFF08\u4F8B\u5982\uFF0C\u4ECE\u4E24\u4E2ALDAP\u767B\u5F55\u6A21\u5757\u6307\u5411\u4E24\u4E2A\u4E0D\u540C\u7684LDAP\u670D\u52A1\u5668\uFF09
 realmwizard.edit.loginModuleClassExp             = \u767B\u5F55\u6A21\u5757\u7684\u5B8C\u5168\u9650\u5B9A\u7C7B\u540D\u3002
@@ -252,26 +252,26 @@
 realmwizard.edit.loginModuleJARExp               = \u6B64jar\u6587\u4EF6\u4E2D\u5305\u542B\u767B\u5F55\u6A21\u5757\u7C7B\u548C\u4E3B\u4F53\u7C7B.
 realmwizard.edit.realmNameExp                    = \u53D6\u4E00\u4E2A\u4E0D\u540C\u4E8E\u670D\u52A1\u5668\u4E2D\u4EFB\u4F55\u5176\u4ED6\u5B89\u5168\u57DF\u7684\u540D\u79F0\u3002\u540D\u79F0\u4E2D\u8BF7\u4E0D\u8981\u6709\u7A7A\u683C\u3002\u5176\u4ED6\u7EC4\u4EF6\u5C06\u4F7F\u7528\u8FD9\u4E2A\u540D\u79F0\u6765\u6307\u5411\u6B64\u5B89\u5168\u57DF\u3002
 realmwizard.edit.serverSideExp                   = \u5728\u5E94\u7528\u670D\u52A1\u5668\u4E2D\u6267\u884CServer-side\u7684\u767B\u5F55\u6A21\u5757\uFF08\u8FD9\u901A\u5E38\u662F\u6B63\u786E\u7684\uFF09\u3002\u5728\u5BA2\u6237\u7AEF\u73AF\u5883\u6267\u884C\u7684\u662FClient-side\u7684\u767B\u5F55\u6A21\u5757\uFF0C\u4E3E\u4F8B\u6765\u8BF4\uFF0C\u4E3A\u4E86\u4F7F\u7528\u5BA2\u6237\u64CD\u4F5C\u7CFB\u7EDF\u7CFB\u7EDF\u7684\u5355\u70B9\u767B\u5F55\u7279\u6027\u3002
-realmwizard.edit.summary                         = <p>\u8FD9\u4E2A\u9875\u9762\u7528\u6765\u7F16\u8F91\u65B0\u7684\u6216\u5DF2\u5B58\u5728\u7684\u5B89\u5168\u57DF\u3002</p><p>\u4E00\u4E2A\u5B89\u5168\u57DF\u53EF\u80FD\u6709\u4E00\u4E2A\u6216\u591A\u4E2A\u767B\u5F55\u6A21\u5757\u3002\u5F88\u591A\u7B80\u5355\u7684\u5B89\u5168\u57DF\u4EC5\u4EC5\u6709\u4E00\u4E2A\u767B\u5F55\u6A21\u5757\u3002\u989D\u5916\u7684\u767B\u5F55\u6A21\u5757\u53EF\u7528\u6765\u8BBF\u95EE\u66F4\u591A\u7684\u4E0E\u5B89\u5168\u76F8\u5173\u7684\u4FE1\u606F\u3002\u6216\u8005\u6DFB\u52A0\u7C7B\u4F3C\u4E8E\u5BA1\u6838\u5B89\u5168\u57DF\u800C\u4E0D\u8981\u60F3\u5B89\u5168\u57DF\u9A8C\u8BC1\u8FC7\u7A0B\u8FD9\u6837\u7684\u529F\u80FD\u3002
+realmwizard.edit.summary                         = <p>\u8FD9\u4E2A\u9875\u9762\u7528\u6765\u7F16\u8F91\u65B0\u7684\u6216\u5DF2\u5B58\u5728\u7684\u5B89\u5168\u57DF\u3002</p><p>\u4E00\u4E2A\u5B89\u5168\u57DF\u53EF\u80FD\u5305\u542B\u4E00\u4E2A\u6216\u591A\u4E2A\u767B\u5F55\u6A21\u5757\u3002\u5F88\u591A\u7B80\u5355\u7684\u5B89\u5168\u57DF\u4EC5\u4EC5\u5305\u542B\u4E00\u4E2A\u767B\u5F55\u6A21\u5757\u3002\u53EF\u4EE5\u4F7F\u7528\u989D\u5916\u7684\u767B\u5F55\u6A21\u5757\u6765\u8BBF\u95EE\u66F4\u591A\u7684\u5B89\u5168\u76F8\u5173\u4FE1\u606F\u3002\u6216\u8005\u6DFB\u52A0\u7C7B\u4F3C\u4E8E\u5BA1\u6838\u5B89\u5168\u57DF\u800C\u4E0D\u5F71\u54CD\u5B89\u5168\u57DF\u9A8C\u8BC1\u6D41\u7A0B\u7684\u529F\u80FD\u3002
 realmwizard.edit.supportAdvancedMappingExp       = \u901A\u5E38\uFF0CGeronimo\u4E0D\u80FD\u533A\u522B\u6709\u540C\u6837\u540D\u79F0\u7684\u4E24\u4E2A\u4E0D\u540C\u7684\u4E3B\u4F53\uFF0C\u4EE5\u53CA\u4E24\u4E2A\u4E0D\u540C\u767B\u5F55\u6A21\u5757\u4EA7\u751F\u7684\u540C\u6837\u7684\u4E3B\u4F53\u7C7B\u3002\u5982\u679C\u542F\u7528\u5219\u8FD9\u4E2A\u9009\u9879\uFF0CGeronimo \u4F1A\u5305\u88C5\u4E3B\u4F53\u5E76\u8DDF\u8E2A\u6BCF\u4E2A\u4E3B\u4F53\u6765\u81EA\u54EA\u4E2A\u5B89\u5168\u57DF\u548C\u767B\u5F55\u6A21\u5757\u3002\u8FD9\u8BA9\u4F60\u53EF\u4EE5\u5728Geronimo \u90E8\u7F72\u8BA1\u5212\u7684\u5B89\u5168\u6620\u5C04\u4E2D\u4F7F\u7528 realm-principal \u548C login-domain-principal \u5143\u7D20\u3002
 realmwizard.list.noSecurityRealms                = \u4E0D\u5B58\u5728\u9884\u5B9A\u4E49\u7684\u5B89\u5168\u57DF
-realmwizard.list.seeExamples                     = \u5BF9\u4E8E\u6BCF\u4E00\u4E2A\u57DF\uFF0C\u53EF\u4EE5\u70B9\u51FB<b>\u7528\u6CD5</b>\u6765\u770B\u5982\u4F55\u5728\u4F60\u7684\u5E94\u7528\u4E2D\u4F7F\u7528\u6B64\u57DF\u3002
-realmwizard.list.title                           = \u8FD9\u4E2A\u9875\u9762\u663E\u793A\u4E86\u6240\u6709\u53EF\u7528\u7684\u5B89\u5168\u57DF\u3002\u53EF\u4EE5\u7F16\u8F91\u670D\u52A1\u5668\u7EA7\u522B\u7684\u5B89\u5168\u57DF\uFF0C\u4F46\u662F\u88AB\u90E8\u7F72\u4E3A\u5355\u4E2A\u5E94\u7528\u4E00\u90E8\u5206\u7684\u5B89\u5168\u57DF\u5219\u4E0D\u80FD\u88AB\u7F16\u8F91\uFF08\u800C\u662F\u4FEE\u6539\u5E94\u7528\u7684\u90E8\u7F72\u8BA1\u5212\uFF09\u3002
-realmwizard.selectType.nameOfSecurityRealmExp    = \u7ED9\u5B89\u5168\u57DF\u9009\u53D6\u4E00\u4E2A\u4E0D\u540C\u4E8E\u670D\u52A1\u5668\u4E2D\u5176\u5B83\u5B89\u5168\u57DF\u7684\u540D\u79F0\uFF0C\u540D\u79F0\u4E2D\u8BF7\u4E0D\u8981\u6709\u7A7A\u683C\u3002\u5176\u5B83\u7EC4\u4EF6\u5C06\u4F7F\u7528\u8FD9\u4E2A\u540D\u79F0\u6765\u6307\u5411\u8FD9\u4E2A\u5B89\u5168\u57DF\u3002
-realmwizard.selectType.realmTypeExp              = \u767B\u5F55\u6A21\u5757\u7684\u7C7B\u578B\u7528\u6765\u8868\u793A\u5B89\u5168\u57DF\u5B58\u50A8\u4F4D\u7F6E\u3002\u9009\u62E9"Other"\uFF0C\u53EF\u4EE5\u624B\u52A8\u914D\u7F6E\u4E00\u4E9B\u9009\u9879\uFF0C\u6BD4\u5982\u8BF4\uFF1A\u81EA\u5B9A\u4E49\u767B\u5F55\u6A21\u5757\uFF0C\u548C\u5B89\u5168\u57DF\u6765\u4F7F\u7528\u591A\u4E2A\u767B\u5F55\u6A21\u5757\u6765\u83B7\u5F97\u7528\u6237\u8EAB\u4EFD\u4FE1\u606F\u3002
+realmwizard.list.seeExamples                     = \u5BF9\u4E8E\u5217\u51FA\u7684\u6BCF\u4E00\u4E2A\u57DF\uFF0C\u53EF\u4EE5\u70B9\u51FB<b>\u7528\u6CD5</b>\u6765\u67E5\u770B\u5982\u4F55\u5728\u4F60\u7684\u5E94\u7528\u4E2D\u4F7F\u7528\u8BE5\u57DF\u7684\u4F8B\u5B50\u3002
+realmwizard.list.title                           = \u8FD9\u4E2A\u9875\u9762\u663E\u793A\u4E86\u6240\u6709\u53EF\u7528\u7684\u5B89\u5168\u57DF\u3002\u53EF\u4EE5\u7F16\u8F91\u670D\u52A1\u5668\u7EA7\u522B\u7684\u5B89\u5168\u57DF\uFF0C\u4F5C\u4E3A\u5355\u4E2A\u5E94\u7528\u4E00\u90E8\u5206\u88AB\u90E8\u7F72\u7684\u5B89\u5168\u57DF\u5219\u4E0D\u80FD\u88AB\u7F16\u8F91\uFF08\u800C\u5E94\u4FEE\u6539\u5E94\u7528\u90E8\u7F72\u8BA1\u5212\uFF09\u3002
+realmwizard.selectType.nameOfSecurityRealmExp    = \u7ED9\u5B89\u5168\u57DF\u9009\u53D6\u4E00\u4E2A\u4E0D\u540C\u4E8E\u670D\u52A1\u5668\u4E2D\u5176\u5B83\u5B89\u5168\u57DF\u7684\u540D\u79F0\uFF0C\u540D\u79F0\u4E2D\u8BF7\u4E0D\u8981\u6709\u7A7A\u683C\u3002\u5176\u5B83\u7EC4\u4EF6\u5C06\u4F7F\u7528\u8FD9\u4E2A\u540D\u79F0\u6765\u6307\u5411\u8BE5\u5B89\u5168\u57DF\u3002
+realmwizard.selectType.realmTypeExp              = \u767B\u5F55\u6A21\u5757\u7684\u7C7B\u578B\u51B3\u5B9A\u4E86\u5B89\u5168\u57DF\u7C7B\u578B\u3002\u9009\u62E9"Other"\uFF0C\u53EF\u4EE5\u624B\u52A8\u914D\u7F6E\u4E00\u4E9B\u9009\u9879\uFF0C\u5305\u62EC\uFF1A\u81EA\u5B9A\u4E49\u767B\u5F55\u6A21\u5757\u3001\u4F7F\u7528\u591A\u4E2A\u767B\u5F55\u6A21\u5757\u6765\u586B\u5145\u7528\u6237\u8EAB\u4E3B\u4F53\u7684\u5B89\u5168\u57DF\u3002
 realmwizard.selectType.title                     = <b>\u521B\u5EFA\u5B89\u5168\u57DF</b> --\u6B65\u9AA41: \u9009\u62E9\u540D\u79F0\u548C\u7C7B\u578B
-realmwizard.showPlan.addToEARExp                 = \u4F60\u53EF\u4EE5\u90E8\u7F72\u5B89\u5168\u57DF\u6210EAR\u7684\u4E00\u90E8\u5206\uFF0C\u800C\u4E0D\u662F\u628A\u5B83\u90E8\u7F72\u6210\u9876\u5C42\u7684\u5B89\u5168\u57DF\u3002\u8981\u4F7F\u7528\u8FD9\u4E2A\u90E8\u7F72\u8BA1\u5212\u5C06\u5B89\u5168\u57DF\u6DFB\u52A0\u5230EAR\u4E2D\uFF0C\u5728\u4F60\u7684EAR\u4E2D\u521B\u5EFA\uFF0C<tt>META-INF/geronimo-application.xml</tt>\u6587\u4EF6\uFF0C\u5176\u4E2D\u542B\u6709\u4E0A\u9762\u90E8\u7F72\u8BA1\u5212\u7684<tt>dependency</tt>\u5143\u7D20\u548C<tt>gbean</tt> \u5143\u7D20\u3002\u5B83\u5E94\u8BE5\u8C61\u4E0B\u9762\u8FD9\u6837\uFF1A
-realmwizard.showPlan.deployCommandExp            = \u4E3A\u4E86\u5728\u547D\u4EE4\u884C\u4F7F\u7528\u8FD9\u4E2A\u90E8\u7F72\u8BA1\u5212\u6765\u90E8\u7F72\u5B89\u5168\u57DF\uFF0C\u9700\u8981\u62F7\u8D1D\u5E76\u7C98\u5E16\u4E0A\u9762\u7684\u3000XML\u3000\u5230\u4E00\u4E2A\u6587\u4EF6\uFF08\u5982<tt>security-realm.xml</tt>\uFF09\uFF0C\u5E76\u4FDD\u5B58\u5B83\u3002\u7136\u540E\u8FD0\u884C\u4E0B\u9762\u7684\u547D\u4EE4\uFF1A
+realmwizard.showPlan.addToEARExp                 = \u4F60\u53EF\u4EE5\u5C06\u5B89\u5168\u57DF\u90E8\u7F72\u4E3AEAR\u7684\u4E00\u90E8\u5206\uFF0C\u800C\u4E0D\u662F\u90E8\u7F72\u4E3A\u9876\u5C42\u7684\u5B89\u5168\u57DF\u3002\u8981\u4F7F\u7528\u8FD9\u4E2A\u90E8\u7F72\u8BA1\u5212\u5C06\u5B89\u5168\u57DF\u6DFB\u52A0\u5230EAR\u4E2D\uFF0C\u5728\u4F60\u7684EAR\u4E2D\u521B\u5EFA<tt>META-INF/geronimo-application.xml</tt>\u6587\u4EF6\uFF0C\u5176\u4E2D\u5305\u542B\u4E0A\u9762\u90E8\u7F72\u8BA1\u5212\u4E2D\u7684<tt>dependency</tt>\u5143\u7D20\u548C<tt>gbean</tt>\u5143\u7D20\u3002\u5B83\u5E94\u8BE5\u8C61\u4E0B\u9762\u8FD9\u6837\uFF1A
+realmwizard.showPlan.deployCommandExp            = \u5982\u679C\u5728\u547D\u4EE4\u884C\u4E2D\u4F7F\u7528\u8FD9\u4E2A\u90E8\u7F72\u8BA1\u5212\u6765\u90E8\u7F72\u5B89\u5168\u57DF\uFF0C\u5C06\u5B83\u62F7\u8D1D\u7C98\u5E16\u5230\u4E00\u4E2A\u6587\u4EF6\uFF08\u5982<tt>security-realm.xml</tt>\uFF09\u4E2D\u5E76\u4FDD\u5B58\u3002\u7136\u540E\u8FD0\u884C\u4E0B\u9762\u7684\u547D\u4EE4\uFF1A
 realmwizard.showPlan.title                       = <b>\u521B\u5EFA\u5B89\u5168\u57DF</b> -- \u663E\u793A\u90E8\u7F72\u8BA1\u5212
 realmwizard.testLogin.passwordExp                = \u7528\u6765\u767B\u5F55\u5230\u5B89\u5168\u57DF\u7684\u5BC6\u7801\u3002
-realmwizard.testLogin.summary                    = \u5728\u8FD9\u91CC\u4F60\u53EF\u4EE5\u4E3A\u5B89\u5168\u57DF\u7684\u4E3B\u767B\u5F55\u6A21\u5757\u8F93\u5165\u7528\u6237\u540D\u548C\u5BC6\u7801\uFF0C\u68C0\u67E5\u767B\u5F55\u662F\u5426\u6210\u529F\uFF0C\u548C\u4E3A\u7528\u6237\u521B\u5EFA\u4E86\u4EC0\u4E48\u4E3B\u4F53\u3002\u8FD9\u7528\u6765\u6307\u793A\u4E3B\u767B\u5F55\u6A21\u5757\u7684\u8BBE\u7F6E\u662F\u5426\u6B63\u786E\u3002\u5B83\u4E0D\u4F1A\u8C03\u7528\u8C61\u5BA1\u6838\uFF0C\u9501\u5B9A\u5E10\u53F7\u7B49\u9AD8\u7EA7\u529F\u80FD\u3002
+realmwizard.testLogin.summary                    = \u5728\u8FD9\u91CC\u4F60\u53EF\u4EE5\u4E3A\u5B89\u5168\u57DF\u7684\u4E3B\u767B\u5F55\u6A21\u5757\u8F93\u5165\u7528\u6237\u540D\u548C\u5BC6\u7801\uFF0C\u68C0\u67E5\u767B\u5F55\u662F\u5426\u6210\u529F\uFF0C\u67E5\u770B\u4E3A\u7528\u6237\u751F\u6210\u4E86\u54EA\u4E9B\u4E3B\u4F53\u3002\u8FD9\u53EF\u4EE5\u6307\u793A\u4E3B\u767B\u5F55\u6A21\u5757\u7684\u8BBE\u7F6E\u662F\u5426\u6B63\u786E\u3002\u5B83\u4E0D\u4F1A\u8C03\u7528\u8C61\u5BA1\u6838\uFF0C\u9501\u5B9A\u5E10\u53F7\u7B49\u9AD8\u7EA7\u529F\u80FD\u3002
 realmwizard.testLogin.title                      = <b>\u521B\u5EFA\u5B89\u5168\u57DF</b> --\u6B65\u9AA44\uFF1A\u6D4B\u8BD5\u767B\u5F55
 realmwizard.testLogin.usernameExp                = \u7528\u6765\u767B\u5F55\u5230\u5B89\u5168\u57DF\u7684\u7528\u6237\u540D\u3002
 realmwizard.testResults.testResults              = \u6D4B\u8BD5\u7ED3\u679C
 realmwizard.testResults.title                    = <b>\u521B\u5EFA\u5B89\u5168\u57DF</b> -- \u6B65\u9AA45: \u767B\u5F55\u7ED3\u679C
 realmwizard.usage.applicationCode                = \u5E94\u7528\u7A0B\u5E8F\u4EE3\u7801
-realmwizard.usage.applicationCodeExp             = <p>\u4F7F\u7528\u5B89\u5168\u89D2\u8272\uFF0C\u5E76\u4E0D\u9700\u8981\u7279\u6B8A\u7684\u5E94\u7528\u7A0B\u5E8F\u4EE3\u3002</p><p>\u5982\u679C\u5E94\u7528\u7A0B\u5E8F\u4E2D\u8C03\u7528<tt>HttpServletRequest.getUserPrincipal()</tt>\uFF0CGeronimo\u4F1A\u8FD4\u56DE\u4E00\u4E2A\u5B9E\u73B0<tt>GeronimoCallerPrincipal</tt>\u63A5\u53E3\u7684principal\u7C7B\u7684\u5B9E\u4F8B\u3002--\u901A\u5E38\u662F\u7528\u6237\u540D\uFF08\u56E0\u4E3A<tt>GeronimoUserPrincipal</tt>\u5B9E\u73B0\u4E86<tt>GeronimoCallerPrincipal</tt>\u63A5\u53E3\uFF09\u3002\u5982\u679C\u4F60\u6B63\u5728\u4F7F\u7528\u81EA\u5B9A\u4E49\u7684\u767B\u5F55\u6A21\u5757\uFF0C\u800C\u8C03\u7528<tt>getUserPrincipal</tt>\u65F6\u5F97\u5230\u4E86\u9519\u8BEF\u7684\u7ED3\u679C\u3002\u4F60\u53EF\u4EE5\u5C1D\u8BD5\u5199\u81EA\u5DF1\u7684\u5B9E\u73B0<tt>GeronimoCallerPrincipal</tt>\u63A5\u53E3\u7684principal\u7C7B\u3002</p> <p>\u5982\u679C\u5E94\u7528\u8C03\u7528<tt>HttpServletRequest.
 isUserInRole(role)</tt>\uFF0CGeronimo\u5C06\u4F1A\u6839\u636E\u7ED9\u7528\u6237\u5206\u914D\u7684\u4EFB\u4F55principals\u548C\u5728\u4E0A\u9762\u7684\u89D2\u8272\u6620\u5C04\u4E2D\u5217\u4E3E\u51FA\u6765\u7684\u5B89\u5168\u57DF\u7684\u767B\u5F55\u6A21\u5757\uFF0C\u6765\u8FD4\u56DEtrue\u6216\u8005false\u3002</p>
-realmwizard.usage.geronimoWebXmlLater            = <p>\u8FD9\u4E2A\u4F8B\u5B50\u8868\u660E\uFF0C{0} \u5C06\u88AB\u7528\u6765\u5904\u7406 Web \u5E94\u7528\u7684\u6240\u6709\u767B\u5F55\u3002 \u63A5\u7740\u5B83\u4F7F\u7528\u4E3B\u4F53\u7C7B\u548C\u4E3B\u4F53\u540D\u79F0\u7684\u8054\u5408\u6765\u628A <tt>admin</tt>  \u89D2\u8272\u6620\u5C04\u5230\u7528\u6237 <tt>root</tt> \uFF0C\u548C\u7EC4 <tt>administrators</tt> \u3002\u6CE8\u610F\u5982\u679C{1} \u4F7F\u7528\u81EA\u5B9A\u4E49\u7684\u767B\u5F55\u6A21\u5757\uFF0C\u4E3B\u4F53\u7C7B\u53EF\u80FD\u4F1A\u6709\u6240\u4E0D\u540C\u3002 \u4F46\u662F\u4E0A\u9762\u5217\u51FA\u7684\u662F\u88AB\u6240\u6709\u7684\u6807\u51C6\u7684Geronimo\u767B\u5F55\u6A21\u5757\u4F7F\u7528\u7684\u7528\u6237\u548C\u7EC4\u3002</p> <p>\u4E5F\u53EF\u80FD\u914D\u7F6E\u5355\u72EC\u7684\u767B\u5F55\u6A21\u5757\u548C\u5355\u72EC\u7684l\u767B\u5F55\u57DF\u540D\u79F0,\u7136\u540E\u5728\u89D2\u8272\u6620\u5C04\u4E2D\u4F7F\u7528\u767B\u5F55\u57DF\u540D\u79F0\uFF08\u8FD
 9\u6837\uFF0C\u5728\u767B\u5F55\u57DF Foo\u4E2D\u7684 root \u7528\u6237\uFF0C\u548C\u5728\u767B\u5F55\u57DFBar \u4E2D\u7684root \u7528\u6237\u662F\u4E0D\u4E00\u6837\u7684\uFF09\uFF0C\u4F46\u8FD9\u4EC5\u4EC5\u5728\u4F60\u6709\u591A\u4E2A\u767B\u5F55\u6A21\u5757\u6765\u7ED9\u7528\u6237\u5206\u914D\u4E3B\u4F53\u65F6\u624D\u91CD\u8981\u3002</p> <p>\u6700\u540E\uFF0C\u5982\u679C<tt>security</tt>\u5757\u662F\u5728 EAR \u7684<tt>application.xml</tt> \u90E8\u7F72\u63CF\u8FF0\u7B26\u4E2D\u58F0\u660E\u7684\uFF0C\u90A3\u4E48\u5C31\u6CA1\u6709\u5FC5\u8981\u5728EAR \u4E2D\u7684\u4EFB\u4F55\u6A21\u5757\u4E2D\u91CD\u590D\u5B83\u3002-- \u5B83\u4EEC\u4F1A\u5171\u4EAB\u76F8\u540C\u7684\u89D2\u8272\u6620\u5C04\u4FE1\u606F\u3002</p>
+realmwizard.usage.applicationCodeExp             = <p>\u4F7F\u7528\u5B89\u5168\u89D2\u8272\uFF0C\u5E76\u4E0D\u9700\u8981\u7279\u6B8A\u7684\u5E94\u7528\u7A0B\u5E8F\u4EE3\u7801\u3002</p><p>\u5982\u679C\u5E94\u7528\u7A0B\u5E8F\u4E2D\u8C03\u7528<tt>HttpServletRequest.getUserPrincipal()</tt>\uFF0CGeronimo\u4F1A\u8FD4\u56DE\u4E00\u4E2A\u5B9E\u73B0<tt>GeronimoCallerPrincipal</tt>\u63A5\u53E3\u7684principal\u7C7B\u7684\u5B9E\u4F8B\u3002--\u901A\u5E38\u662F\u7528\u6237\u540D\uFF08\u56E0\u4E3A<tt>GeronimoUserPrincipal</tt>\u5B9E\u73B0\u4E86<tt>GeronimoCallerPrincipal</tt>\u63A5\u53E3\uFF09\u3002\u5982\u679C\u4F60\u6B63\u5728\u4F7F\u7528\u81EA\u5B9A\u4E49\u7684\u767B\u5F55\u6A21\u5757\uFF0C\u800C\u8C03\u7528<tt>getUserPrincipal</tt>\u65F6\u5F97\u5230\u4E86\u9519\u8BEF\u7684\u7ED3\u679C\u3002\u5C1D\u8BD5\u5C06\u4F60\u7684user principal\u7C7B\u5B9E\u73B0<tt>GeronimoCallerPrincipal</tt>\u63A5\u53E3\u3002</p> <p>\u5982\u679C\u5E94\u7528\u8C03\u7528<tt>HttpServletRequest.isUserInRole(role)<
 /tt>\uFF0CGeronimo\u5C06\u4F1A\u6839\u636E\u5B89\u5168\u57DF\u767B\u5F55\u6A21\u5757\u5206\u914D\u7ED9\u8BE5\u7528\u6237\u7684principal\u662F\u5426\u5217\u51FA\u5728\u4E0A\u9762\u7684\u89D2\u8272\u6620\u5C04\u4E2D\u6765\u51B3\u5B9A\u8FD4\u56DEtrue\u8FD8\u662Ffalse\u3002</p>
+realmwizard.usage.geronimoWebXmlLater            = <p>\u8FD9\u4E2A\u4F8B\u5B50\u8868\u660E\uFF0C{0} \u5C06\u88AB\u7528\u6765\u5904\u7406 Web \u5E94\u7528\u7684\u6240\u6709\u767B\u5F55\u3002 \u63A5\u7740\u5B83\u4F7F\u7528\u4E3B\u4F53\u7C7B\u548C\u4E3B\u4F53\u540D\u79F0\u7684\u8054\u5408\u6765\u628A <tt>admin</tt>  \u89D2\u8272\u6620\u5C04\u5230\u7528\u6237 <tt>root</tt> \uFF0C\u548C\u7EC4 <tt>administrators</tt> \u3002\u6CE8\u610F\u5982\u679C{0} \u4F7F\u7528\u81EA\u5B9A\u4E49\u7684\u767B\u5F55\u6A21\u5757\uFF0C\u4E3B\u4F53\u7C7B\u53EF\u80FD\u4F1A\u6709\u6240\u4E0D\u540C\u3002 \u4F46\u662F\u4E0A\u9762\u5217\u51FA\u7684\u662F\u88AB\u6240\u6709\u7684\u6807\u51C6\u7684Geronimo\u767B\u5F55\u6A21\u5757\u4F7F\u7528\u7684\u7528\u6237\u548C\u7EC4\u3002</p> <p>\u4E5F\u53EF\u4EE5\u914D\u7F6E\u5355\u72EC\u7684\u767B\u5F55\u6A21\u5757\u548C\u5355\u72EC\u7684\u767B\u5F55\u57DF\u540D\u79F0\uFF0C\u7136\u540E\u5728\u89D2\u8272\u6620\u5C04\u4E2D\u4F7F\u7528\u767B\u5F55\u57DF\u540D\u79F0\uFF08\
 u8FD9\u6837\uFF0C\u5728\u767B\u5F55\u57DF Foo\u4E2D\u7684 root \u7528\u6237\uFF0C\u548C\u5728\u767B\u5F55\u57DFBar \u4E2D\u7684root \u7528\u6237\u662F\u4E0D\u4E00\u6837\u7684\uFF09\uFF0C\u4F46\u8FD9\u4EC5\u4EC5\u5728\u4F60\u6709\u591A\u4E2A\u767B\u5F55\u6A21\u5757\u6765\u7ED9\u7528\u6237\u5206\u914D\u4E3B\u4F53\u65F6\u624D\u91CD\u8981\u3002</p> <p>\u6700\u540E\uFF0C\u5982\u679C<tt>security</tt>\u5757\u662F\u5728 EAR \u7684<tt>application.xml</tt> \u90E8\u7F72\u63CF\u8FF0\u7B26\u4E2D\u58F0\u660E\u7684\uFF0C\u90A3\u4E48\u5C31\u6CA1\u6709\u5FC5\u8981\u5728EAR \u4E2D\u7684\u4EFB\u4F55\u6A21\u5757\u4E2D\u91CD\u590D\u5B83\u3002-- \u5B83\u4EEC\u4F1A\u5171\u4EAB\u76F8\u540C\u7684\u89D2\u8272\u6620\u5C04\u4FE1\u606F\u3002</p>
 realmwizard.usage.geronimoWebXmlPreface          = <p>\u4E3A\u4E86\u914D\u7F6E\u5B89\u5168\u57DF\u548C\u6BCF\u4E2A\u89D2\u8272\u7684\u6210\u5458\uFF0CWeb\u5E94\u7528\u9700\u8981\u6709\u4E00\u4E2A<tt>geronimo-web.xml</tt>\u90E8\u7F72\u8BA1\u5212\u3002\u5B83\u53EF\u4EE5\u6253\u5305\u5728WAR\u5305\u7684<tt>WEB-INF</tt>\u76EE\u5F55\u4E2D\uFF0C\u6216\u8005\u5B83\u4E5F\u53EF\u4EE5\u5728\u90E8\u7F72\u5DE5\u5177\u7684\u547D\u4EE4\u884C\u4E2D\u5355\u72EC\u5730\u63D0\u4F9B\u3002</p><p><tt>geronimo-web.xml</tt>\u90E8\u7F72\u8BA1\u5212\u5E94\u8BE5\u6709\u4E00\u4E2A<tt>security-realm-name</tt>\u5143\u7D20\uFF0C\u7528\u6765\u6807\u660E\u5728Web\u5E94\u7528\u4E2D\u7528\u4EC0\u4E48\u5B89\u5168\u57DF\u6765\u9A8C\u8BC1\u767B\u5F55\u3002\u5B83\u540C\u6837\u6709\u4E00\u4E2A <tt>security</tt>\u5143\u7D20\uFF0C\u7528\u6765\u5217\u51FA\u7528\u6237\u548C\u7EC4\uFF0C\u8FD9\u4E9B\u7528\u6237\u548C\u7EC4\u5E94\u8BE5\u662F <tt>web.xml</tt>\u4E2D\u7684<tt>security-role</tt>\u6807\u660E\u7684\u89D2\u8272
 \u7684\u6210\u5458\u3002
 realmwizard.usage.title                          = \u8FD9\u4E2A\u9875\u9762\u4ECB\u7ECD\u600E\u6837\u5728 J2EE \u5E94\u7528\u4E2D\u4F7F\u7528\u5B89\u5168\u57DF{0} \u3002\u8FD9\u91CC\u662F\u4EE5 Web \u5E94\u7528\u4E3A\u4F8B\uFF0C\u5BF9\u4E8E\u5176\u4ED6\u7A0B\u5E8F\u6A21\u5757\uFF0C\u4E5F\u53EF\u4F7F\u7528\u7C7B\u4F3C\u7684\u65B9\u6CD5\u3002
-realmwizard.usage.webXmlShouldHave               = <p>\u5728  <tt>web.xml</tt> \u4E2D\u5E94\u8BE5\u542B\u6709</p><ul>  <li>\u4E00\u4E2A\u6216\u591A\u4E2A <tt>security-constraint</tt> \u5757\uFF0C\u8981\u6765\u6307\u660E\u53D7\u4FDD\u62A4\u7684\u9875\u9762\u548C URL </li>  <li>\u4E00\u4E2A<tt>login-config</tt> \u5757\uFF0C\u7528\u6765\u914D\u7F6E\u5E94\u7528\u7684\u767B\u5F55\u4FE1\u606F</li>  <li>\u4E00\u4E2A\u6216\u591A\u4E2A<tt>security-role</tt> \u5757\uFF0C\u7528\u6765\u5217\u51FA\u5E94\u7528\u4E2D\u4F7F\u7528\u5230\u7684\u5B89\u5168\u89D2\u8272</li></ul>
+realmwizard.usage.webXmlShouldHave               = <p>\u5728  <tt>web.xml</tt> \u4E2D\u5E94\u8BE5\u542B\u6709</p><ul>  <li>\u4E00\u4E2A\u6216\u591A\u4E2A <tt>security-constraint</tt> \u5757\uFF0C\u7528\u6765\u6307\u660E\u53D7\u4FDD\u62A4\u7684\u9875\u9762\u548C URL </li>  <li>\u4E00\u4E2A<tt>login-config</tt> \u5757\uFF0C\u7528\u6765\u914D\u7F6E\u5E94\u7528\u7684\u767B\u5F55\u4FE1\u606F</li>  <li>\u4E00\u4E2A\u6216\u591A\u4E2A<tt>security-role</tt> \u5757\uFF0C\u7528\u6765\u5217\u51FA\u5E94\u7528\u4E2D\u4F7F\u7528\u5230\u7684\u5B89\u5168\u89D2\u8272</li></ul>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp Mon Jan  5 06:47:06 2009
@@ -28,10 +28,8 @@
 
 <p><b>WEB-INF/web.xml</b></p>
 
-<p>The <tt>web.xml</tt> should have</p>
 <fmt:message key="realmwizard.usage.webXmlShouldHave" />
 
-
 <pre>
 &lt;web-app xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews.properties Mon Jan  5 06:47:06 2009
@@ -57,7 +57,7 @@
 jmxmanager.help.searchMBeansExp   = 'Search MBeans' will give you a list of MBeans matching a pattern from the 'Search' tab
 jmxmanager.help.searchTab         = Search Tab
 jmxmanager.help.searchTabExp      = <ul> <li>You can use this tab to query MBeans matching a particular pattern</li> <li>Matching MBeans will be added under the 'Search MBeans' tree node. You might need to scroll down the JMX tree to view results.</li>  <li>Examples of Object Name Patterns:</li>   <ul> <li>"*:*" - will return all the MBeans <li>"geronimo:*" - will return all MBeans with "geronimo" domain  <li>"*:j2eeType=GBean,*" - will return all GBeans </ul> </ul>
-jmxmanager.help.server            = Server
+jmxmanager.help.setter            = Setter
 jmxmanager.help.stats             = Stats
 jmxmanager.help.statsTab          = Stats Tab
 jmxmanager.help.statsTabExp       = <ul><li>Lists the statistics provided by a managed object. Statistics can be any of the following types:</li> <ul> <li>Count Statistic - specifies standard count measurements <li>Time Statistic - specifies standard timing measurements for a given operation <li>Boundary Statistic - specifies standard measurements of the upper and lower limits of the value of an attribute <li>Range Statistic - specifies standard measurements of the lowest and highest values an attribute has held as well as its current value <li>Bounded Range Statistic - provides standard measurements of a range that has fixed limits  </ul></ul>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_zh.properties Mon Jan  5 06:47:06 2009
@@ -57,7 +57,7 @@
 jmxmanager.help.searchMBeansExp   = '\u641C\u7D22MBean'\u5C06\u5217\u51FA\u5339\u914D'Search'\u9009\u9879\u5361\u4E2D\u7684\u6A21\u5F0F\u7684MBean
 jmxmanager.help.searchTab         = \u641C\u7D22\u9009\u9879\u5361
 jmxmanager.help.searchTabExp      = <ul> <li>\u4F60\u53EF\u4EE5\u4F7F\u7528\u8FD9\u4E2A\u9009\u9879\u5361\u6765\u67E5\u8BE2\u6EE1\u8DB3\u7279\u5B9A\u6A21\u5F0F\u7684\u7684MBean</li> <li>\u6EE1\u8DB3\u7684MBean\u5C06\u88AB\u6DFB\u52A0\u5230'\u641C\u7D22MBeans'\u7684\u6811\u8282\u70B9\u4E0B. \u4F60\u53EF\u80FD\u9700\u8981\u5411\u4E0B\u6EDA\u52A8JMX\u6811\u4EE5\u67E5\u770B\u7ED3\u679C.</li>  <li>\u5BF9\u8C61\u540D\u79F0\u6A21\u5F0F\u7684\u4F8B\u5B50:</li>   <ul> <li>"*:*" - \u5C06\u8FD4\u56DE\u6240\u6709\u7684MBean <li>"geronimo:*" - \u5C06\u8FD4\u56DE"geronimo"\u57DF\u4E0B\u7684\u6240\u6709MBean  <li>"*:j2eeType=GBean,*" - \u5C06\u8FD4\u56DE\u6240\u6709\u7684GBean </ul> </ul>
-jmxmanager.help.server            = \u670D\u52A1\u5668
+jmxmanager.help.setter            = Setter
 jmxmanager.help.stats             = \u7EDF\u8BA1
 jmxmanager.help.statsTab          = \u7EDF\u8BA1\u9009\u9879\u5361
 jmxmanager.help.statsTabExp       = <ul><li>\u5217\u51FA\u4E00\u4E2A\u53D7\u7BA1\u5BF9\u8C61\u63D0\u4F9B\u7684\u7EDF\u8BA1\u6570\u636E. \u7EDF\u8BA1\u6570\u636E\u53EF\u4EE5\u662F\u5982\u4E0B\u7684\u4EFB\u610F\u4E00\u79CD\u7C7B\u578B:</li> <ul> <li>\u8BA1\u6570\u7EDF\u8BA1\u91CF - \u6307\u5B9A\u6807\u51C6\u7684\u8BA1\u6570\u6D4B\u91CF <li>\u65F6\u95F4\u7EDF\u8BA1\u91CF - \u6307\u5B9A\u5BF9\u7ED9\u5B9A\u64CD\u4F5C\u7684\u6807\u51C6\u8BA1\u65F6\u6D4B\u91CF <li>\u8FB9\u754C\u7EDF\u8BA1\u91CF - \u6307\u5B9A\u4E00\u4E2A\u5C5E\u6027\u503C\u7684\u4E0A\u4E0B\u754C\u9650\u7684\u7684\u6807\u51C6\u6D4B\u91CF <li>\u8303\u56F4\u7EDF\u8BA1\u91CF - \u6307\u5B9A\u4E00\u4E2A\u5C5E\u6027\u7684\u6700\u5927\u503C,\u6700\u5C0F\u503C\u4EE5\u53CA\u5F53\u524D\u53D6\u503C\u7684\u6807\u51C6\u6D4B\u91CF <li>\u8FB9\u754C\u8303\u56F4\u7EDF\u8BA1\u91CF - \u63D0\u4F9B\u4E00\u4E2A\u6709\u56FA\u5B9A\u754C\u9650\u7684\u8303\u56F4\u7684\u6807\u51C6\u6D4B\u91CF  </ul></ul>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp Mon Jan  5 06:47:06 2009
@@ -971,7 +971,7 @@
                             <th dataType="html" width="20%">&nbsp;<fmt:message key="jmxmanager.help.value"/>&nbsp;</th>
                             <th field="Type" dataType="String" width="10%">&nbsp;<fmt:message key="jmxmanager.help.type"/>&nbsp;</th>
                             <th field="Getter" dataType="String" width="10%">&nbsp;<fmt:message key="jmxmanager.help.getter"/>&nbsp;</th>
-                            <th dataType="html" width="10%">&nbsp;<fmt:message key="jmxmanager.help.server"/>&nbsp;</th>
+                            <th dataType="html" width="10%">&nbsp;<fmt:message key="jmxmanager.help.setter"/>&nbsp;</th>
                             <th field="Manageable" dataType="String" width="10%" align="center">&nbsp;<fmt:message key="jmxmanager.help.manageable"/>&nbsp;</th>
                             <th field="Persistent" dataType="String" width="10%" align="center">&nbsp;<fmt:message key="jmxmanager.help.persistent"/>&nbsp;</th>
                             <!--

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddGraph.jsp Mon Jan  5 06:47:06 2009
@@ -407,7 +407,7 @@
     <td>&nbsp;</td>
     <td align="right"><select name="server_id" id="<portlet:namespace/>server_id"
                               onChange="updateMbeanList(); updateFormula();">
-        <option value="">-<fmt:message key="monitor.graph.select"/>-</option>
+        <option value="">-<fmt:message key="monitor.graph.selectServer"/>-</option>
     </select>
         <script type='text/javascript'>
             <%
@@ -459,7 +459,7 @@
     <td>&nbsp;</td>
     <td align="right"><select name="mbean" id="<portlet:namespace/>mbean"
                               onChange="updateDatanameList(); updateFormula();">
-        <option value="">-<fmt:message key="monitor.graph.selectFirst"/>-</option>
+        <option value="">-<fmt:message key="monitor.graph.selectServerFirst"/>-</option>
     </select></td>
     <td></td>
 </tr>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditGraph.jsp Mon Jan  5 06:47:06 2009
@@ -434,7 +434,7 @@
       <%--<td></td>--%>
     <%--</tr>--%>
    <tr>
-      <td><label for="<portlet:namespace/>server_id"><fmt:message key="monitor.common.next"/><fmt:message key="monitor.graph.server"/></label>:</td>
+      <td><label for="<portlet:namespace/>server_id"><fmt:message key="monitor.graph.server"/></label>:</td>
       <td>&nbsp;</td>
       <td align="right">
     <select name="server_id" id="<portlet:namespace/>server_id" onChange="updateMbeanList(); updateFormula();">
@@ -553,7 +553,7 @@
     <tr><td><fmt:message key="monitor.common.graphing"/>: </td><td colspan="2"><strong><span id="formulaData1operation"></span> <span id="formulaDataname1"></span> <span id="formulaOperation"></span> <span id="formulaData2operation"></span> <span id="formulaDataname2"></span></strong></td></tr>
     <tr><td colspan="3"><font size="-2">&nbsp;</font></td></tr>
     <tr>
-      <td colspan="1" align="left"><button type="button" value="Cancel" onclick="javascript:history.go(-1)"><fmt:message key="monitor.graph.cancel"/></button></td>
+      <td colspan="1" align="left"><button type="button" value="Cancel" onclick="javascript:history.go(-1)"><fmt:message key="monitor.common.cancel"/></button></td>
       <td>&nbsp;</td>
       <td colspan="1" align="right"><input type="submit" value="Save" /></td>
       <td></td>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp Mon Jan  5 06:47:06 2009
@@ -177,7 +177,7 @@
       <td></td>
     </tr>
     <tr>
-      <td><label for="<portlet:namespace/>ip"><fmt:message key="monitor.common.ip"/>/<fmt:message key="monitor.server.hostname"/></label>:</td>
+      <td><label for="<portlet:namespace/>ip"><fmt:message key="monitor.server.ip"/>/<fmt:message key="monitor.server.hostname"/></label>:</td>
       <td>&nbsp;</td>
       <td align="right"><input type="text" name="ip" id="<portlet:namespace/>ip" value=<%= "\"" + node.getHost() + "\"" %>/></td>
       <td></td>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp?rev=731587&r1=731586&r2=731587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp Mon Jan  5 06:47:06 2009
@@ -40,7 +40,7 @@
  <thead align="center"><strong><fmt:message key="monitor.common.server"/></strong></thead>
  <tr>
   <th class="DarkBackground" width="30%"><fmt:message key="monitor.common.name"/></th>
-  <th class="DarkBackground" width="10%"><fmt:message key="monitor.common.ip"/>/<fmt:message key="monitor.common.hostname"/></th>
+  <th class="DarkBackground" width="10%"><fmt:message key="monitor.server.ip"/>/<fmt:message key="monitor.server.hostname"/></th>
   <th class="DarkBackground" width="15%"><fmt:message key="monitor.server.status"/></th>
   <th class="DarkBackground" width="15%"><fmt:message key="monitor.server.statQuery"/></th>
   <th class="DarkBackground" width="30%" colspan="3"><fmt:message key="monitor.common.action"/></th>



Mime
View raw message