You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2002/07/24 22:57:29 UTC

cvs commit: jakarta-tomcat-catalina/webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp remoteHostValve.jsp requestDumperValve.jsp singleSignOnValve.jsp valves.jsp

amyroh      2002/07/24 13:57:29

  Modified:    webapps/admin banner.jsp blank.jsp dumpRegistry.jsp
                        dumpServer.jsp error.jsp index.jsp login.jsp
                        saved.jsp tree-control-test.jsp
               webapps/admin/connector connector.jsp connectors.jsp
               webapps/admin/context context.jsp contexts.jsp
               webapps/admin/host alias.jsp aliases.jsp host.jsp hosts.jsp
               webapps/admin/logger logger.jsp loggers.jsp
               webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp
                        memoryRealm.jsp realms.jsp userDatabaseRealm.jsp
               webapps/admin/resources dataSource.jsp deleteDataSources.jsp
                        deleteEnvEntries.jsp deleteMailSessions.jsp
                        deleteResourceLinks.jsp deleteUserDatabases.jsp
                        envEntry.jsp listDataSources.jsp listEnvEntries.jsp
                        listMailSessions.jsp listResourceLinks.jsp
                        listUserDatabases.jsp mailSession.jsp
                        resourceLink.jsp userDatabase.jsp
               webapps/admin/server server.jsp
               webapps/admin/service service.jsp services.jsp
               webapps/admin/users deleteGroups.jsp deleteRoles.jsp
                        deleteUsers.jsp group.jsp listGroups.jsp
                        listRoles.jsp listUsers.jsp role.jsp user.jsp
               webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp
                        remoteHostValve.jsp requestDumperValve.jsp
                        singleSignOnValve.jsp valves.jsp
  Added:       webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        ApplicationResources_ja.properties
  Log:
  Add Japanese localization for admin.
  
  Patch submitted by Moriguchi Hirokazu <ki...@kun.ne.jp>
  
  Revision  Changes    Path
  1.2       +4 -4      jakarta-tomcat-catalina/webapps/admin/banner.jsp
  
  Index: banner.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/banner.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- banner.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ banner.jsp	24 Jul 2002 20:57:25 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -17,11 +17,11 @@
   
   <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr>
  -      <td align="left" valign="middle"> 
  +      <td align="left" valign="middle">
           <div class="masthead-title-text" align="left"><img src="images/TomcatBanner.jpg" height="120"></div>
         </td>
         <form method='post' action='/admin/commitChanges.do' target='_self'>
  -      <td align="right" valign="middle"> 
  +      <td align="right" valign="middle">
           <html:submit>
             <bean:message key="button.commit"/>
           </html:submit>
  @@ -31,7 +31,7 @@
           <div class="table-normal-text" align="left">&nbsp </div>
         </td>
       <form method='post' action='/admin/logOut.do' target='_top'>
  -      <td align="right" valign="middle"> 
  +      <td align="right" valign="middle">
           <html:submit>
             <bean:message key="button.logout"/>
           </html:submit>
  
  
  
  1.2       +1 -1      jakarta-tomcat-catalina/webapps/admin/blank.jsp
  
  Index: blank.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/blank.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- blank.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ blank.jsp	24 Jul 2002 20:57:25 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  
  
  
  1.2       +1 -1      jakarta-tomcat-catalina/webapps/admin/dumpRegistry.jsp
  
  Index: dumpRegistry.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/dumpRegistry.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dumpRegistry.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ dumpRegistry.jsp	24 Jul 2002 20:57:25 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  
  
  
  1.2       +1 -1      jakarta-tomcat-catalina/webapps/admin/dumpServer.jsp
  
  Index: dumpServer.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/dumpServer.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dumpServer.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ dumpServer.jsp	24 Jul 2002 20:57:25 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  
  
  
  1.2       +1 -1      jakarta-tomcat-catalina/webapps/admin/error.jsp
  
  Index: error.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/error.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- error.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ error.jsp	24 Jul 2002 20:57:25 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  
  
  
  1.2       +2 -2      jakarta-tomcat-catalina/webapps/admin/index.jsp
  
  Index: index.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/index.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ index.jsp	24 Jul 2002 20:57:25 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -12,7 +12,7 @@
   <%@ include file="header.jsp" %>
   
   <!-- Body -->
  -<frameset rows="117,685*" cols="*" frameborder="NO" border="3" framespacing="3"> 
  +<frameset rows="117,685*" cols="*" frameborder="NO" border="3" framespacing="3">
     <frame name="banner" src='<%= response.encodeURL("banner.jsp") %>' scrolling="no">
     <frameset cols="300,*" frameborder="YES" border="2">
       <frame name="tree" src='<%= response.encodeURL("setUpTree.do") %>' scrolling="auto">
  
  
  
  1.2       +10 -10    jakarta-tomcat-catalina/webapps/admin/login.jsp
  
  Index: login.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/login.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- login.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ login.jsp	24 Jul 2002 20:57:25 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -35,7 +35,7 @@
    name="loginForm">
     <table border="0" cellspacing="5" background="images/LoginBackgroundTile.gif">
   
  -    <tr> 
  +    <tr>
       <!-- banner -->
        <td height="183">
           <div align="center"><img src="images/Login.jpg" width="490" height="228"></div>
  @@ -44,7 +44,7 @@
   
       <!-- username password prompts fields layout -->
       <tr>
  -    <td background="images/LoginBackgroundTile.gif"> 
  +    <td background="images/LoginBackgroundTile.gif">
        <table width="100%" border="0" cellspacing="2" cellpadding="5">
        <tr>
         <th align="right">
  @@ -54,7 +54,7 @@
           <input type="text" name="j_username" size="16" maxlength="16"/>
         </td>
       </tr>
  -    <p>    
  +    <p>
       <tr>
         <th align="right">
           <font color="#FFFFFF"><bean:message key="prompt.password"/></font>
  @@ -63,20 +63,20 @@
           <input type="password" name="j_password" size="16" maxlength="16"/>
         </td>
       </tr>
  -    
  +
       <tr>
         <td width="50%" valign="top"> <div align="right"></div> </td>
         <td width="55%" valign="top">&nbsp;</td>
        </tr>
   
       <!-- login reset buttons layout -->
  -    <tr> 
  -       <td width="50%" valign="top"> 
  -            <div align="right"> 
  +    <tr>
  +       <td width="50%" valign="top">
  +            <div align="right">
                  <input type="submit" value='<bean:message key="button.login"/>'>&nbsp;&nbsp;
               </div>
          </td>
  -       <td width="55%" valign="top"> 
  +       <td width="55%" valign="top">
             &nbsp;&nbsp;<input type="reset" value='<bean:message key="button.reset"/>'>
          </td>
        </tr>
  @@ -99,4 +99,4 @@
   
   <%@ include file="footer.jsp" %>
   
  -</html:html>
  \ No newline at end of file
  +</html:html>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/saved.jsp
  
  Index: saved.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/saved.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- saved.jsp	18 Jul 2002 16:48:15 -0000	1.1
  +++ saved.jsp	24 Jul 2002 20:57:25 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -17,9 +17,9 @@
       </script>
   
       <%@ include file="header.jsp" %>
  -    
  +
       <%-- display warnings if any --%>
  -    <logic:present name="warning">    
  +    <logic:present name="warning">
               <bean:message key="warning.header"/>
               <bean:message key='<%= (String) request.getAttribute("warning") %>'/>
               <br>
  
  
  
  1.2       +1 -1      jakarta-tomcat-catalina/webapps/admin/tree-control-test.jsp
  
  Index: tree-control-test.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/tree-control-test.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tree-control-test.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ tree-control-test.jsp	24 Jul 2002 20:57:25 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  
  
  
  1.1                  jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties
  
  Index: ApplicationResources_ja.properties
  ===================================================================
  application.title=Tomcat\u30b5\u30fc\u30d0\u30fc\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb
  errors.header=<h2><fontcolor="red">\u4e0d\u6b63\u306a\u30a8\u30e9\u30fc</font></h2>\u5b9f\u884c\u3059\u308b\u524d\u306b\u3001\u4e0b\u8a18\u306e\u30a8\u30e9\u30fc\u3092\u4fee\u6b63\u3057\u3066\u4e0b\u3055\u3044:<ul>
  errors.footer=</ul><hr>
  error.login=<li>\u30e6\u30fc\u30b6\u30fc\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u9055\u3044\u307e\u3059</li>
  prompt.username=\u30e6\u30fc\u30b6\u30fc\u540d
  prompt.password=\u30d1\u30b9\u30ef\u30fc\u30c9
  button.login=\u30ed\u30b0\u30a4\u30f3
  button.reset=\u30ea\u30bb\u30c3\u30c8
  button.save=\u4fdd\u5b58
  button.change=\u5909\u66f4
  button.cancel=\u30ea\u30bb\u30c3\u30c8
  button.commit=\u5909\u66f4\u3092\u53cd\u6620
  button.logout=\u30ed\u30b0\u30a2\u30a6\u30c8
  login.enter=\u65b0\u3057\u3044\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u958b\u59cb\u3059\u308b\u305f\u3081\u306b\u30e6\u30fc\u30b6\u540d\u3068\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044
  login.changeLanguage=\u8a00\u8a9e\u306e\u5909\u66f4
  error.login=\u30e6\u30fc\u30b6\u30fc\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u9055\u3044\u307e\u3059
  error.tryagain=\u3082\u3046\u4e00\u5ea6\u5b9f\u884c\u3059\u308b\u305f\u3081\u306b\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044
  error.here=\u3053\u3053
  prompt.someText=SomeText
  prompt.moreText=MoreText
  sample.someText.required=<li>"SomeText"\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  sample.moreText.required=<li>"MoreText"\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  save.success=\u4fdd\u5b58\u6210\u529f!
  server.portnumber=\u30dd\u30fc\u30c8\u756a\u53f7
  server.debuglevel=\u30c7\u30d0\u30c3\u30b0\u30ec\u30d9\u30eb
  server.shutdown=\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3
  server.properties=\u30b5\u30fc\u30d0\u30fc\u30d7\u30ed\u30d1\u30c6\u30a3
  warning.header=<center><h4><fontcolor="red">\u8b66\u544a!</font></h4></center><ul>
  server.port.warning=<li>1024\u756a\u4ee5\u4e0b\u306e\u30dd\u30fc\u30c8\u756a\u53f7\u306e\u5229\u7528\u306b\u306f\u3001\u7279\u5225\u306a\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u6a29\u9650\u304c\u5fc5\u8981\u3067\u3059.
  error.portNumber.required=<li>\u30dd\u30fc\u30c8\u756a\u53f7\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.portNumber.format=<li>\u30dd\u30fc\u30c8\u756a\u53f7\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.portNumber.range=<li>\u30dd\u30fc\u30c8\u756a\u53f7\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f1-65535\u3067\u3059.</li>
  error.shutdownText.length=<li>\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u30016\u5b57\u4ee5\u4e0a\u5fc5\u8981\u3067\u3059</li>
  error.engineName.required=<li>\u30a8\u30f3\u30b8\u30f3\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  error.acceptCountText.required=<li>\u540c\u6642\u63a5\u7d9a\u6570\u304c\u5fc5\u8981\u3067\u3059</li>
  error.acceptCountText.format=<li>\u540c\u6642\u63a5\u7d9a\u6570\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.acceptCountText.range=<li>\u540c\u6642\u63a5\u7d9a\u6570\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f0-128\u3067\u3059.</li>
  error.connTimeOutText.required=<li>\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u304c\u5fc5\u8981\u3067\u3059</li>
  error.connTimeOutText.format=<li>\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.connTimeOutText.range=<li>\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f0-60000\u3067\u3059.</li>
  error.bufferSizeText.required=<li>\u30d0\u30c3\u30d5\u30a1\u30b5\u30a4\u30ba\u304c\u5fc5\u8981\u3067\u3059</li>
  error.bufferSizeText.format=<li>\u30d0\u30c3\u30d5\u30a1\u30b5\u30a4\u30ba\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.bufferSizeText.range=<li>\u30d0\u30c3\u30d5\u30a1\u30b5\u30a4\u30ba\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f1-8192\u3067\u3059.</li>
  error.address.invalid=<li>IP\u30a2\u30c9\u30ec\u30b9\u304c\u4e0d\u6b63\u3067\u3059</li>
  error.redirectPortText.required=<li>\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u30dd\u30fc\u30c8\u756a\u53f7\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.redirectPortText.format=<li>\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u30dd\u30fc\u30c8\u756a\u53f7\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.redirectPortText.range=<li>\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u30dd\u30fc\u30c8\u756a\u53f7\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f1-65535\u3067\u3059.</li>
  error.minProcessorsText.required=<li>\u6700\u5c0f\u30d7\u30ed\u30bb\u30b9\u6570\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.minProcessorsText.format=<li>\u6700\u5c0f\u30d7\u30ed\u30bb\u30b9\u6570\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.minProcessorsText.range=<li>\u6700\u5c0f\u30d7\u30ed\u30bb\u30b9\u6570\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f1-512\u3067\u3059.</li>
  error.maxProcessorsText.required=<li>\u6700\u5927\u30d7\u30ed\u30bb\u30b9\u6570\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.maxProcessorsText.format=<li>\u6700\u5927\u30d7\u30ed\u30bb\u30b9\u6570\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.maxProcessorsText.range=<li>\u6700\u5927\u30d7\u30ed\u30bb\u30b9\u6570\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f1-512\u3067\u3059. \u307e\u305f\u3001\u6700\u5927\u30d7\u30ed\u30bb\u30b9\u6570 >= \u6700\u5c0f\u30d7\u30ed\u30bb\u30b9\u6570\u3001\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093.</li>
  error.proxyName.invalid=<li>\u30d7\u30ed\u30ad\u30b7\u540d\u304c\u4e0d\u6b63\u3067\u3059</li>
  error.proxyPortText.required=<li>\u30d7\u30ed\u30ad\u30b7\u30dd\u30fc\u30c8\u756a\u53f7\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.proxyPortText.format=<li>\u30d7\u30ed\u30ad\u30b7\u30dd\u30fc\u30c8\u756a\u53f7\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.proxyPortText.range=<li>\u30d7\u30ed\u30ad\u30b7\u30dd\u30fc\u30c8\u756a\u53f7\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f1-65535\u3067\u3059.</li>
  error.hostName.bad=\u30db\u30b9\u30c8\u540d {0} \u304c\u4e0d\u6b63\u3067\u3059
  error.hostName.required=<li>\u30db\u30b9\u30c8\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  error.hostName.exists=<li>\u540c\u540d\u306e\u30db\u30b9\u30c8\u540d\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059</li>
  error.appBase.required=<li>\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d9\u30fc\u30b9\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  service.name=\u540d\u524d
  service.engine.props=\u30a8\u30f3\u30b8\u30f3\u30d7\u30ed\u30d1\u30c6\u30a3
  service.defaulthostname=\u30c7\u30d5\u30a9\u30eb\u30c8\u30db\u30b9\u30c8\u540d
  service.properties=\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d1\u30c6\u30a3
  service.property=\u30d7\u30ed\u30d1\u30c6\u30a3
  service.value=\u5024
  service.create.new=\u65b0\u3057\u3044\u30b5\u30fc\u30d3\u30b9\u306e\u4f5c\u6210
  actions.available.actions=\u5229\u7528\u53ef\u80fd\u306a\u30a2\u30af\u30b7\u30e7\u30f3
  actions.services.create=\u65b0\u3057\u3044\u30b5\u30fc\u30d3\u30b9\u306e\u4f5c\u6210
  actions.services.delete=\u73fe\u5728\u306e\u30b5\u30fc\u30d3\u30b9\u3092\u524a\u9664
  actions.services.deletes=\u65e2\u5b58\u306e\u30b5\u30fc\u30d3\u30b9\u306e\u524a\u9664
  actions.services.edit=\u65e2\u5b58\u306e\u30b5\u30fc\u30d3\u30b9\u306e\u7de8\u96c6
  actions.accesslogger.create=\u65b0\u3057\u3044\u30a2\u30af\u30bb\u30b9Logger\u306e\u4f5c\u6210
  actions.accesslogger.delete=\u30a2\u30af\u30bb\u30b9Logger\u306e\u524a\u9664
  actions.connectors.create=\u65b0\u3057\u3044\u30b3\u30cd\u30af\u30bf\u306e\u4f5c\u6210
  actions.connectors.delete=\u73fe\u5728\u306e\u30b3\u30cd\u30af\u30bf\u3092\u524a\u9664
  actions.connectors.deletes=\u65e2\u5b58\u306e\u30b3\u30cd\u30af\u30bf\u306e\u524a\u9664
  actions.connectors.edit=\u65e2\u5b58\u306e\u30b3\u30cd\u30af\u30bf\u306e\u7de8\u96c6
  actions.contexts.create=\u65b0\u3057\u3044\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u4f5c\u6210
  actions.contexts.delete=\u73fe\u5728\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u524a\u9664
  actions.contexts.deletes=\u65e2\u5b58\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u524a\u9664
  actions.contexts.edit=\u65e2\u5b58\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306e\u7de8\u96c6
  actions.group.create=\u65b0\u3057\u3044\u30b0\u30eb\u30fc\u30d7\u306e\u4f5c\u6210
  actions.group.delete=\u65e2\u5b58\u306e\u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664
  actions.hosts.create=\u65b0\u3057\u3044\u30db\u30b9\u30c8\u306e\u4f5c\u6210
  actions.hosts.delete=\u73fe\u5728\u306e\u30db\u30b9\u30c8\u3092\u524a\u9664
  actions.hosts.deletes=\u65e2\u5b58\u306e\u30db\u30b9\u30c8\u306e\u524a\u9664
  actions.hosts.edit=\u65e2\u5b58\u306e\u30db\u30b9\u30c8\u306e\u7de8\u96c6
  actions.loggers.create=\u65b0\u3057\u3044Logger\u306e\u4f5c\u6210
  actions.loggers.delete=\u73fe\u5728\u306eLogger\u3092\u524a\u9664
  actions.loggers.deletes=\u65e2\u5b58\u306eLoggers\u306e\u524a\u9664
  actions.loggers.edit=\u65e2\u5b58\u306eLogger\u306e\u7de8\u96c6
  actions.realms.create=\u65b0\u3057\u3044\u30e6\u30fc\u30b6\u30fc\u30ec\u30eb\u30e0\u306e\u4f5c\u6210
  actions.realms.delete=\u73fe\u5728\u306e\u30e6\u30fc\u30b6\u30fc\u30ec\u30eb\u30e0\u3092\u524a\u9664
  actions.realms.deletes=\u30e6\u30fc\u30b6\u30fc\u30ec\u30eb\u30e0\u306e\u524a\u9664
  actions.realms.edit=\u65e2\u5b58\u306e\u30ec\u30eb\u30e0\u306e\u7de8\u96c6
  actions.requestfilter.create=\u65b0\u3057\u3044\u30ea\u30af\u30a8\u30b9\u30c8\u30d5\u30a3\u30eb\u30bf\u306e\u4f5c\u6210
  actions.requestfilter.delete=\u30ea\u30af\u30a8\u30b9\u30c8\u30d5\u30a3\u30eb\u30bf\u306e\u524a\u9664
  actions.user.create=\u65b0\u3057\u3044\u30e6\u30fc\u30b6\u30fc\u306e\u4f5c\u6210
  actions.user.delete=\u65e2\u5b58\u306e\u30e6\u30fc\u30b6\u30fc\u306e\u524a\u9664
  actions.valves.create=\u65b0\u3057\u3044\u30d0\u30eb\u30d6\u306e\u4f5c\u6210
  actions.valves.edit=\u30d0\u30eb\u30d6\u306e\u7de8\u96c6
  actions.valves.delete=\u73fe\u5728\u306e\u30d0\u30eb\u30d6\u3092\u524a\u9664
  actions.valves.deletes=\u65e2\u5b58\u306e\u30d0\u30eb\u30d6\u306e\u524a\u9664
  actions.alias.create=\u65b0\u3057\u3044\u30a8\u30a4\u30ea\u30a2\u30b9\u306e\u4f5c\u6210
  actions.alias.delete=\u30a8\u30a4\u30ea\u30a2\u30b9\u306e\u524a\u9664
  new.alias=\u65b0\u3057\u3044\u30a8\u30a4\u30ea\u30a2\u30b9
  connector.type=\u578b
  connector.scheme=\u30b9\u30ad\u30fc\u30e0
  connector.accept.count=\u540c\u6642\u63a5\u7d9a\u6570
  connector.connection.timeout=\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
  connector.default.buffer=\u30c7\u30d5\u30a9\u30eb\u30c8\u30d0\u30c3\u30d5\u30a1\u30b5\u30a4\u30ba
  connector.enable.dns=DNS\u306e\u30eb\u30c3\u30af\u30a2\u30c3\u30d7
  connector.address.ip=IP\u30a2\u30c9\u30ec\u30b9
  connector.redirect.portnumber=\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u30dd\u30fc\u30c8\u756a\u53f7
  connector.min=\u6700\u5c0f
  connector.max=\u6700\u5927
  connector.proxy.name=\u30d7\u30ed\u30ad\u30b7\u540d
  connector.proxy.portnumber=\u30d7\u30ed\u30ad\u30b7\u30dd\u30fc\u30c8\u756a\u53f7
  connector.client.auth=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a8d\u8a3c
  connector.keystore.filename=\u30ad\u30fc\u30b9\u30c8\u30a2\u30d5\u30a1\u30a4\u30eb\u540d
  connector.keystore.password=\u30ad\u30fc\u30b9\u30c8\u30a2\u30d1\u30b9\u30ef\u30fc\u30c9
  connector.keyPass.warning=<li>keytool\u3092\u4f7f\u3063\u3066\u8a3c\u660e\u66f8\u3092\u4f5c\u6210\u3057\u3066\u4e0b\u3055\u3044.</li>
  host.properties=\u30db\u30b9\u30c8\u30d7\u30ed\u30d1\u30c6\u30a3
  host.name=\u540d\u524d
  host.base=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d9\u30fc\u30b9
  host.wars=WAR\u30d5\u30a1\u30a4\u30eb\u3092\u5c55\u958b\u3059\u308b
  host.aliases=\u30a8\u30a4\u30ea\u30a2\u30b9
  host.alias.name=\u30a8\u30a4\u30ea\u30a2\u30b9\u540d
  error.aliasName.exists=<li>\u540c\u540d\u306e\u30a8\u30a4\u30ea\u30a2\u30b9\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059</li>
  error.aliasName.required=<li>\u30a8\u30a4\u30ea\u30a2\u30b9\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  context.properties=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d7\u30ed\u30d1\u30c6\u30a3
  context.cookies=\u30af\u30c3\u30ad\u30fc
  context.cross.context=\u30af\u30ed\u30b9\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8
  context.docBase=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9
  context.override=\u4e0a\u66f8\u304d
  context.path=\u30d1\u30b9
  context.reloadable=\u30ea\u30ed\u30fc\u30c9
  context.usenaming=\u30cd\u30fc\u30e0\u30b5\u30fc\u30d3\u30b9\u306e\u5229\u7528
  context.workdir=\u30ef\u30fc\u30ad\u30f3\u30b0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
  context.loader.properties=\u30ed\u30fc\u30c0\u30d7\u30ed\u30d1\u30c6\u30a3
  context.sessionmgr.properties=\u30bb\u30c3\u30b7\u30e7\u30f3\u30de\u30cd\u30fc\u30b8\u30e3\u30d7\u30ed\u30d1\u30c6\u30a3
  context.checkInterval=\u30c1\u30a7\u30c3\u30af\u9593\u9694
  context.sessionId=\u30bb\u30c3\u30b7\u30e7\u30f3ID\u30a4\u30cb\u30b7\u30e3\u30e9\u30a4\u30b6
  context.max.sessions=\u6700\u5927\u6709\u52b9\u30bb\u30c3\u30b7\u30e7\u30f3\u6570
  error.docBase.required=<li>\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9\u306fnull\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.path.required=<li>\u30d1\u30b9\u306fnull\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.workDir.required=<li>\u30ef\u30fc\u30ad\u30f3\u30b0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306fnull\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.ldrCheckInterval.required=<li>\u30ed\u30fc\u30c0\u30c1\u30a7\u30c3\u30af\u9593\u9694\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.ldrCheckInterval.format=<li>\u30ed\u30fc\u30c0\u30c1\u30a7\u30c3\u30af\u9593\u9694\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.ldrCheckInterval.range=<li>\u30ed\u30fc\u30c0\u30c1\u30a7\u30c3\u30af\u9593\u9694\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f1-1000\u3067\u3059.</li>
  error.mgrCheckInterval.required=<li>\u30de\u30cd\u30fc\u30b8\u30e3\u30c1\u30a7\u30c3\u30af\u9593\u9694\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.mgrCheckInterval.format=<li>\u30de\u30cd\u30fc\u30b8\u30e3\u30c1\u30a7\u30c3\u30af\u9593\u9694\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.mgrCheckInterval.range=<li>\u30de\u30cd\u30fc\u30b8\u30e3\u30c1\u30a7\u30c3\u30af\u9593\u9694\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f1-1000\u3067\u3059.</li>
  error.mgrSessionIDInit.required=<li>\u30bb\u30c3\u30b7\u30e7\u30f3\u30de\u30cd\u30fc\u30b8\u30e3\u521d\u671f\u5316ID\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.mgrMaxSessions.required=<li>\u6700\u5927\u30bb\u30c3\u30b7\u30e7\u30f3\u6570\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093</li>
  error.mgrMaxSessions.format=<li>\u6700\u5927\u30bb\u30c3\u30b7\u30e7\u30f3\u6570\u304c\u59a5\u5f53\u306a\u6574\u6570\u3067\u306f\u3042\u308a\u307e\u305b\u3093</li>
  error.mgrMaxSessions.range=<li>\u6700\u5927\u30bb\u30c3\u30b7\u30e7\u30f3\u6570\u304c\u7bc4\u56f2\u5916\u3067\u3059. \u7bc4\u56f2\u306f-1\u304b\u3089100\u3067\u3059.</li>
  list.none=(None)
  logger.directory=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
  logger.prefix=\u30d7\u30ea\u30d5\u30a3\u30c3\u30af\u30b9
  logger.suffix=\u30b5\u30d5\u30a3\u30c3\u30af\u30b9
  logger.timestamp=\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7
  logger.filelogger.properties=FileLogger\u56fa\u6709\u306e\u30d7\u30ed\u30d1\u30c6\u30a3
  logger.verbositylevel=\u5197\u9577\u30ec\u30d9\u30eb
  error.loggerName.bad=\u4e0d\u6b63\u306aLogger\u540d {0}
  error.loggerName.exists=<li>\u540c\u540d\u306eLogger\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059.</li>
  error.directory.required=<li>\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093.</li>
  error.prefix.required=<li>\u30d7\u30ea\u30d5\u30a3\u30c3\u30af\u30b9\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093.</li>
  error.suffix.required=<li>\u30b5\u30d5\u30a3\u30c3\u30af\u30b9\u306f\u7a7a\u306b\u3067\u304d\u307e\u305b\u3093.</li>
  error.valveName.bad=\u4e0d\u6b63\u306a\u30d0\u30eb\u30d6\u540d {0}
  error.vavlveName.exists=<li>\u540c\u540d\u306e\u30d0\u30eb\u30d6\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059</li>
  user.fullName=\u30d5\u30eb\u30cd\u30fc\u30e0
  user.groups=\u30b0\u30eb\u30fc\u30d7\u4e2d\u306e\u30e1\u30f3\u30d0
  user.newUser=\u65b0\u3057\u3044\u30e6\u30fc\u30b6\u30fc\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u4f5c\u6210
  user.oldUser=\u65e2\u5b58\u306e\u30e6\u30fc\u30b6\u30fc\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u7de8\u96c6
  user.password=\u30d1\u30b9\u30ef\u30fc\u30c9
  user.properties=\u30e6\u30fc\u30b6\u30fc\u30d7\u30ed\u30d1\u30c6\u30a3
  user.roles=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30ed\u30fc\u30eb
  user.username=\u30e6\u30fc\u30b6\u30fc\u540d
  error.password.required=<li>\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  error.username.required=<li>\u30e6\u30fc\u30b6\u30fc\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  error.get.attributes=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u56de\u5fa9\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f.
  error.set.attributes=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u8a2d\u5b9a\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f.
  actions.delete=\u524a\u9664
  error.defaultHost.required=<li>\u30c7\u30d5\u30a9\u30eb\u30c8\u30db\u30b9\u30c8\u540d\u304c\u5fc5\u8981\u3067\u3059</li>
  error.engineName.bad=\u30a8\u30f3\u30b8\u30f3\u540d {0} \u304c\u4e0d\u6b63\u3067\u3059
  error.serviceName.bad=\u30b5\u30fc\u30d3\u30b9\u540d {0} \u304c\u4e0d\u6b63\u3067\u3059
  error.serviceName.required=<li>\u30b5\u30fc\u30d3\u30b9\u540d\u304c\u5fc5\u8981\u3067\u3059</li>
  error.serviceName.exists=<li>\u540c\u540d\u306e\u30b5\u30fc\u30d3\u30b9\u540d\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059</li>
  error.realmName.bad=realm\u540d {0} \u304c\u4e0d\u6b63\u3067\u3059
  error.realmName.required=<li>\u30ec\u30eb\u30e0\u540d\u304c\u5fc5\u8981\u3067\u3059.</li>
  error.realmName.exists=<li>\u540c\u540d\u306e\u30ec\u30eb\u30e0\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059.</li>
  error.contextName.bad=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u540d {0} \u304c\u4e0d\u6b63\u3067\u3059
  error.contextName.exists=<li>\u540c\u540d\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059.</li>
  error.path.prefix=<li>\u30d1\u30b9\u306f'/'\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093.</li>
  error.loaderName.bad=\u30ed\u30fc\u30c0\u540d {0} \u304c\u4e0d\u6b63\u3067\u3059
  error.managerName.bad=\u30de\u30cd\u30fc\u30b8\u30e3\u540d {0} \u304c\u4e0d\u6b63\u3067\u3059
  error.connectorName.bad=\u30b3\u30cd\u30af\u30bf\u540d {0} \u304c\u4e0d\u6b63\u3067\u3059
  error.connectorName.exists=<li>\u540c\u540d\u306e\u30b3\u30cd\u30af\u30bf\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059</li>
  error.pattern.required=<li>\u30d1\u30bf\u30fc\u30f3\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  error.valveName.bad=\u4e0d\u6b63\u306a\u30d0\u30eb\u30d6\u540d {0}
  error.valveName.exists=<li>\u540c\u540d\u306e\u30d0\u30eb\u30d6\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059</li>
  realm.driver=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30c9\u30e9\u30a4\u30d0
  realm.passwd=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9
  realm.url=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9URL
  realm.userName=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u30fc\u540d
  realm.digest=\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0
  realm.passwordCol=\u30d1\u30b9\u30ef\u30fc\u30c9\u30ab\u30e9\u30e0
  realm.roleNameCol=\u30ed\u30fc\u30eb\u540d\u30ab\u30e9\u30e0
  realm.userNameCol=\u30e6\u30fc\u30b6\u30fc\u540d\u30ab\u30e9\u30e0
  realm.userRoleTable=\u30e6\u30fc\u30b6\u30fc\u30ed\u30fc\u30eb\u30c6\u30fc\u30d6\u30eb
  realm.userTable=\u30e6\u30fc\u30b6\u30fc\u30c6\u30fc\u30d6\u30eb
  realm.resource=\u30ea\u30bd\u30fc\u30b9\u540d
  realm.pathName=\u30d1\u30b9\u540d
  realm.connName=\u63a5\u7d9a\u540d
  realm.connPassword=\u63a5\u7d9a\u30d1\u30b9\u30ef\u30fc\u30c9
  realm.connURL=\u63a5\u7d9aURL
  realm.connFactory=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30af\u30c8\u30ea
  realm.roleBase=\u30ed\u30fc\u30eb\u57fa\u672c\u8981\u7d20
  realm.roleName=\u30ed\u30fc\u30eb\u540d
  realm.user.roleName=\u30e6\u30fc\u30b6\u30fc\u30ed\u30fc\u30eb\u540d
  realm.pattern=\u30ed\u30fc\u30eb\u691c\u7d22\u30d1\u30bf\u30fc\u30f3
  realm.role.subtree=\u30ed\u30fc\u30eb\u306e\u30b5\u30d6\u30c4\u30ea\u30fc\u306e\u691c\u7d22
  realm.user.subtree=\u30e6\u30fc\u30b6\u30fc\u306e\u30b5\u30d6\u30c4\u30ea\u30fc\u306e\u691c\u7d22
  realm.userPassword=\u30e6\u30fc\u30b6\u30fc\u30d1\u30b9\u30ef\u30fc\u30c9
  realm.userPattern=\u30e6\u30fc\u30b6\u30fc\u691c\u7d22\u30d1\u30bf\u30fc\u30f3
  valve.access.properties=\u30a2\u30af\u30bb\u30b9Logger\u30d7\u30ed\u30d1\u30c6\u30a3
  valve.request.properties=\u30ea\u30af\u30a8\u30b9\u30c8\u30d5\u30a3\u30eb\u30bf\u30d7\u30ed\u30d1\u30c6\u30a3
  valve.single.properties=\u30b7\u30f3\u30b0\u30eb\u30b5\u30a4\u30f3\u30aa\u30f3\u30d0\u30eb\u30d6\u30d7\u30ed\u30d1\u30c6\u30a3
  valve.remotehost.properties=\u30ea\u30e2\u30fc\u30c8\u30db\u30b9\u30c8\u30d0\u30eb\u30d6\u30d7\u30ed\u30d1\u30c6\u30a3
  valve.remoteaddress.properties=\u30ea\u30e2\u30fc\u30c8\u30a2\u30c9\u30ec\u30b9\u30d0\u30eb\u30d6\u30d7\u30ed\u30d1\u30c6\u30a3
  valve.resolveHosts=\u30db\u30b9\u30c8\u540d\u3092\u89e3\u6c7a\u3059\u308b
  valve.pattern=\u30d1\u30bf\u30fc\u30f3
  valve.allowHosts=\u8a31\u53ef\u3059\u308b\u30db\u30b9\u30c8
  valve.denyHosts=\u62d2\u5426\u3059\u308b\u30db\u30b9\u30c8
  valve.allowIPs=\u8a31\u53ef\u3059\u308bIP\u30a2\u30c9\u30ec\u30b9
  valve.denyIPs=\u62d2\u5426\u3059\u308bIP\u30a2\u30c9\u30ec\u30b9
  error.resource.required=<li>\u30ea\u30bd\u30fc\u30b9\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.resource.javaprefix=<li>\u30ea\u30bd\u30fc\u30b9\u306b\u306f"java:"\u306e\u30d7\u30ea\u30d5\u30a3\u30af\u30b9\u304c\u5fc5\u8981\u3067\u3059.</li>
  error.pathName.required=<li>\u30d1\u30b9\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.driver.required=<li>\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30c9\u30e9\u30a4\u30d0\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.roleNameCol.required=<li>\u30ed\u30fc\u30eb\u540d\u30ab\u30e9\u30e0\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.userNameCol.required=<li>\u30e6\u30fc\u30b6\u30fc\u540d\u30ab\u30e9\u30e0\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.passwordCol.required=<li>\u30d1\u30b9\u30ef\u30fc\u30c9\u30ab\u30e9\u30e0\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.userTable.required=<li>\u30e6\u30fc\u30b6\u30fc\u30c6\u30fc\u30d6\u30eb\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.roleTable.required=<li>\u30e6\u30fc\u30b6\u30fc\u30ed\u30fc\u30eb\u30c6\u30fc\u30d6\u30eb\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.connectionPassword.required=<li>\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.connectionURL.required=<li>\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9URL\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.connectionName.required=<li>\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u30fc\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.roleName.required=<li>\u30ed\u30fc\u30eb\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.userRoleName.required=<li>\u30e6\u30fc\u30b6\u30fc\u30ed\u30fc\u30eb\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.digest.required=<li>\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.roleBase.required=<li>\u30ed\u30fc\u30eb\u57fa\u672c\u8981\u7d20\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.rolePattern.required=<li>\u30ed\u30fc\u30eb\u691c\u7d22\u30d1\u30bf\u30fc\u30f3\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.userPassword.required=<li>\u30e6\u30fc\u30b6\u30fc\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.userPattern.required=<li>\u30e6\u30fc\u30b6\u30fc\u691c\u7d22\u30d1\u30bf\u30fc\u30f3\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.contextFactory.required=<li>\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30af\u30c8\u30ea\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.connPassword.required=<li>\u63a5\u7d9a\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.connURL.required=<li>\u63a5\u7d9aURL\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  error.connName.required=<li>\u63a5\u7d9a\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  
  # ---------- Resources Module ----------
  resources.treeBuilder.subtreeNode=\u30ea\u30bd\u30fc\u30b9
  resources.treeBuilder.datasources=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9
  resources.treeBuilder.mailsessions=\u30e1\u30fc\u30eb\u30bb\u30c3\u30b7\u30e7\u30f3
  resources.treeBuilder.resourcelinks=\u30ea\u30bd\u30fc\u30b9\u30ea\u30f3\u30af
  resources.env.entries=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea
  resources.env.entry=\u30a8\u30f3\u30c8\u30ea\u540d
  resources.env.props=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea\u30d7\u30ed\u30d1\u30c6\u30a3
  resources.env.override=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ec\u30d9\u30eb\u30a8\u30f3\u30c8\u30ea\u3092\u4e0a\u66f8\u304d
  resources.actions.env.create=\u65b0\u3057\u3044\u74b0\u5883\u30a8\u30f3\u30c8\u30ea\u306e\u4f5c\u6210
  resources.actions.env.edit=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea\u306e\u7de8\u96c6
  resources.actions.env.delete=\u74b0\u5883\u30a8\u30f3\u30c8\u30ea\u306e\u524a\u9664
  resources.actions.env.list=\u65e2\u5b58\u306e\u30a8\u30f3\u30c8\u30ea\u306e\u4e00\u89a7
  resources.datasrc.jdbc=JDBC\u30c9\u30e9\u30a4\u30d0
  resources.actions.datasrc=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9
  resources.actions.datasrc.create=\u65b0\u3057\u3044\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306e\u4f5c\u6210
  resources.actions.datasrc.delete=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306e\u524a\u9664
  resources.actions.datasrc.edit=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u306e\u7de8\u96c6
  resources.datasrc.url=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9URL
  resources.datasrc.jdbcclass=JDBC\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9
  resources.datasrc.connections=\u63a5\u7d9a
  resources.datasrc.active=\u6709\u52b9\u306a\u6700\u5927\u63a5\u7d9a\u6570
  resources.datasrc.idle=\u30a2\u30a4\u30c9\u30eb\u72b6\u614b\u306e\u6700\u5927\u63a5\u7d9a\u6570
  resources.datasrc.wait=\u6700\u5927\u63a5\u7d9a\u5f85\u3061\u6642\u9593
  resources.datasrc.validation=\u30af\u30a8\u30ea\u306e\u691c\u8a3c
  resources.datasrc.jndi=JNDI\u540d
  resources.actions.mailsession=\u30e1\u30fc\u30eb\u30bb\u30c3\u30b7\u30e7\u30f3
  resources.actions.mailsession.create=\u65b0\u3057\u3044\u30e1\u30fc\u30eb\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u4f5c\u6210
  resources.actions.mailsession.delete=\u30e1\u30fc\u30eb\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u524a\u9664
  resources.actions.mailsession.edit=\u30e1\u30fc\u30eb\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u7de8\u96c6
  resources.mailsession.name=\u540d\u524d
  resources.mailsession.mailhost=mail.smtp.host
  resources.actions.resourcelk=\u30ea\u30bd\u30fc\u30b9\u30ea\u30f3\u30af
  resources.actions.resourcelk.create=\u65b0\u3057\u3044\u30ea\u30bd\u30fc\u30b9\u30ea\u30f3\u30af\u306e\u4f5c\u6210
  resources.actions.resourcelk.delete=\u30ea\u30bd\u30fc\u30b9\u30ea\u30f3\u30af\u306e\u524a\u9664
  resources.actions.resourcelk.edit=\u30ea\u30bd\u30fc\u30b9\u30ea\u30f3\u30af\u306e\u7de8\u96c6
  resources.resourcelk.name=\u540d\u524d
  resources.resourcelk.global=\u30b0\u30ed\u30fc\u30d0\u30eb
  resources.resourcelk.type=\u578b
  resources.error.name.required=<li>\u540d\u524d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.global.required=<li>\u30b0\u30ed\u30fc\u30d0\u30eb\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.type.required=<li>\u578b\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.value.required=<li>\u5024\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.value.mismatch=<li>\u578b\u3068\u5024\u304c\u9069\u5408\u3057\u307e\u305b\u3093.</li>
  resources.error.entryType.invalid=<li>\u30a8\u30f3\u30c8\u30ea\u30bf\u30a4\u30d7\u3092\u8a8d\u8b58\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.entryType.notimpl=<li>\u3053\u306e\u578b\u306b\u5bfe\u3059\u308b\u59a5\u5f53\u6027\u30c1\u30a7\u30c3\u30ab\u306f\u307e\u3060\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093.</li>
  resources.error.url.required=<li>\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9URL\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.driverClass.required=<li>JDBC\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.active.required=<li>\u6709\u52b9\u306a\u6700\u5927\u63a5\u7d9a\u6570\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.idle.required=<li>\u30a2\u30a4\u30c9\u30eb\u72b6\u614b\u306e\u6700\u5927\u63a5\u7d9a\u6570\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.wait.required=<li>\u6700\u5927\u63a5\u7d9a\u5f85\u3061\u6642\u9593\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.error.mailhost.required=<li>mail.smtp.host\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093.</li>
  resources.integer.error=<li>\u4e0d\u6b63\u306a\u6574\u6570\u3067\u3059.</li>
  resources.actions.userdb.create=\u65b0\u3057\u3044\u30e6\u30fc\u30b6\u30fc\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u4f5c\u6210
  resources.actions.userdb.edit=\u30e6\u30fc\u30b6\u30fc\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u7de8\u96c6
  resources.actions.userdb.delete=\u30e6\u30fc\u30b6\u30fc\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u524a\u9664
  resources.userdb.location=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3
  resources.userdb.factory=\u30d5\u30a1\u30af\u30c8\u30ea
  resources.treeBuilder.databases=\u30e6\u30fc\u30b6\u30fc\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
  resources.error.path.required=<li>\u30d1\u30b9\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  resources.error.jndiName.required=<li>JNDI\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  
  # ---------- User Database Module ----------
  users.actions.group.create=\u65b0\u3057\u3044\u30b0\u30eb\u30fc\u30d7\u306e\u4f5c\u6210
  users.actions.group.delete=\u65e2\u5b58\u306e\u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664
  users.actions.group.list=\u65e2\u5b58\u306e\u30b0\u30eb\u30fc\u30d7\u306e\u4e00\u89a7
  users.actions.role.create=\u65b0\u3057\u3044\u30ed\u30fc\u30eb\u306e\u4f5c\u6210
  users.actions.role.delete=\u65e2\u5b58\u306e\u30ed\u30fc\u30eb\u306e\u524a\u9664
  users.actions.role.list=\u65e2\u5b58\u306e\u30ed\u30fc\u30eb\u306e\u4e00\u89a7
  users.actions.user.create=\u65b0\u3057\u3044\u30e6\u30fc\u30b6\u30fc\u306e\u4f5c\u6210
  users.actions.user.delete=\u65e2\u5b58\u306e\u30e6\u30fc\u30b6\u30fc\u306e\u524a\u9664
  users.actions.user.list=\u65e2\u5b58\u306e\u30e6\u30fc\u30b6\u30fc\u306e\u4e00\u89a7
  users.deleteGroups.title=\u65e2\u5b58\u306e\u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664
  users.deleteRoles.title=\u65e2\u5b58\u306e\u30ed\u30fc\u30eb\u306e\u524a\u9664
  users.deleteUsers.title=\u65e2\u5b58\u306e\u30e6\u30fc\u30b6\u30fc\u306e\u524a\u9664
  users.error.attribute.get=\u5c5e\u6027\u306e\u56de\u5fa9\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f {0}
  users.error.attribute.set=\u5c5e\u6027\u306e\u5909\u66f4\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f {0}
  users.error.invoke=\u30aa\u30da\u30ec\u30fc\u30b7\u30e7\u30f3\u306e\u8d77\u52d5\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f {0}
  users.error.groupname.required=\u30b0\u30eb\u30fc\u30d7\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093
  users.error.password.required=\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093
  users.error.quotes=\u30c0\u30d6\u30eb\u30af\u30a9\u30fc\u30c8\u306f\u3001\u30d5\u30a3\u30fc\u30eb\u30c9\u5024\u306b\u5229\u7528\u3067\u304d\u307e\u305b\u3093
  users.error.rolename.required=\u30ed\u30fc\u30eb\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093
  users.error.select=\u7ba1\u7406\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u9078\u629e\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
  users.error.token=\u4e0d\u9069\u5207\u306a\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u304c\u767a\u884c\u3055\u308c\u307e\u3057\u305f
  users.error.username.required=<li>\u30e6\u30fc\u30b6\u30fc\u540d\u306f\u7701\u7565\u3067\u304d\u307e\u305b\u3093</li>
  users.group.newGroup=\u65b0\u3057\u3044\u30b0\u30eb\u30fc\u30d7\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u4f5c\u6210
  users.group.oldGroup=\u65e2\u5b58\u306e\u30b0\u30eb\u30fc\u30d7\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u7de8\u96c6
  users.group.properties=\u30b0\u30eb\u30fc\u30d7\u30d7\u30ed\u30d1\u30c6\u30a3
  users.list.description=\u8aac\u660e
  users.list.fullName=\u30d5\u30eb\u30cd\u30fc\u30e0
  users.list.groupname=\u30b0\u30eb\u30fc\u30d7\u540d
  users.list.rolename=\u30ed\u30fc\u30eb\u540d
  users.list.username=\u30e6\u30fc\u30b6\u30fc\u540d
  users.listGroups.title=\u30b0\u30eb\u30fc\u30d7\u4e00\u89a7
  users.listRoles.title=\u30ed\u30fc\u30eb\u4e00\u89a7
  users.listUsers.title=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7
  users.prompt.description=\u8aac\u660e:
  users.prompt.fullName=\u30d5\u30eb\u30cd\u30fc\u30e0:
  users.prompt.groupname=\u30b0\u30eb\u30fc\u30d7\u540d:
  users.prompt.password=\u30d1\u30b9\u30ef\u30fc\u30c9:
  users.prompt.rolename=\u30ed\u30fc\u30eb\u540d:
  users.prompt.username=\u30e6\u30fc\u30b6\u30fc\u540d:
  users.role.newRole=\u65b0\u3057\u3044\u30ed\u30fc\u30eb\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u4f5c\u6210
  users.role.oldRole=\u65e2\u5b58\u306e\u30ed\u30fc\u30eb\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u7de8\u96c6
  users.role.properties=\u30ed\u30fc\u30eb\u30d7\u30ed\u30d1\u30c6\u30a3
  users.treeBuilder.groupsNode=\u30b0\u30eb\u30fc\u30d7
  users.treeBuilder.rolesNode=\u30ed\u30fc\u30eb
  users.treeBuilder.subtreeNode=\u30e6\u30fc\u30b6\u30fc\u5b9a\u7fa9
  users.treeBuilder.usersNode=\u30e6\u30fc\u30b6\u30fc
  users.user.newUser=\u65b0\u3057\u3044\u30e6\u30fc\u30b6\u30fc\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u4f5c\u6210
  users.user.oldUser=\u65e2\u5b58\u306e\u30e6\u30fc\u30b6\u30fc\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u7de8\u96c6
  users.user.properties=\u30e6\u30fc\u30b6\u30fc\u30d7\u30ed\u30d1\u30c6\u30a3
  # ---------- -------------------- ----------
  
  
  
  1.2       +37 -37    jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp
  
  Index: connector.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- connector.jsp	18 Jul 2002 16:48:20 -0000	1.1
  +++ connector.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -24,12 +24,12 @@
     <html:hidden property="connectorName"/>
     <html:hidden property="adminAction"/>
     <html:hidden property="objectName"/>
  -  <html:hidden property="connectorType"/>  
  +  <html:hidden property="connectorType"/>
     <html:hidden property="serviceName"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
          <div class="page-title-text" align="left">
             <logic:equal name="connectorForm" property="adminAction" value="Create">
               <bean:message key="actions.connectors.create"/>
  @@ -39,21 +39,21 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="connectorForm" property="adminAction" value="Create">              
  -            <logic:notEqual name="connectorForm" property="portText" 
  +            <logic:notEqual name="connectorForm" property="adminAction" value="Create">
  +            <logic:notEqual name="connectorForm" property="portText"
                               value='<%= Integer.toString(request.getServerPort()) %>'>
  -            <controls:action url='<%= "/DeleteConnector.do?select=" + 
  -                                        URLEncoder.encode(thisObjectName) %>'>  
  -            <bean:message key="actions.connectors.delete"/> 
  +            <controls:action url='<%= "/DeleteConnector.do?select=" +
  +                                        URLEncoder.encode(thisObjectName) %>'>
  +            <bean:message key="actions.connectors.delete"/>
               </controls:action>
               </logic:notEqual>
               </logic:notEqual>
  -       </controls:actions>   
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -62,10 +62,10 @@
     <br>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>General</controls:label>
               <controls:data>&nbsp;</controls:data>
  @@ -87,7 +87,7 @@
           </controls:row>
   
       <%-- do not show scheme while creating a new connector --%>
  -    <logic:notEqual name="connectorForm" property="adminAction" value="Create">              
  +    <logic:notEqual name="connectorForm" property="adminAction" value="Create">
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.scheme"/>:</controls:label>
               <controls:data>
  @@ -110,7 +110,7 @@
                  <html:text property="connTimeOutText" size="10"/>
               </controls:data>
           </controls:row>
  - 
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="server.debuglevel"/>:</controls:label>
               <controls:data>
  @@ -121,14 +121,14 @@
                   </html:select>
               </controls:data>
           </controls:row>
  - 
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.default.buffer"/>:</controls:label>
               <controls:data>
  -               <html:text property="bufferSizeText" size="5"/>   
  +               <html:text property="bufferSizeText" size="5"/>
               </controls:data>
           </controls:row>
  - 
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.enable.dns"/>:</controls:label>
               <controls:data>
  @@ -143,17 +143,17 @@
           <%-- Input only allowed on create transaction --%>
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.address.ip"/>:</controls:label>
  -            <controls:data> 
  +            <controls:data>
                <logic:equal name="connectorForm" property="adminAction" value="Create">
  -               <html:text property="address" size="20"/>    
  +               <html:text property="address" size="20"/>
                </logic:equal>
                <logic:equal name="connectorForm" property="adminAction" value="Edit">
                  &nbsp;<bean:write name="connectorForm" property="address"/>
  -               <html:hidden property="address"/> 
  +               <html:hidden property="address"/>
                </logic:equal>
               </controls:data>
           </controls:row>
  - 
  +
           <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>Ports</controls:label>
               <controls:data>&nbsp;</controls:data>
  @@ -164,7 +164,7 @@
               <controls:label><bean:message key="server.portnumber"/>:</controls:label>
               <controls:data>
                <logic:equal name="connectorForm" property="adminAction" value="Create">
  -               <html:text property="portText" size="5"/> 
  +               <html:text property="portText" size="5"/>
                </logic:equal>
                <logic:equal name="connectorForm" property="adminAction" value="Edit">
                  <bean:write name="connectorForm" property="portText"/>
  @@ -176,7 +176,7 @@
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.redirect.portnumber"/>:</controls:label>
               <controls:data>
  -               <html:text property="redirectPortText" size="5"/> 
  +               <html:text property="redirectPortText" size="5"/>
               </controls:data>
           </controls:row>
   
  @@ -184,11 +184,11 @@
               <controls:label>Processors</controls:label>
               <controls:data>&nbsp;</controls:data>
           </controls:row>
  -    
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.min"/>:</controls:label>
               <controls:data>
  -               <html:text property="minProcessorsText" size="5"/>  
  +               <html:text property="minProcessorsText" size="5"/>
               </controls:data>
           </controls:row>
   
  @@ -200,37 +200,37 @@
           </controls:row>
   
   <%-- The following properties are supported only for Coyote HTTP/S 1.1 Connectors --%>
  -     <logic:notEqual name="connectorForm" property="connectorType" scope="session" 
  +     <logic:notEqual name="connectorForm" property="connectorType" scope="session"
                     value="AJP">
           <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>Proxy</controls:label>
               <controls:data>&nbsp;</controls:data>
           </controls:row>
  -    
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.proxy.name"/>:</controls:label>
               <controls:data>
  -               <html:text property="proxyName" size="30"/> 
  +               <html:text property="proxyName" size="30"/>
               </controls:data>
           </controls:row>
   
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.proxy.portnumber"/>:</controls:label>
               <controls:data>
  -                <html:text property="proxyPortText" size="5"/> 
  +                <html:text property="proxyPortText" size="5"/>
               </controls:data>
           </controls:row>
           </logic:notEqual>
   
   <%-- The following properties are supported only on HTTPS Connector --%>
  -     <logic:equal name="connectorForm" property="scheme" scope="session" 
  +     <logic:equal name="connectorForm" property="scheme" scope="session"
                     value="https">
           <br>
           <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>Factory Properties:</controls:label>
               <controls:data>&nbsp;</controls:data>
           </controls:row>
  -    
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.client.auth"/>:</controls:label>
               <controls:data>
  @@ -247,7 +247,7 @@
               <controls:label><bean:message key="connector.keystore.filename"/>:</controls:label>
               <controls:data>
               <logic:equal name="connectorForm" property="adminAction" value="Create">
  -                <html:text property="keyStoreFileName" size="30"/> 
  +                <html:text property="keyStoreFileName" size="30"/>
                </logic:equal>
                <logic:equal name="connectorForm" property="adminAction" value="Edit">
                  <bean:write name="connectorForm" property="keyStoreFileName"/>
  @@ -255,12 +255,12 @@
               </controls:data>
           </controls:row>
   
  -        <%-- input password allowed only while creating connector --%>        
  +        <%-- input password allowed only while creating connector --%>
           <logic:equal name="connectorForm" property="adminAction" value="Create">
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="connector.keystore.password"/>:</controls:label>
               <controls:data>
  -                <html:password property="keyStorePassword" size="30"/> 
  +                <html:password property="keyStorePassword" size="30"/>
                   <%--
                   <logic:equal name="connectorForm" property="adminAction" value="Edit">
                      <bean:write name="connectorForm" property="keyStorePassword"/>
  @@ -269,10 +269,10 @@
               </controls:data>
           </controls:row>
           </logic:equal>
  -   
  +
       </logic:equal>
      </controls:table>
  -  
  +
         </td>
       </tr>
     </table>
  
  
  
  1.2       +10 -10    jakarta-tomcat-catalina/webapps/admin/connector/connectors.jsp
  
  Index: connectors.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/connector/connectors.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- connectors.jsp	18 Jul 2002 16:48:19 -0000	1.1
  +++ connectors.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="actions.connectors.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
               <controls:actions>
                 <controls:action selected="true">
  @@ -40,14 +40,14 @@
       </tr>
     </table>
   
  -<%@ include file="../buttons.jsp" %>    
  +<%@ include file="../buttons.jsp" %>
     <br>
   
     <%-- Connectors List --%>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1"
            width="100%">
  -    <tr><td> 
  +    <tr><td>
   
         <table class="front-table" border="1"
          cellspacing="0" cellpadding="0" width="100%">
  @@ -64,18 +64,18 @@
           <logic:iterate name="connectorsList" id="connector">
             <tr class="line-row">
               <td><div align="left" class="table-normal-text">&nbsp;
  -            <%-- the connector the admin app is running on cannot be deleted 
  +            <%-- the connector the admin app is running on cannot be deleted
                    through the tool --%>
                 <logic:match  name="connector" value='<%= Integer.toString(request.getServerPort()) %>'>
  -                <font color='red'>*</font>           
  -              </logic:match>          
  +                <font color='red'>*</font>
  +              </logic:match>
               <logic:notMatch name="connector" value='<%= Integer.toString(request.getServerPort()) %>'>
                 <html:multibox property="connectors"
                                   value="<%= connector.toString() %>"/>
  -            </logic:notMatch>                     
  +            </logic:notMatch>
               </div></td>
               <td><div align="left" class="table-normal-text">&nbsp;
  -              <html:link page='<%= "/EditConnector.do?select=" + 
  +              <html:link page='<%= "/EditConnector.do?select=" +
                            java.net.URLEncoder.encode(connector.toString()) %>'>
                   Connector (<controls:attribute name="connector" attribute="port"/>)
                 </html:link>
  
  
  
  1.2       +37 -37    jakarta-tomcat-catalina/webapps/admin/context/context.jsp
  
  Index: context.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/context/context.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- context.jsp	18 Jul 2002 16:48:19 -0000	1.1
  +++ context.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -27,7 +27,7 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
          <div class="page-title-text" align="left">
             <logic:equal name="contextForm" property="adminAction" value="Create">
               <bean:message key="actions.contexts.create"/>
  @@ -37,44 +37,44 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action disabled="true"> --------------------------------- </controls:action>
               <logic:notEqual name="contextForm" property="adminAction" value="Create">
  -            <controls:action url='<%= "/AddLogger.do?parent=" + 
  +            <controls:action url='<%= "/AddLogger.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.loggers.create"/>
  -            </controls:action>              
  -            <controls:action url='<%= "/DeleteLogger.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -                <bean:message key="actions.loggers.deletes"/> 
  +            </controls:action>
  +            <controls:action url='<%= "/DeleteLogger.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.loggers.deletes"/>
               </controls:action>
               <%-- cannot delete or add the realm of the context of the admin app --%>
  -            <logic:notEqual name="contextForm" property="path" 
  +            <logic:notEqual name="contextForm" property="path"
                               value='<%= request.getContextPath() %>'>
               <controls:action disabled="true"> ------------------------------------- </controls:action>
  -            <controls:action url='<%= "/AddRealm.do?parent=" + 
  +            <controls:action url='<%= "/AddRealm.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.realms.create"/>
  -            </controls:action>              
  -            <controls:action url='<%= "/DeleteRealm.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -                <bean:message key="actions.realms.deletes"/> 
  +            </controls:action>
  +            <controls:action url='<%= "/DeleteRealm.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.realms.deletes"/>
               </controls:action>
               </logic:notEqual>
               <controls:action disabled="true">  -------------------------------------  </controls:action>
  -            <controls:action url='<%= "/AddValve.do?parent=" + 
  +            <controls:action url='<%= "/AddValve.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
  -               <bean:message key="actions.valves.create"/> 
  +               <bean:message key="actions.valves.create"/>
               </controls:action>
  -            <controls:action url='<%= "/DeleteValve.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -               <bean:message key="actions.valves.deletes"/> 
  +            <controls:action url='<%= "/DeleteValve.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +               <bean:message key="actions.valves.deletes"/>
               </controls:action>
               <%-- cannot delete the context of the admin app  from the tool --%>
  -            <logic:notEqual name="contextForm" property="path" 
  +            <logic:notEqual name="contextForm" property="path"
                               value='<%= request.getContextPath() %>'>
               <controls:action disabled="true">  -------------------------------------  </controls:action>
               <controls:action url='<%= "/DeleteContext.do?select=" +
  @@ -83,7 +83,7 @@
               </controls:action>
               </logic:notEqual>
               </logic:notEqual>
  -        </controls:actions>   
  +        </controls:actions>
            </div>
         </td>
       </tr>
  @@ -92,18 +92,18 @@
     <br>
   
    <%-- Context Properties table --%>
  - 
  +
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td>  <div class="table-title-text">  
  +    <tr> <td>  <div class="table-title-text">
               <bean:message key="context.properties"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -141,7 +141,7 @@
                   </html:select>
               </controls:data>
           </controls:row>
  - 
  +
   <%-- input only allowed on create transaction --%>
          <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="context.docBase"/>:</controls:label>
  @@ -221,21 +221,21 @@
     </tr>
   </table>
   
  -<br> 
  +<br>
   
   <%-- Loader Properties table --%>
   
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td>  <div class="table-title-text">  
  +    <tr> <td>  <div class="table-title-text">
               <bean:message key="context.loader.properties"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -277,16 +277,16 @@
   <BR>
   <%-- Session Manager Properties table --%>
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td>  <div class="table-title-text">  
  +    <tr> <td>  <div class="table-title-text">
               <bean:message key="context.sessionmgr.properties"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -309,7 +309,7 @@
                   </html:select>
               </controls:data>
           </controls:row>
  - 
  +
          <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="context.sessionId"/>:</controls:label>
               <controls:data>
  
  
  
  1.2       +8 -8      jakarta-tomcat-catalina/webapps/admin/context/contexts.jsp
  
  Index: contexts.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/context/contexts.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- contexts.jsp	18 Jul 2002 16:48:19 -0000	1.1
  +++ contexts.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="actions.contexts.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
               <controls:actions>
                 <controls:action selected="true">
  @@ -40,14 +40,14 @@
       </tr>
     </table>
   
  -<%@ include file="../buttons.jsp" %>    
  +<%@ include file="../buttons.jsp" %>
     <br>
   
     <%-- Contexts List --%>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1"
            width="100%">
  -    <tr><td> 
  +    <tr><td>
   
         <table class="front-table" border="1"
          cellspacing="0" cellpadding="0" width="100%">
  @@ -66,15 +66,15 @@
               <td><div align="left" class="table-normal-text">&nbsp;
                 <%-- admin context cannot be deleted from the tool --%>
                 <logic:match name="context" value='<%= "path="+request.getContextPath()+"," %>'>
  -                <font color='red'>*</font>           
  -              </logic:match>          
  +                <font color='red'>*</font>
  +              </logic:match>
                 <logic:notMatch name="context" value='<%= "path="+request.getContextPath()+"," %>'>
                 <html:multibox property="contexts"
                                   value="<%= context.toString() %>"/>
                 </logic:notMatch>
               </div></td>
               <td><div align="left" class="table-normal-text">&nbsp;
  -              <html:link page='<%= "/EditContext.do?select=" + 
  +              <html:link page='<%= "/EditContext.do?select=" +
                            java.net.URLEncoder.encode(context.toString()) %>'>
                   <controls:attribute name="context" attribute="path"/>
                 </html:link>
  
  
  
  1.2       +12 -12    jakarta-tomcat-catalina/webapps/admin/host/alias.jsp
  
  Index: alias.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/alias.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- alias.jsp	18 Jul 2002 16:48:19 -0000	1.1
  +++ alias.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -19,7 +19,7 @@
   <html:form method="POST" action="/SaveAlias">
   
     <html:hidden property="hostName"/>
  -  
  +
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr class="page-title-row">
         <td align="left" nowrap>
  @@ -33,16 +33,16 @@
   <br>
   
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td> <div class="table-title-text"> 
  +    <tr> <td> <div class="table-title-text">
           <bean:message key="new.alias"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
           <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>
                   <bean:message key="service.property"/>
  @@ -71,9 +71,9 @@
   
   <%-- Aliases List --%>
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td> 
  -        <div class="table-title-text"> 
  -            <bean:message key="host.aliases"/> 
  +    <tr> <td>
  +        <div class="table-title-text">
  +            <bean:message key="host.aliases"/>
           </div>
       </td> </tr>
     </table>
  @@ -81,13 +81,13 @@
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
       <tr> <td>
           <table class="front-table" border="1" cellspacing="0" cellpadding="0" width="100%">
  -          <tr class="header-row"> 
  -            <td width="27%"> 
  +          <tr class="header-row">
  +            <td width="27%">
                 <div class="table-header-text" align="left"><bean:message key="host.alias.name"/> </div>
               </td> </tr>
   
               <logic:iterate id="aliasVal" name="aliasForm" property="aliasVals">
  -            <tr> <td width="27%" valign="top" colspan=2> 
  +            <tr> <td width="27%" valign="top" colspan=2>
                   <div class="table-normal-text"> <%= aliasVal %> </div>
               </td> </tr>
               </logic:iterate>
  
  
  
  1.2       +7 -7      jakarta-tomcat-catalina/webapps/admin/host/aliases.jsp
  
  Index: aliases.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/aliases.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- aliases.jsp	18 Jul 2002 16:48:19 -0000	1.1
  +++ aliases.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -21,12 +21,12 @@
     <html:hidden property="hostName"/>
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="actions.alias.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
               <controls:actions>
                 <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
  @@ -37,14 +37,14 @@
       </tr>
     </table>
   
  -<%@ include file="../buttons.jsp" %>    
  +<%@ include file="../buttons.jsp" %>
     <br>
   
     <%-- Aliases List --%>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
           <table class="front-table" border="1"
            cellspacing="0" cellpadding="0" width="100%">
             <tr class="header-row">
  @@ -62,7 +62,7 @@
                 <html:multibox property="aliases"
                                   value="<%= alias.toString() %>"/>
               </div></td>
  -            <td><div align="left" class="table-normal-text">&nbsp;  
  +            <td><div align="left" class="table-normal-text">&nbsp;
                   <%= alias.toString() %>
               </div></td>
             </tr>
  
  
  
  1.2       +50 -50    jakarta-tomcat-catalina/webapps/admin/host/host.jsp
  
  Index: host.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/host.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- host.jsp	18 Jul 2002 16:48:19 -0000	1.1
  +++ host.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -24,7 +24,7 @@
     <html:hidden property="adminAction"/>
     <html:hidden property="objectName"/>
     <html:hidden property="serviceName"/>
  -  
  +
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr class="page-title-row">
         <td align="left" nowrap>
  @@ -37,72 +37,72 @@
             </logic:equal>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
          <div align="right">
           <controls:actions>
               <controls:action selected="true"> -----<bean:message key="actions.available.actions"/>----- </controls:action>
               <controls:action disabled="true"> ------------------------------------- </controls:action>
  -            <logic:notEqual name="hostForm" property="adminAction" value="Create">              
  -            <controls:action url='<%= "/AddAlias.do?hostName=" + 
  +            <logic:notEqual name="hostForm" property="adminAction" value="Create">
  +            <controls:action url='<%= "/AddAlias.do?hostName=" +
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.alias.create"/>
  -            </controls:action>              
  -            <controls:action url='<%= "/DeleteAlias.do?hostName=" + 
  +            </controls:action>
  +            <controls:action url='<%= "/DeleteAlias.do?hostName=" +
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.alias.delete"/>
  -            </controls:action>              
  -            <controls:action disabled="true"> ------------------------------------- </controls:action> 
  -            <controls:action url='<%= "/AddLogger.do?parent=" + 
  +            </controls:action>
  +            <controls:action disabled="true"> ------------------------------------- </controls:action>
  +            <controls:action url='<%= "/AddLogger.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.loggers.create"/>
  -            </controls:action>              
  -            <controls:action url='<%= "/DeleteLogger.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -                <bean:message key="actions.loggers.deletes"/> 
  +            </controls:action>
  +            <controls:action url='<%= "/DeleteLogger.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.loggers.deletes"/>
               </controls:action>
               <controls:action disabled="true"> ------------------------------------- </controls:action>
  -            <controls:action url='<%= "/AddContext.do?parent=" + 
  +            <controls:action url='<%= "/AddContext.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.contexts.create"/>
  -            </controls:action>              
  -            <controls:action url='<%= "/DeleteContext.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -                <bean:message key="actions.contexts.deletes"/> 
  +            </controls:action>
  +            <controls:action url='<%= "/DeleteContext.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.contexts.deletes"/>
               </controls:action>
               <logic:notEqual name="hostName" value='<%= request.getServerName() %>'>
  -            <controls:action disabled="true"> 
  -                ------------------------------------- 
  +            <controls:action disabled="true">
  +                -------------------------------------
               </controls:action>
  -            <controls:action url='<%= "/AddRealm.do?parent=" + 
  +            <controls:action url='<%= "/AddRealm.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.realms.create"/>
  -            </controls:action>              
  -            <controls:action url='<%= "/DeleteRealm.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -                <bean:message key="actions.realms.deletes"/> 
  +            </controls:action>
  +            <controls:action url='<%= "/DeleteRealm.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.realms.deletes"/>
               </controls:action>
               </logic:notEqual>
  -            <controls:action disabled="true"> 
  -                ------------------------------------- 
  +            <controls:action disabled="true">
  +                -------------------------------------
               </controls:action>
  -            <controls:action url='<%= "/AddValve.do?parent=" + 
  +            <controls:action url='<%= "/AddValve.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
  -                <bean:message key="actions.valves.create"/> 
  +                <bean:message key="actions.valves.create"/>
               </controls:action>
  -            <controls:action url='<%= "/DeleteValve.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -                <bean:message key="actions.valves.deletes"/> 
  +            <controls:action url='<%= "/DeleteValve.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.valves.deletes"/>
               </controls:action>
               <logic:notEqual name="hostName" value='<%= request.getServerName() %>'>
  -            <controls:action disabled="true"> 
  -                ------------------------------------- 
  +            <controls:action disabled="true">
  +                -------------------------------------
               </controls:action>
  -            <controls:action url='<%= "/DeleteHost.do?select=" + 
  -                                        URLEncoder.encode(thisObjectName) %>'>  
  -                <bean:message key="actions.hosts.delete"/> 
  +            <controls:action url='<%= "/DeleteHost.do?select=" +
  +                                        URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.hosts.delete"/>
               </controls:action>
              </logic:notEqual>
  -           </logic:notEqual>          
  +           </logic:notEqual>
            </controls:actions>
          </div>
         </td>
  @@ -114,16 +114,16 @@
   
    <%-- Host Properties --%>
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td> <div class="table-title-text"> 
  +    <tr> <td> <div class="table-title-text">
           <bean:message key="host.properties"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
           <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>
                   <bean:message key="service.property"/>
  @@ -194,11 +194,11 @@
   <br>
   
   <%-- Aliases List --%>
  - <logic:notEqual name="hostForm" property="adminAction" value="Create">              
  + <logic:notEqual name="hostForm" property="adminAction" value="Create">
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td> 
  -        <div class="table-title-text"> 
  -            <bean:message key="host.aliases"/> 
  +    <tr> <td>
  +        <div class="table-title-text">
  +            <bean:message key="host.aliases"/>
           </div>
       </td> </tr>
     </table>
  @@ -206,13 +206,13 @@
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
       <tr> <td>
           <table class="front-table" border="1" cellspacing="0" cellpadding="0" width="100%">
  -          <tr class="header-row"> 
  -            <td width="27%"> 
  +          <tr class="header-row">
  +            <td width="27%">
                 <div class="table-header-text" align="left"><bean:message key="host.alias.name"/> </div>
               </td> </tr>
   
               <logic:iterate id="aliasVal" name="hostForm" property="aliasVals">
  -            <tr> <td width="27%" valign="top" colspan=2> 
  +            <tr> <td width="27%" valign="top" colspan=2>
                   <div class="table-normal-text"> <%= aliasVal %> </div>
               </td> </tr>
               </logic:iterate>
  
  
  
  1.2       +10 -10    jakarta-tomcat-catalina/webapps/admin/host/hosts.jsp
  
  Index: hosts.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/hosts.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hosts.jsp	18 Jul 2002 16:48:19 -0000	1.1
  +++ hosts.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -19,12 +19,12 @@
   <html:form method="POST" action="/DeleteHosts">
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="actions.hosts.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
               <controls:actions>
                 <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
  @@ -35,14 +35,14 @@
       </tr>
     </table>
   
  -<%@ include file="../buttons.jsp" %>    
  +<%@ include file="../buttons.jsp" %>
     <br>
   
     <%-- Hosts List --%>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
           <table class="front-table" border="1"
            cellspacing="0" cellpadding="0" width="100%">
             <tr class="header-row">
  @@ -58,15 +58,15 @@
             <tr class="line-row">
               <td><div align="left" class="table-normal-text">&nbsp;
                 <logic:match name="host" value='<%= "host="+request.getServerName()+"," %>'>
  -                <font color='red'>*</font>           
  -              </logic:match>          
  +                <font color='red'>*</font>
  +              </logic:match>
                 <logic:notMatch name="host" value='<%= "host="+request.getServerName()+"," %>'>
                 <html:multibox property="hosts"
                                   value="<%= host.toString() %>"/>
  -              </logic:notMatch>                 
  +              </logic:notMatch>
               </div></td>
               <td><div align="left" class="table-normal-text">&nbsp;
  -              <html:link page='<%= "/EditHost.do?select=" + 
  +              <html:link page='<%= "/EditHost.do?select=" +
                            java.net.URLEncoder.encode(host.toString()) %>'>
                   <controls:attribute name="host" attribute="name"/>
                 </html:link>
  
  
  
  1.2       +26 -26    jakarta-tomcat-catalina/webapps/admin/logger/logger.jsp
  
  Index: logger.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/logger/logger.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logger.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ logger.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -28,8 +28,8 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  -       <div class="page-title-text" align="left"> 
  +      <td width="81%">
  +       <div class="page-title-text" align="left">
            <logic:equal name="loggerForm" property="adminAction" value="Create">
               <bean:message key="actions.loggers.create"/>
             </logic:equal>
  @@ -38,18 +38,18 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action disabled="true"> --------------------------------- </controls:action>
  -            <logic:notEqual name="loggerForm" property="adminAction" value="Create">              
  +            <logic:notEqual name="loggerForm" property="adminAction" value="Create">
               <controls:action url='<%= "/DeleteLogger.do?select=" +
                                     URLEncoder.encode(thisObjectName) %>'>
  -                <bean:message key="actions.loggers.delete"/> 
  -            </controls:action>          
  +                <bean:message key="actions.loggers.delete"/>
  +            </controls:action>
               </logic:notEqual>
  -       </controls:actions>   
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -58,10 +58,10 @@
     <br>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -81,7 +81,7 @@
                   </logic:equal>
               </controls:data>
           </controls:row>
  -        
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="server.debuglevel"/>:</controls:label>
               <controls:data>
  @@ -92,7 +92,7 @@
                   </html:select>
               </controls:data>
           </controls:row>
  - 
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="logger.verbositylevel"/>:</controls:label>
               <controls:data>
  @@ -102,7 +102,7 @@
                           labelProperty="label"/>
                   </html:select>
               </controls:data>
  -        </controls:row>   
  +        </controls:row>
         </controls:table>
         </td>
       </tr>
  @@ -110,21 +110,21 @@
   
       <%-- Display the following fields only if it is a FileLogger --%>
       <%-- These are the properties specific to a FileLogger --%>
  -     <logic:equal name="loggerForm" property="loggerType" scope="session" 
  +     <logic:equal name="loggerForm" property="loggerType" scope="session"
                     value="FileLogger">
        <br>
  -        
  +
        <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -        <tr> <td>  <div class="table-title-text">  
  +        <tr> <td>  <div class="table-title-text">
               <bean:message key="logger.filelogger.properties"/>
           </div> </td> </tr>
        </table>
   
       <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -     <tr> 
  -      <td> 
  +     <tr>
  +      <td>
        <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -133,21 +133,21 @@
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="logger.directory"/>:</controls:label>
               <controls:data>
  -               <html:text property="directory" size="25"/> 
  +               <html:text property="directory" size="25"/>
               </controls:data>
           </controls:row>
   
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="logger.prefix"/>:</controls:label>
               <controls:data>
  -               <html:text property="prefix" size="25"/> 
  +               <html:text property="prefix" size="25"/>
               </controls:data>
           </controls:row>
   
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="logger.suffix"/>:</controls:label>
               <controls:data>
  -               <html:text property="suffix" size="15"/> 
  +               <html:text property="suffix" size="15"/>
               </controls:data>
           </controls:row>
   
  @@ -160,14 +160,14 @@
                      labelProperty="label"/>
                   </html:select>
               </controls:data>
  -        </controls:row> 
  +        </controls:row>
      </controls:table>
      </td>
     </tr>
     </table>
    </logic:equal>
  -  
  -    
  +
  +
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +6 -6      jakarta-tomcat-catalina/webapps/admin/logger/loggers.jsp
  
  Index: loggers.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/logger/loggers.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- loggers.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ loggers.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="actions.loggers.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
               <controls:actions>
                 <controls:action selected="true">
  @@ -40,14 +40,14 @@
       </tr>
     </table>
   
  -<%@ include file="../buttons.jsp" %>    
  +<%@ include file="../buttons.jsp" %>
     <br>
   
     <%-- Loggers List --%>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1"
            width="100%">
  -    <tr><td> 
  +    <tr><td>
   
         <table class="front-table" border="1"
          cellspacing="0" cellpadding="0" width="100%">
  @@ -68,7 +68,7 @@
                                   value="<%= logger.toString() %>"/>
               </div></td>
               <td><div align="left" class="table-normal-text">&nbsp;
  -              <html:link page='<%= "/EditLogger.do?select=" + 
  +              <html:link page='<%= "/EditLogger.do?select=" +
                            java.net.URLEncoder.encode(logger.toString()) %>'>
                   <controls:attribute name="logger" attribute="className"/>
                 </html:link>
  
  
  
  1.2       +19 -19    jakarta-tomcat-catalina/webapps/admin/realm/jdbcRealm.jsp
  
  Index: jdbcRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/jdbcRealm.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jdbcRealm.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ jdbcRealm.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  @@ -28,7 +28,7 @@
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
         <td width="81%">
  -       <div class="page-title-text" align="left"> 
  +       <div class="page-title-text" align="left">
            <logic:equal name="jdbcRealmForm" property="adminAction" value="Create">
               <bean:message key="actions.realms.create"/>
             </logic:equal>
  @@ -37,20 +37,20 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="jdbcRealmForm" property="adminAction" value="Create">              
  -            <logic:notEqual name="jdbcRealmForm" property="allowDeletion" value="false">  
  -             <controls:action url='<%= "/DeleteRealm.do?select=" + 
  -                                        URLEncoder.encode(thisObjectName) %>'>  
  -                <bean:message key="actions.realms.delete"/> 
  -              </controls:action>   
  +            <logic:notEqual name="jdbcRealmForm" property="adminAction" value="Create">
  +            <logic:notEqual name="jdbcRealmForm" property="allowDeletion" value="false">
  +             <controls:action url='<%= "/DeleteRealm.do?select=" +
  +                                        URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.realms.delete"/>
  +              </controls:action>
                  </logic:notEqual>
  -             </logic:notEqual>          
  -       </controls:actions>   
  +             </logic:notEqual>
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -59,10 +59,10 @@
     <br>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -82,21 +82,21 @@
                   </logic:equal>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.driver"/>:</controls:label>
               <controls:data>
                 <html:text property="driver" size="30"/>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.passwd"/>:</controls:label>
               <controls:data>
                   <html:text property="connectionPassword" size="30"/>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.url"/>:</controls:label>
               <controls:data>
  @@ -164,11 +164,11 @@
                   <html:text property="userTable" size="30"/>
               </controls:data>
           </controls:row>
  -      
  +
         </controls:table>
         </td>
       </tr>
  -  </table>    
  +  </table>
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +27 -20    jakarta-tomcat-catalina/webapps/admin/realm/jndiRealm.jsp
  
  Index: jndiRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/jndiRealm.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jndiRealm.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ jndiRealm.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  @@ -27,7 +27,7 @@
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
         <td width="81%">
  -       <div class="page-title-text" align="left"> 
  +       <div class="page-title-text" align="left">
            <logic:equal name="jndiRealmForm" property="adminAction" value="Create">
               <bean:message key="actions.realms.create"/>
             </logic:equal>
  @@ -36,20 +36,20 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="jndiRealmForm" property="adminAction" value="Create">              
  -                <logic:notEqual name="jndiRealmForm" property="allowDeletion" value="false">  
  -                <controls:action url='<%= "/DeleteRealm.do?select=" + 
  -                                        URLEncoder.encode(thisObjectName) %>'>  
  -                <bean:message key="actions.realms.delete"/> 
  -            </controls:action>           
  -           </logic:notEqual>  
  +            <logic:notEqual name="jndiRealmForm" property="adminAction" value="Create">
  +                <logic:notEqual name="jndiRealmForm" property="allowDeletion" value="false">
  +                <controls:action url='<%= "/DeleteRealm.do?select=" +
  +                                        URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.realms.delete"/>
  +            </controls:action>
  +           </logic:notEqual>
           </logic:notEqual>
  -       </controls:actions>   
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -58,10 +58,10 @@
     <br>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -81,21 +81,21 @@
                   </logic:equal>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.connName"/>:</controls:label>
               <controls:data>
                 <html:text property="connectionName" size="30"/>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.connPassword"/>:</controls:label>
               <controls:data>
                   <html:text property="connectionPassword" size="30"/>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.connURL"/>:</controls:label>
               <controls:data>
  @@ -161,6 +161,13 @@
           </controls:row>
   
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
  +            <controls:label><bean:message key="realm.userBase"/>:</controls:label>
  +            <controls:data>
  +                <html:text property="userBase" size="30"/>
  +            </controls:data>
  +        </controls:row>
  +
  +        <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.user.roleName"/>:</controls:label>
               <controls:data>
                   <html:text property="userRoleName" size="30"/>
  @@ -184,19 +191,19 @@
                   <html:text property="userPassword" size="30"/>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.userPattern"/>:</controls:label>
               <controls:data>
                   <html:text property="userPattern" size="30"/>
               </controls:data>
           </controls:row>
  -      
  +
         </controls:table>
         </td>
       </tr>
     </table>
  -  
  +
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +16 -16    jakarta-tomcat-catalina/webapps/admin/realm/memoryRealm.jsp
  
  Index: memoryRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/memoryRealm.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- memoryRealm.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ memoryRealm.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -27,7 +27,7 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
            <logic:equal name="memoryRealmForm" property="adminAction" value="Create">
               <bean:message key="actions.realms.create"/>
  @@ -37,20 +37,20 @@
             </logic:equal>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="memoryRealmForm" property="adminAction" value="Create">              
  -                <logic:notEqual name="memoryRealmForm" property="allowDeletion" value="false">  
  -                <controls:action url='<%= "/DeleteRealm.do?select=" + 
  -                                        URLEncoder.encode(thisObjectName) %>'>  
  -                <bean:message key="actions.realms.delete"/> 
  -                </controls:action>           
  +            <logic:notEqual name="memoryRealmForm" property="adminAction" value="Create">
  +                <logic:notEqual name="memoryRealmForm" property="allowDeletion" value="false">
  +                <controls:action url='<%= "/DeleteRealm.do?select=" +
  +                                        URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.realms.delete"/>
  +                </controls:action>
               </logic:notEqual>
               </logic:notEqual>
  -       </controls:actions>   
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -59,10 +59,10 @@
     <br>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -        <controls:row header="true" 
  +        <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -96,16 +96,16 @@
   
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.pathName"/>:</controls:label>
  -            <controls:data>               
  +            <controls:data>
                   <html:text property="pathName" size="25"/>
               </controls:data>
           </controls:row>
  -    
  +
         </controls:table>
         </td>
       </tr>
     </table>
  -    
  +
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +6 -6      jakarta-tomcat-catalina/webapps/admin/realm/realms.jsp
  
  Index: realms.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/realms.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- realms.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ realms.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="actions.realms.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
               <controls:actions>
                 <controls:action selected="true">
  @@ -40,14 +40,14 @@
       </tr>
     </table>
   
  -<%@ include file="../buttons.jsp" %>    
  +<%@ include file="../buttons.jsp" %>
     <br>
   
     <%-- Realms List --%>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1"
            width="100%">
  -    <tr><td> 
  +    <tr><td>
   
         <table class="front-table" border="1"
          cellspacing="0" cellpadding="0" width="100%">
  @@ -68,7 +68,7 @@
                                   value="<%= realm.toString() %>"/>
               </div></td>
               <td><div align="left" class="table-normal-text">&nbsp;
  -              <html:link page='<%= "/EditRealm.do?select=" + 
  +              <html:link page='<%= "/EditRealm.do?select=" +
                            java.net.URLEncoder.encode(realm.toString()) %>'>
                   <controls:attribute name="realm" attribute="className"/>
                 </html:link>
  
  
  
  1.2       +18 -18    jakarta-tomcat-catalina/webapps/admin/realm/userDatabaseRealm.jsp
  
  Index: userDatabaseRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/userDatabaseRealm.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- userDatabaseRealm.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ userDatabaseRealm.jsp	24 Jul 2002 20:57:26 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -27,8 +27,8 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  -        <div class="page-title-text" align="left"> 
  +      <td width="81%">
  +        <div class="page-title-text" align="left">
            <logic:equal name="userDatabaseRealmForm" property="adminAction" value="Create">
               <bean:message key="actions.realms.create"/>
             </logic:equal>
  @@ -37,20 +37,20 @@
             </logic:equal>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="userDatabaseRealmForm" property="adminAction" value="Create">                              
  -                <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false">  
  -                <controls:action url='<%= "/DeleteRealm.do?select=" + 
  -                                        URLEncoder.encode(thisObjectName) %>'>  
  -                <bean:message key="actions.realms.delete"/> 
  -            </controls:action>           
  -           </logic:notEqual>          
  -           </logic:notEqual>          
  -       </controls:actions>   
  +            <logic:notEqual name="userDatabaseRealmForm" property="adminAction" value="Create">
  +                <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false">
  +                <controls:action url='<%= "/DeleteRealm.do?select=" +
  +                                        URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.realms.delete"/>
  +            </controls:action>
  +           </logic:notEqual>
  +           </logic:notEqual>
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -59,10 +59,10 @@
     <br>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -105,12 +105,12 @@
                   </logic:equal>
               </controls:data>
           </controls:row>
  -    
  +
         </controls:table>
         </td>
       </tr>
     </table>
  -    
  +
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +8 -8      jakarta-tomcat-catalina/webapps/admin/resources/dataSource.jsp
  
  Index: dataSource.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/dataSource.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dataSource.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ dataSource.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -44,7 +44,7 @@
             <bean:write name="dataSourceForm" property="nodeLabel"/>
           </div>
         </td>
  -      <td align="right" nowrap> 
  +      <td align="right" nowrap>
           <div class="page-title-text">
             <controls:actions>
               <controls:action selected="true">
  @@ -65,7 +65,7 @@
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
                               URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward=" + 
  +                            URLEncoder.encode(serviceInfo) + "&forward=" +
                               URLEncoder.encode("DataSources Delete List") %>'>
                   <bean:message key="resources.actions.datasrc.delete"/>
               </controls:action>
  @@ -79,17 +79,17 @@
   <br>
   
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr><td><div class="table-title-text">  
  +    <tr><td><div class="table-title-text">
           <bean:message key="resources.treeBuilder.datasources"/>
       </div></td></tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
   
  -        <controls:table tableStyle="front-table" lineStyle="line-row">            
  -          <controls:row header="true" 
  +        <controls:table tableStyle="front-table" lineStyle="line-row">
  +          <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/deleteDataSources.jsp
  
  Index: deleteDataSources.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteDataSources.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deleteDataSources.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ deleteDataSources.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -36,12 +36,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.actions.datasrc.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listDataSources.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/deleteEnvEntries.jsp
  
  Index: deleteEnvEntries.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteEnvEntries.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deleteEnvEntries.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ deleteEnvEntries.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -36,12 +36,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.actions.env.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listEnvEntries.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/deleteMailSessions.jsp
  
  Index: deleteMailSessions.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteMailSessions.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deleteMailSessions.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ deleteMailSessions.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -36,12 +36,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.actions.mailsession.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listMailSessions.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/deleteResourceLinks.jsp
  
  Index: deleteResourceLinks.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteResourceLinks.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deleteResourceLinks.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ deleteResourceLinks.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -36,12 +36,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.actions.resourcelk.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listResourceLinks.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/deleteUserDatabases.jsp
  
  Index: deleteUserDatabases.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteUserDatabases.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deleteUserDatabases.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ deleteUserDatabases.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.actions.userdb.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listUserDatabases.jspf" %>
           </div>
  
  
  
  1.2       +8 -8      jakarta-tomcat-catalina/webapps/admin/resources/envEntry.jsp
  
  Index: envEntry.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/envEntry.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- envEntry.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ envEntry.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -44,7 +44,7 @@
             <bean:write name="envEntryForm" property="nodeLabel"/>
           </div>
         </td>
  -      <td align="right" nowrap> 
  +      <td align="right" nowrap>
           <div class="page-title-text">
             <controls:actions>
               <controls:action selected="true">
  @@ -79,17 +79,17 @@
   <br>
   
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr><td><div class="table-title-text">  
  +    <tr><td><div class="table-title-text">
         <bean:message key="resources.env.props"/>
       </div></td></tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
   
  -        <controls:table tableStyle="front-table" lineStyle="line-row">            
  -          <controls:row header="true" 
  +        <controls:table tableStyle="front-table" lineStyle="line-row">
  +          <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -119,7 +119,7 @@
               <controls:data>
                 <html:select property="entryType">
                        <bean:define id="typeVals" name="envEntryForm" property="typeVals"/>
  -                     <html:options collection="typeVals" property="value" 
  +                     <html:options collection="typeVals" property="value"
                                      labelProperty="label"/>
                   </html:select>
               </controls:data>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/listDataSources.jsp
  
  Index: listDataSources.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listDataSources.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- listDataSources.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ listDataSources.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -36,12 +36,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.actions.datasrc"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listDataSources.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/listEnvEntries.jsp
  
  Index: listEnvEntries.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listEnvEntries.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- listEnvEntries.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ listEnvEntries.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -36,12 +36,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.env.entries"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listEnvEntries.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/listMailSessions.jsp
  
  Index: listMailSessions.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listMailSessions.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- listMailSessions.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ listMailSessions.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -36,12 +36,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.actions.mailsession"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listMailSessions.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/listResourceLinks.jsp
  
  Index: listResourceLinks.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listResourceLinks.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- listResourceLinks.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ listResourceLinks.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -36,12 +36,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.actions.resourcelk"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listResourceLinks.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/resources/listUserDatabases.jsp
  
  Index: listUserDatabases.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listUserDatabases.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- listUserDatabases.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ listUserDatabases.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="resources.treeBuilder.databases"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listUserDatabases.jspf" %>
           </div>
  
  
  
  1.2       +8 -8      jakarta-tomcat-catalina/webapps/admin/resources/mailSession.jsp
  
  Index: mailSession.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/mailSession.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mailSession.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ mailSession.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -44,7 +44,7 @@
             <bean:write name="mailSessionForm" property="nodeLabel"/>
           </div>
         </td>
  -      <td align="right" nowrap> 
  +      <td align="right" nowrap>
           <div class="page-title-text">
             <controls:actions>
               <controls:action selected="true">
  @@ -65,7 +65,7 @@
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
                               URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward=" + 
  +                            URLEncoder.encode(serviceInfo) + "&forward=" +
                               URLEncoder.encode("MailSessions Delete List") %>'>
                   <bean:message key="resources.actions.mailsession.delete"/>
               </controls:action>
  @@ -79,17 +79,17 @@
   <br>
   
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr><td><div class="table-title-text">  
  +    <tr><td><div class="table-title-text">
           <bean:message key="resources.treeBuilder.mailsessions"/>
       </div></td></tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
   
  -        <controls:table tableStyle="front-table" lineStyle="line-row">            
  -          <controls:row header="true" 
  +        <controls:table tableStyle="front-table" lineStyle="line-row">
  +          <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  
  
  
  1.2       +8 -8      jakarta-tomcat-catalina/webapps/admin/resources/resourceLink.jsp
  
  Index: resourceLink.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/resourceLink.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- resourceLink.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ resourceLink.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -45,7 +45,7 @@
             <bean:write name="resourceLinkForm" property="nodeLabel"/>
           </div>
         </td>
  -      <td align="right" nowrap> 
  +      <td align="right" nowrap>
           <div class="page-title-text">
             <controls:actions>
               <controls:action selected="true">
  @@ -66,7 +66,7 @@
                               URLEncoder.encode(resourcetypeInfo) + "&path="+
                               URLEncoder.encode(pathInfo) + "&host="+
                               URLEncoder.encode(hostInfo) + "&service="+
  -                            URLEncoder.encode(serviceInfo) + "&forward=" + 
  +                            URLEncoder.encode(serviceInfo) + "&forward=" +
                               URLEncoder.encode("ResourceLinks Delete List") %>'>
                   <bean:message key="resources.actions.resourcelk.delete"/>
               </controls:action>
  @@ -80,17 +80,17 @@
   <br>
   
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr><td><div class="table-title-text">  
  +    <tr><td><div class="table-title-text">
           <bean:message key="resources.treeBuilder.resourcelinks"/>
       </div></td></tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
   
  -        <controls:table tableStyle="front-table" lineStyle="line-row">            
  -          <controls:row header="true" 
  +        <controls:table tableStyle="front-table" lineStyle="line-row">
  +          <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  
  
  
  1.2       +8 -8      jakarta-tomcat-catalina/webapps/admin/resources/userDatabase.jsp
  
  Index: userDatabase.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/userDatabase.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- userDatabase.jsp	18 Jul 2002 16:48:28 -0000	1.1
  +++ userDatabase.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -30,7 +30,7 @@
             <bean:write name="userDatabaseForm" property="nodeLabel"/>
           </div>
         </td>
  -      <td align="right" nowrap> 
  +      <td align="right" nowrap>
           <div class="page-title-text">
             <controls:actions>
               <controls:action selected="true">
  @@ -43,7 +43,7 @@
               <controls:action url="/resources/setUpUserDatabase.do">
                   <bean:message key="resources.actions.userdb.create"/>
               </controls:action>
  -            <controls:action url='<%= "/resources/listUserDatabases.do?forward=" 
  +            <controls:action url='<%= "/resources/listUserDatabases.do?forward="
                           + URLEncoder.encode("UserDatabases Delete List") %>'>
                   <bean:message key="resources.actions.userdb.delete"/>
               </controls:action>
  @@ -57,17 +57,17 @@
   <br>
   
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr><td><div class="table-title-text">  
  +    <tr><td><div class="table-title-text">
           <bean:message key="resources.treeBuilder.databases"/>
       </div></td></tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
   
  -        <controls:table tableStyle="front-table" lineStyle="line-row">            
  -          <controls:row header="true" 
  +        <controls:table tableStyle="front-table" lineStyle="line-row">
  +          <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  
  
  
  1.2       +5 -5      jakarta-tomcat-catalina/webapps/admin/server/server.jsp
  
  Index: server.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/server/server.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- server.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ server.jsp	24 Jul 2002 20:57:27 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -25,7 +25,7 @@
              <bean:write name="serverForm" property="nodeLabel"/>
           </div>
         </td>
  -      <td align="right" nowrap> 
  +      <td align="right" nowrap>
           <div class="page-title-text">
           <controls:actions>
             <controls:action selected="true">
  @@ -50,16 +50,16 @@
    <br>
   
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr><td><div class="table-title-text">  
  +    <tr><td><div class="table-title-text">
         <bean:message key="server.properties"/>
       </div></td></tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  +    <tr>
         <td>
            <controls:table tableStyle="front-table" lineStyle="line-row">
  -          <controls:row header="true" 
  +          <controls:row header="true"
                 labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>
                 <bean:message key="service.property"/>
  
  
  
  1.2       +37 -37    jakarta-tomcat-catalina/webapps/admin/service/service.jsp
  
  Index: service.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/service/service.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- service.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ service.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -33,7 +33,7 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr class="page-title-row">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <logic:equal name="serviceForm" property="adminAction" value="Create">
               <bean:message key="actions.services.create"/>
  @@ -43,7 +43,7 @@
             </logic:equal>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <controls:actions>
               <controls:action selected="true">
  @@ -54,64 +54,64 @@
               </controls:action>
               <logic:notEqual name="serviceForm" property="adminAction" value="Create">
                 <controls:action url='<%= "/AddConnector.do?serviceName=" +
  -                                        URLEncoder.encode(thisServiceName) %>'>  
  +                                        URLEncoder.encode(thisServiceName) %>'>
                   <bean:message key="actions.connectors.create"/>
  -              </controls:action>              
  +              </controls:action>
                 <controls:action url='<%= "/DeleteConnector.do?serviceName=" +
  -                                        URLEncoder.encode(thisServiceName)%>'> 
  +                                        URLEncoder.encode(thisServiceName)%>'>
                   <bean:message key="actions.connectors.deletes"/>
                 </controls:action>
                 <controls:action>
                   -------------------------------------
                 </controls:action>
                 <controls:action url='<%= "/AddHost.do?serviceName=" +
  -                                        URLEncoder.encode(thisServiceName) %>'>  
  +                                        URLEncoder.encode(thisServiceName) %>'>
                   <bean:message key="actions.hosts.create"/>
  -              </controls:action>              
  +              </controls:action>
                 <controls:action url='<%= "/DeleteHost.do?serviceName=" +
                                           URLEncoder.encode(thisServiceName) %>'>
  -                <bean:message key="actions.hosts.deletes"/> 
  +                <bean:message key="actions.hosts.deletes"/>
                 </controls:action>
                 <controls:action disabled="true">
                   -------------------------------------
                 </controls:action>
  -              <controls:action url='<%= "/AddLogger.do?parent=" + 
  +              <controls:action url='<%= "/AddLogger.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.loggers.create"/>
                 </controls:action>
  -              <controls:action url='<%= "/DeleteLogger.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -                <bean:message key="actions.loggers.deletes"/> 
  +              <controls:action url='<%= "/DeleteLogger.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.loggers.deletes"/>
                 </controls:action>
                  <%-- cannot delete or add a Realm for the service the admin app runs on --%>
                 <logic:notEqual name="serviceName" value='<%= adminServiceName %>'>
  -              <controls:action disabled="true"> 
  -                ------------------------------------- 
  +              <controls:action disabled="true">
  +                -------------------------------------
                 </controls:action>
  -              <controls:action url='<%= "/AddRealm.do?parent=" + 
  +              <controls:action url='<%= "/AddRealm.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.realms.create"/>
  -             </controls:action>              
  -             <controls:action url='<%= "/DeleteRealm.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -                <bean:message key="actions.realms.deletes"/> 
  +             </controls:action>
  +             <controls:action url='<%= "/DeleteRealm.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.realms.deletes"/>
                 </controls:action>
                 </logic:notEqual>
  -              <controls:action disabled="true"> 
  -                ------------------------------------- 
  +              <controls:action disabled="true">
  +                -------------------------------------
                 </controls:action>
  -              <controls:action url='<%= "/AddValve.do?parent=" + 
  +              <controls:action url='<%= "/AddValve.do?parent=" +
                                     URLEncoder.encode(thisObjectName) %>'>
  -                <bean:message key="actions.valves.create"/> 
  +                <bean:message key="actions.valves.create"/>
                 </controls:action>
  -              <controls:action url='<%= "/DeleteValve.do?parent=" + 
  -                                  URLEncoder.encode(thisObjectName) %>'> 
  -                <bean:message key="actions.valves.deletes"/> 
  +              <controls:action url='<%= "/DeleteValve.do?parent=" +
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.valves.deletes"/>
                  </controls:action>
                  <%-- cannot delete the service the admin app runs on --%>
                  <logic:notEqual name="serviceName" value='<%= adminServiceName %>'>
  -               <controls:action disabled="true"> 
  -                ------------------------------------- 
  +               <controls:action disabled="true">
  +                -------------------------------------
                   </controls:action>
                    <controls:action url='<%= "/DeleteService.do?select=" +
                                           URLEncoder.encode(thisObjectName) %>'>
  @@ -130,17 +130,17 @@
     <%-- Service Properties --%>
   
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr><td><div class="table-title-text">  
  +    <tr><td><div class="table-title-text">
         <bean:message key="service.properties"/>
       </div></td></tr>
     </table>
   
     <table class="back-table" border="0"
            cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
           <controls:table tableStyle="front-table" lineStyle="line-row">
  -          <controls:row header="true" 
  +          <controls:row header="true"
                 labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>
                 <bean:message key="service.property"/>
  @@ -174,17 +174,17 @@
     <%-- Engine Properties --%>
   
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr><td><div class="table-title-text">  
  +    <tr><td><div class="table-title-text">
         <bean:message key="service.engine.props"/>
       </div></td></tr>
     </table>
   
     <table class="back-table" border="0"
            cellspacing="0" cellpadding="1" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
           <controls:table tableStyle="front-table" lineStyle="line-row">
  -          <controls:row header="true" 
  +          <controls:row header="true"
                 labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>
                 <bean:message key="service.property"/>
  
  
  
  1.2       +10 -10    jakarta-tomcat-catalina/webapps/admin/service/services.jsp
  
  Index: services.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/service/services.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- services.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ services.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" %>
  +<%@ page language="java" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="actions.services.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
               <controls:actions>
                 <controls:action selected="true">
  @@ -40,14 +40,14 @@
       </tr>
     </table>
   
  -<%@ include file="../buttons.jsp" %>    
  +<%@ include file="../buttons.jsp" %>
     <br>
   
     <%-- Services List --%>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1"
            width="100%">
  -    <tr><td> 
  +    <tr><td>
   
         <table class="front-table" border="1"
          cellspacing="0" cellpadding="0" width="100%">
  @@ -64,18 +64,18 @@
           <logic:iterate name="servicesList" id="service">
             <tr class="line-row">
               <td><div align="left" class="table-normal-text">&nbsp;
  -             <logic:match name="service" 
  +             <logic:match name="service"
                           value='<%= (String)request.getAttribute("adminAppService") %>'>
  -             <font color='red'>*</font>           
  -             </logic:match>          
  -             <logic:notMatch name="service" 
  +             <font color='red'>*</font>
  +             </logic:match>
  +             <logic:notMatch name="service"
                           value='<%= (String)request.getAttribute("adminAppService") %>'>
                 <html:multibox property="services"
                                   value="<%= service.toString() %>"/>
                 </logic:notMatch>
               </div></td>
               <td><div align="left" class="table-normal-text">&nbsp;
  -              <html:link page='<%= "/EditService.do?select=" + 
  +              <html:link page='<%= "/EditService.do?select=" +
                            java.net.URLEncoder.encode(service.toString()) %>'>
                   <controls:attribute name="service" attribute="name"/>
                 </html:link>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/users/deleteGroups.jsp
  
  Index: deleteGroups.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/deleteGroups.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deleteGroups.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ deleteGroups.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="users.deleteGroups.title"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listGroups.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/users/deleteRoles.jsp
  
  Index: deleteRoles.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/deleteRoles.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deleteRoles.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ deleteRoles.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="users.deleteRoles.title"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listRoles.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/users/deleteUsers.jsp
  
  Index: deleteUsers.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/deleteUsers.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- deleteUsers.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ deleteUsers.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="users.deleteUsers.title"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listUsers.jspf" %>
           </div>
  
  
  
  1.2       +5 -5      jakarta-tomcat-catalina/webapps/admin/users/group.jsp
  
  Index: group.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/group.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- group.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ group.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -29,7 +29,7 @@
             <bean:write name="groupForm" property="nodeLabel"/>
           </div>
         </td>
  -      <td align="right" nowrap> 
  +      <td align="right" nowrap>
           <div class="page-title-text">
             <controls:actions>
               <controls:action selected="true">
  @@ -58,12 +58,12 @@
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1"
            width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
   
           <controls:table tableStyle="front-table" lineStyle="line-row">
   
  -          <controls:row header="true" 
  +          <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>
                 <bean:message key="users.group.properties"/>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/users/listGroups.jsp
  
  Index: listGroups.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/listGroups.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- listGroups.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ listGroups.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="users.listGroups.title"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listGroups.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/users/listRoles.jsp
  
  Index: listRoles.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/listRoles.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- listRoles.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ listRoles.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="users.listRoles.title"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listRoles.jspf" %>
           </div>
  
  
  
  1.2       +3 -3      jakarta-tomcat-catalina/webapps/admin/users/listUsers.jsp
  
  Index: listUsers.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/listUsers.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- listUsers.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ listUsers.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -20,12 +20,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="users.listUsers.title"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
             <%@ include file="listUsers.jspf" %>
           </div>
  
  
  
  1.2       +5 -5      jakarta-tomcat-catalina/webapps/admin/users/role.jsp
  
  Index: role.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/role.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- role.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ role.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -29,7 +29,7 @@
             <bean:write name="roleForm" property="nodeLabel"/>
           </div>
         </td>
  -      <td align="right" nowrap> 
  +      <td align="right" nowrap>
           <div class="page-title-text">
             <controls:actions>
               <controls:action selected="true">
  @@ -58,12 +58,12 @@
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1"
            width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
   
           <controls:table tableStyle="front-table" lineStyle="line-row">
   
  -          <controls:row header="true" 
  +          <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>
                 <bean:message key="users.role.properties"/>
  
  
  
  1.2       +5 -5      jakarta-tomcat-catalina/webapps/admin/users/user.jsp
  
  Index: user.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/user.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- user.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ user.jsp	24 Jul 2002 20:57:28 -0000	1.2
  @@ -1,6 +1,6 @@
   <!-- Standard Struts Entries -->
   
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -29,7 +29,7 @@
             <bean:write name="userForm" property="nodeLabel"/>
           </div>
         </td>
  -      <td align="right" nowrap> 
  +      <td align="right" nowrap>
           <div class="page-title-text">
             <controls:actions>
               <controls:action selected="true">
  @@ -59,12 +59,12 @@
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1"
            width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
   
           <controls:table tableStyle="front-table" lineStyle="line-row">
   
  -          <controls:row header="true" 
  +          <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label>
                 <bean:message key="users.user.properties"/>
  
  
  
  1.2       +18 -18    jakarta-tomcat-catalina/webapps/admin/valve/accessLogValve.jsp
  
  Index: accessLogValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/accessLogValve.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- accessLogValve.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ accessLogValve.jsp	24 Jul 2002 20:57:29 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  @@ -30,7 +30,7 @@
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
         <td width="81%">
  -       <div class="page-title-text" align="left"> 
  +       <div class="page-title-text" align="left">
            <logic:equal name="accessLogValveForm" property="adminAction" value="Create">
               <bean:message key="actions.valves.create"/>
             </logic:equal>
  @@ -39,19 +39,19 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="accessLogValveForm" property="adminAction" value="Create">              
  +            <logic:notEqual name="accessLogValveForm" property="adminAction" value="Create">
                <controls:action url='<%= "/DeleteValve.do?"  +
  -                                 "select=" + URLEncoder.encode(thisObjectName) + 
  -                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>  
  -                <bean:message key="actions.valves.delete"/> 
  +                                 "select=" + URLEncoder.encode(thisObjectName) +
  +                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>
  +                <bean:message key="actions.valves.delete"/>
                 </controls:action>
  -             </logic:notEqual>          
  -       </controls:actions>   
  +             </logic:notEqual>
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -61,16 +61,16 @@
   
    <%-- Access Log Properties --%>
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td> <div class="table-title-text"> 
  +    <tr> <td> <div class="table-title-text">
           <bean:message key="valve.access.properties"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -90,7 +90,7 @@
                   </logic:equal>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="server.debuglevel"/>:</controls:label>
               <controls:data>
  @@ -108,14 +108,14 @@
                 <html:text property="directory" size="30"/>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="valve.pattern"/>:</controls:label>
               <controls:data>
                   <html:textarea property="pattern" cols="30" rows="2"/>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="logger.prefix"/>:</controls:label>
               <controls:data>
  @@ -132,7 +132,7 @@
                      labelProperty="label"/>
                   </html:select>
               </controls:data>
  -        </controls:row> 
  +        </controls:row>
   
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="logger.suffix"/>:</controls:label>
  @@ -144,7 +144,7 @@
         </controls:table>
         </td>
       </tr>
  -  </table>    
  +  </table>
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +15 -15    jakarta-tomcat-catalina/webapps/admin/valve/remoteAddrValve.jsp
  
  Index: remoteAddrValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/remoteAddrValve.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- remoteAddrValve.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ remoteAddrValve.jsp	24 Jul 2002 20:57:29 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  @@ -30,7 +30,7 @@
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
         <td width="81%">
  -       <div class="page-title-text" align="left"> 
  +       <div class="page-title-text" align="left">
            <logic:equal name="remoteAddrValveForm" property="adminAction" value="Create">
               <bean:message key="actions.valves.create"/>
             </logic:equal>
  @@ -39,19 +39,19 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="remoteAddrValveForm" property="adminAction" value="Create">              
  +            <logic:notEqual name="remoteAddrValveForm" property="adminAction" value="Create">
                <controls:action url='<%= "/DeleteValve.do?"  +
  -                                 "select=" + URLEncoder.encode(thisObjectName) + 
  -                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>  
  -                <bean:message key="actions.valves.delete"/> 
  +                                 "select=" + URLEncoder.encode(thisObjectName) +
  +                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>
  +                <bean:message key="actions.valves.delete"/>
                 </controls:action>
  -             </logic:notEqual>          
  -       </controls:actions>   
  +             </logic:notEqual>
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -61,16 +61,16 @@
   
    <%-- Remote Addr Valve Properties --%>
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td> <div class="table-title-text"> 
  +    <tr> <td> <div class="table-title-text">
           <bean:message key="valve.remoteaddress.properties"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -90,7 +90,7 @@
                   </logic:equal>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="valve.allowIPs"/>:</controls:label>
               <controls:data>
  @@ -108,7 +108,7 @@
         </controls:table>
         </td>
       </tr>
  -  </table>    
  +  </table>
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +15 -15    jakarta-tomcat-catalina/webapps/admin/valve/remoteHostValve.jsp
  
  Index: remoteHostValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/remoteHostValve.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- remoteHostValve.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ remoteHostValve.jsp	24 Jul 2002 20:57:29 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  @@ -30,7 +30,7 @@
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
         <td width="81%">
  -       <div class="page-title-text" align="left"> 
  +       <div class="page-title-text" align="left">
            <logic:equal name="remoteHostValveForm" property="adminAction" value="Create">
               <bean:message key="actions.valves.create"/>
             </logic:equal>
  @@ -39,19 +39,19 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="remoteHostValveForm" property="adminAction" value="Create">              
  +            <logic:notEqual name="remoteHostValveForm" property="adminAction" value="Create">
                <controls:action url='<%= "/DeleteValve.do?"  +
  -                                 "select=" + URLEncoder.encode(thisObjectName) + 
  -                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>  
  -                <bean:message key="actions.valves.delete"/> 
  +                                 "select=" + URLEncoder.encode(thisObjectName) +
  +                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>
  +                <bean:message key="actions.valves.delete"/>
                 </controls:action>
  -              </logic:notEqual>          
  -       </controls:actions>   
  +              </logic:notEqual>
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -61,16 +61,16 @@
   
    <%-- RemoteHost Valve Properties --%>
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td> <div class="table-title-text"> 
  +    <tr> <td> <div class="table-title-text">
           <bean:message key="valve.remotehost.properties"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -90,7 +90,7 @@
                   </logic:equal>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="valve.allowHosts"/>:</controls:label>
               <controls:data>
  @@ -108,7 +108,7 @@
         </controls:table>
         </td>
       </tr>
  -  </table>    
  +  </table>
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +15 -15    jakarta-tomcat-catalina/webapps/admin/valve/requestDumperValve.jsp
  
  Index: requestDumperValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/requestDumperValve.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- requestDumperValve.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ requestDumperValve.jsp	24 Jul 2002 20:57:29 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  @@ -30,7 +30,7 @@
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
         <td width="81%">
  -       <div class="page-title-text" align="left"> 
  +       <div class="page-title-text" align="left">
            <logic:equal name="requestDumperValveForm" property="adminAction" value="Create">
               <bean:message key="actions.valves.create"/>
             </logic:equal>
  @@ -39,19 +39,19 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="requestDumperValveForm" property="adminAction" value="Create">              
  +            <logic:notEqual name="requestDumperValveForm" property="adminAction" value="Create">
                <controls:action url='<%= "/DeleteValve.do?"  +
  -                                 "select=" + URLEncoder.encode(thisObjectName) + 
  -                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>  
  -                <bean:message key="actions.valves.delete"/> 
  +                                 "select=" + URLEncoder.encode(thisObjectName) +
  +                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>
  +                <bean:message key="actions.valves.delete"/>
                 </controls:action>
  -              </logic:notEqual>          
  -       </controls:actions>   
  +              </logic:notEqual>
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -62,16 +62,16 @@
   
    <%-- Request Dumper Valve Properties --%>
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td> <div class="table-title-text"> 
  +    <tr> <td> <div class="table-title-text">
           <bean:message key="valve.request.properties"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -90,12 +90,12 @@
                     <bean:write name="requestDumperValveForm" property="valveType" scope="session"/>
                   </logic:equal>
               </controls:data>
  -        </controls:row>      
  +        </controls:row>
   
         </controls:table>
         </td>
       </tr>
  -  </table>    
  +  </table>
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +15 -15    jakarta-tomcat-catalina/webapps/admin/valve/singleSignOnValve.jsp
  
  Index: singleSignOnValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/singleSignOnValve.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- singleSignOnValve.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ singleSignOnValve.jsp	24 Jul 2002 20:57:29 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder" %>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  @@ -30,7 +30,7 @@
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
         <td width="81%">
  -       <div class="page-title-text" align="left"> 
  +       <div class="page-title-text" align="left">
            <logic:equal name="singleSignOnValveForm" property="adminAction" value="Create">
               <bean:message key="actions.valves.create"/>
             </logic:equal>
  @@ -39,19 +39,19 @@
             </logic:equal>
          </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="singleSignOnValveForm" property="adminAction" value="Create">              
  +            <logic:notEqual name="singleSignOnValveForm" property="adminAction" value="Create">
                <controls:action url='<%= "/DeleteValve.do?"  +
  -                                 "select=" + URLEncoder.encode(thisObjectName) + 
  -                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>  
  -                <bean:message key="actions.valves.delete"/> 
  +                                 "select=" + URLEncoder.encode(thisObjectName) +
  +                                 "&parent="+ URLEncoder.encode(thisParentName) %>'>
  +                <bean:message key="actions.valves.delete"/>
                 </controls:action>
  -              </logic:notEqual>          
  -       </controls:actions>   
  +              </logic:notEqual>
  +       </controls:actions>
            </div>
         </td>
       </tr>
  @@ -61,16 +61,16 @@
   
    <%-- Single Sign On Valve Properties --%>
    <table border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> <td> <div class="table-title-text"> 
  +    <tr> <td> <div class="table-title-text">
           <bean:message key="valve.single.properties"/>
       </div> </td> </tr>
     </table>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="0" width="100%">
  -    <tr> 
  -      <td> 
  +    <tr>
  +      <td>
          <controls:table tableStyle="front-table" lineStyle="line-row">
  -            <controls:row header="true" 
  +            <controls:row header="true"
                   labelStyle="table-header-text" dataStyle="table-header-text">
               <controls:label><bean:message key="service.property"/></controls:label>
               <controls:data><bean:message key="service.value"/></controls:data>
  @@ -90,7 +90,7 @@
                   </logic:equal>
               </controls:data>
           </controls:row>
  -      
  +
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="server.debuglevel"/>:</controls:label>
               <controls:data>
  @@ -105,7 +105,7 @@
         </controls:table>
         </td>
       </tr>
  -  </table>    
  +  </table>
       <%@ include file="../buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.2       +7 -7      jakarta-tomcat-catalina/webapps/admin/valve/valves.jsp
  
  Index: valves.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/valves.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- valves.jsp	18 Jul 2002 16:48:16 -0000	1.1
  +++ valves.jsp	24 Jul 2002 20:57:29 -0000	1.2
  @@ -1,5 +1,5 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" import="java.net.URLEncoder"%>
  +<%@ page language="java" import="java.net.URLEncoder" contentType="text/html;charset=utf-8" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -24,12 +24,12 @@
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  -      <td width="81%"> 
  +      <td width="81%">
           <div class="page-title-text" align="left">
             <bean:message key="actions.valves.delete"/>
           </div>
         </td>
  -      <td width="19%"> 
  +      <td width="19%">
           <div align="right">
               <controls:actions>
                 <controls:action selected="true">
  @@ -44,14 +44,14 @@
       </tr>
     </table>
   
  -<%@ include file="../buttons.jsp" %>    
  +<%@ include file="../buttons.jsp" %>
     <br>
   
     <%-- Valves List --%>
   
     <table class="back-table" border="0" cellspacing="0" cellpadding="1"
            width="100%">
  -    <tr><td> 
  +    <tr><td>
   
         <table class="front-table" border="1"
          cellspacing="0" cellpadding="0" width="100%">
  @@ -72,9 +72,9 @@
                                   value="<%= valve.toString() %>"/>
               </div></td>
               <td><div align="left" class="table-normal-text">&nbsp;
  -              <html:link page='<%= "/EditValve.do?select=" + 
  +              <html:link page='<%= "/EditValve.do?select=" +
                            java.net.URLEncoder.encode(valve.toString()) +
  -                         "&parent="+ URLEncoder.encode(thisParentName) %>'>  
  +                         "&parent="+ URLEncoder.encode(thisParentName) %>'>
                   <controls:attribute name="valve" attribute="className"/>
                 </html:link>
               </div></td>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>