tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manv...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties ContextForm.java TomcatTreeBuilder.java
Date Tue, 29 Jan 2002 01:15:56 GMT
manveen     02/01/28 17:15:56

  Modified:    webapps/admin logger.jsp
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        ApplicationResources_en.properties
                        ApplicationResources_es.properties ContextForm.java
                        TomcatTreeBuilder.java
  Log:
  * Added front end check for session id initializer is required ,i.e. cannot be blank.
  * Cleanup table creation for logger type FileLogger.
  
  Revision  Changes    Path
  1.2       +26 -6     jakarta-tomcat-4.0/webapps/admin/logger.jsp
  
  Index: logger.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/logger.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logger.jsp	26 Jan 2002 22:39:45 -0000	1.1
  +++ logger.jsp	29 Jan 2002 01:15:55 -0000	1.2
  @@ -81,12 +81,32 @@
               </controls:data>
           </controls:row>   
         </controls:table>
  +      </td>
  +    </tr>
  +  </table>
   
  -    <%-- Display the following fileds only if it is a FileLogger --%>
  +    <%-- 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" 
                     value="FileLogger">
  +     <br>
  +        
  +     <table border="0" cellspacing="0" cellpadding="0" width="100%">
  +        <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> 
  +     <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>
  +        </controls:row>
   
  -       <controls:table tableStyle="front-table" lineStyle="line-row">
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="logger.directory"/>:</controls:label>
               <controls:data>
  @@ -119,12 +139,12 @@
               </controls:data>
           </controls:row> 
      </controls:table>
  -
  +   </td>
  +  </tr>
  +  </table>
    </logic:equal>
     
  -      </td>
  -    </tr>
  -  </table>
  +    
       <%@ include file="buttons.jsp" %>
     <br>
     </html:form>
  
  
  
  1.16      +1 -2      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApplicationResources_en.properties	26 Jan 2002 22:39:45 -0000	1.15
  +++ ApplicationResources_en.properties	29 Jan 2002 01:15:55 -0000	1.16
  @@ -131,8 +131,6 @@
   error.mgrCheckInterval.format=<li>Manager check interval not a valid integer!</li>
   error.mgrCheckInterval.range=<li>Manager check interval seems out of range. Valid
range is 1-1000. </li>
   error.mgrSessionIDInit.required=<li>Session Manager Initialization ID cannot be empty</li>
  -error.mgrSessionIDInit.format=<li>Session Manager Initialization ID  not a valid
integer!</li>
  -error.mgrSessionIDInit.range=<li>Session Manager Initialization ID seems out of range.
Valid range is 1-1000. </li>
   error.mgrMaxSessions.required=<li>Maximum sessions cannot be empty</li>
   error.mgrMaxSessions.format=<li>Maximum sessions not a valid integer!</li>
   error.mgrMaxSessions.range=<li>Maximum sessions seems out of range. Valid range is
-1 to 100. </li>
  @@ -149,6 +147,7 @@
   logger.prefix=Prefix
   logger.suffix=Suffix
   logger.timestamp=Timestamp
  +logger.filelogger.properties=Filelogger specific Properties
   error.directory.required=<li>Directory cannot be empty.</li>
   error.prefix.required=<li>Prefix cannot be empty.</li>
   error.suffix.required=<li>Suffix cannot be empty.</li>
  
  
  
  1.18      +1 -2      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
  
  Index: ApplicationResources_es.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ApplicationResources_es.properties	26 Jan 2002 22:39:45 -0000	1.17
  +++ ApplicationResources_es.properties	29 Jan 2002 01:15:55 -0000	1.18
  @@ -131,8 +131,6 @@
   error.mgrCheckInterval.format=<li>Intervalo del cheque del encargado no un numero
entero valido!</li>
   error.mgrCheckInterval.range=<li>El intervalo del cheque del encargado se parece
fuera de rango. El rango validoes 1-1000.</li>
   error.mgrSessionIDInit.required=<li>La identificacion de la inicializacion del encargado
de la sesion no puede servica</li>
  -error.mgrSessionIDInit.format=<li>Identificacion de la inicializacion del encargado
de la sesion no un numero entero valido!</li>
  -error.mgrSessionIDInit.range=<li>La identificacion de la inicializacion del encargado
de la sesion se parece fuera de rango. El rango valido es 1-1000. </li>
   error.mgrMaxSessions.required=<li>Las sesiones maximas no pueden ser vacias</li>
   error.mgrMaxSessions.format=<li>Sesiones maximas no un numero entero valido!</li>
   error.mgrMaxSessions.range=<li>Las sesiones maximas se parecen fuera de rango. El
rango valido es -1 a 100.</li>
  @@ -149,6 +147,7 @@
   logger.prefix=Prefijo
   logger.suffix=Sufijo
   logger.timestamp=Timestamp
  +logger.filelogger.properties=Propiedades especificas del FileLogger
   error.directory.required=<li>El directorio no puede ser vacio.</li>
   error.prefix.required=<li>El prefijo no puede ser vacio.</li>
   error.suffix.required=<li>El sufijo no puede ser vacio.</li>
  
  
  
  1.3       +8 -5      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextForm.java
  
  Index: ContextForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextForm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContextForm.java	28 Jan 2002 17:44:42 -0000	1.2
  +++ ContextForm.java	29 Jan 2002 01:15:55 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextForm.java,v
1.2 2002/01/28 17:44:42 manveen Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/01/28 17:44:42 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ContextForm.java,v
1.3 2002/01/29 01:15:55 manveen Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/01/29 01:15:55 $
    *
    * ====================================================================
    *
  @@ -74,7 +74,7 @@
    * Form bean for the context page.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.2 $ $Date: 2002/01/28 17:44:42 $
  + * @version $Revision: 1.3 $ $Date: 2002/01/29 01:15:55 $
    */
   
   public final class ContextForm extends ActionForm {
  @@ -682,10 +682,13 @@
               // FIXME-- verify if these ranges are ok.
               numberCheck("ldrCheckInterval", ldrCheckInterval  , true, 0, 10000);
               
  -            // session manager properties
  +            // session manager properties            
               numberCheck("mgrCheckInterval",  mgrCheckInterval, true, 0, 10000);
               numberCheck("mgrMaxSessions",  mgrMaxSessions, false, -1, 100);
               
  +            if ((mgrSessionIDInit == null) || (mgrSessionIDInit.length() < 1)) {
  +                errors.add("mgrSessionIDInit", new ActionError("error.mgrSessionIDInit.required"));
  +            }
           }
           
           return errors;
  
  
  
  1.12      +8 -10     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
  
  Index: TomcatTreeBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TomcatTreeBuilder.java	28 Jan 2002 17:44:42 -0000	1.11
  +++ TomcatTreeBuilder.java	29 Jan 2002 01:15:55 -0000	1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.11 2002/01/28 17:44:42 manveen Exp $
  - * $Revision: 1.11 $
  - * $Date: 2002/01/28 17:44:42 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.12 2002/01/29 01:15:55 manveen Exp $
  + * $Revision: 1.12 $
  + * $Date: 2002/01/29 01:15:55 $
    *
    * ====================================================================
    *
  @@ -65,7 +65,6 @@
   import java.util.Iterator;
   import java.util.List;
   import java.util.Locale;
  -import java.util.StringTokenizer;
   import java.net.URLEncoder;
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServletRequest;
  @@ -92,7 +91,7 @@
    *
    * @author Jazmin Jonson
    * @author Manveen Kaur
  - * @version $Revision: 1.11 $ $Date: 2002/01/28 17:44:42 $
  + * @version $Revision: 1.12 $ $Date: 2002/01/29 01:15:55 $
    */
   
   
  @@ -360,11 +359,10 @@
               SetUpLoggerAction.CLASSNAME_PROP_NAME);
               
               String loggerType = null;
  -            StringTokenizer st = new StringTokenizer(className, ".");
  -            while (st.hasMoreTokens()) {
  -                loggerType = st.nextToken().trim();
  -            }
  -           
  +            int period = className.lastIndexOf(".");
  +            if (period >= 0)
  +                loggerType = className.substring(period + 1);
  +            
               String encodedLoggerType =  URLEncoder.encode(loggerType);
               
               String nodeLabel="Logger";
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message