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/valve accessLogValve.jsp remoteAddrValve.jsp remoteHostValve.jsp requestDumperValve.jsp singleSignOnValve.jsp
Date Tue, 21 May 2002 00:36:43 GMT
manveen     02/05/20 17:36:43

  Modified:    webapps/admin admin.css
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
                        EditLoggerAction.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
                        EditRealmAction.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
                        EditValveAction.java
               webapps/admin/connector connector.jsp
               webapps/admin/context context.jsp
               webapps/admin/host host.jsp
               webapps/admin/logger logger.jsp
               webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp
                        memoryRealm.jsp userDatabaseRealm.jsp
               webapps/admin/service service.jsp
               webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp
                        remoteHostValve.jsp requestDumperValve.jsp
                        singleSignOnValve.jsp
  Log:
  Property page banners show location in hierarchy.
  
  Revision  Changes    Path
  1.4       +1 -1      jakarta-tomcat-4.0/webapps/admin/admin.css
  
  Index: admin.css
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/admin.css,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- admin.css	11 Dec 2001 22:54:12 -0000	1.3
  +++ admin.css	21 May 2002 00:36:42 -0000	1.4
  @@ -69,7 +69,7 @@
   }
   
   .line-row {
  -  background-color:#CCCCCC;
  +  background-color: #CCCCCC;
     font-family: Arial, Verdana, Helvetica, Sans-Serif;
   }
   
  
  
  
  1.3       +15 -8     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java
  
  Index: EditLoggerAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EditLoggerAction.java	21 Mar 2002 17:11:28 -0000	1.2
  +++ EditLoggerAction.java	21 May 2002 00:36:42 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java,v
1.2 2002/03/21 17:11:28 manveen Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/03/21 17:11:28 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java,v
1.3 2002/05/21 00:36:42 manveen Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/05/21 00:36:42 $
    *
    * ====================================================================
    *
  @@ -91,7 +91,7 @@
    * The <code>Action</code> that sets up <em>Edit Logger</em> transactions.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.2 $ $Date: 2002/03/21 17:11:28 $
  + * @version $Revision: 1.3 $ $Date: 2002/05/21 00:36:42 $
    */
   
   public class EditLoggerAction extends Action {
  @@ -166,10 +166,17 @@
           session.setAttribute("loggerForm", loggerFm);
           loggerFm.setAdminAction("Edit");
           loggerFm.setObjectName(lname.toString());
  -        loggerFm.setParentObjectName("");
  -        sb = new StringBuffer("Logger (");
  -        sb.append(lname.getKeyProperty("className"));
  -        sb.append(")");
  +        loggerFm.setParentObjectName("");        
  +        sb = new StringBuffer("");
  +        String host = lname.getKeyProperty("host");
  +        String context = lname.getKeyProperty("path");        
  +        if (host!=null) {
  +            sb.append("Host (" + host + ") > ");
  +        }
  +        if (context!=null) {
  +            sb.append("Context (" + context + ") > ");
  +        }
  +        sb.append("Logger");
           loggerFm.setNodeLabel(sb.toString());
           loggerFm.setDebugLvlVals(Lists.getDebugLevels());        
           loggerFm.setVerbosityLvlVals(Lists.getVerbosityLevels());        
  
  
  
  1.5       +14 -7     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
  
  Index: EditRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EditRealmAction.java	3 May 2002 07:19:23 -0000	1.4
  +++ EditRealmAction.java	21 May 2002 00:36:43 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.4 2002/05/03 07:19:23 manveen Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/05/03 07:19:23 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.5 2002/05/21 00:36:43 manveen Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/05/21 00:36:43 $
    *
    * ====================================================================
    *
  @@ -92,7 +92,7 @@
    * Realm </em> transactions, based on the type of Realm.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.4 $ $Date: 2002/05/03 07:19:23 $
  + * @version $Revision: 1.5 $ $Date: 2002/05/21 00:36:43 $
    */
   
   public class EditRealmAction extends Action {
  @@ -213,9 +213,16 @@
           realmFm.setAdminAction("Edit");
           realmFm.setObjectName(rname.toString());        
           String realmType = "UserDatabaseRealm";
  -        StringBuffer sb = new StringBuffer("Realm (");
  -        sb.append(realmType);
  -        sb.append(")");
  +        StringBuffer sb = new StringBuffer("");
  +        String host = rname.getKeyProperty("host");
  +        String context = rname.getKeyProperty("path");        
  +        if (host!=null) {
  +            sb.append("Host (" + host + ") > ");
  +        }
  +        if (context!=null) {
  +            sb.append("Context (" + context + ") > ");
  +        }
  +        sb.append("Realm");
           realmFm.setNodeLabel(sb.toString());
           realmFm.setRealmType(realmType);
           realmFm.setDebugLvlVals(Lists.getDebugLevels());
  
  
  
  1.4       +14 -7     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
  
  Index: EditValveAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EditValveAction.java	18 Apr 2002 21:39:45 -0000	1.3
  +++ EditValveAction.java	21 May 2002 00:36:43 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
1.3 2002/04/18 21:39:45 manveen Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/04/18 21:39:45 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
1.4 2002/05/21 00:36:43 manveen Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/05/21 00:36:43 $
    *
    * ====================================================================
    *
  @@ -92,7 +92,7 @@
    * Valve </em> transactions, based on the type of Valve.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.3 $ $Date: 2002/04/18 21:39:45 $
  + * @version $Revision: 1.4 $ $Date: 2002/05/21 00:36:43 $
    */
   
   public class EditValveAction extends Action {
  @@ -216,9 +216,16 @@
           valveFm.setObjectName(vname.toString()); 
           valveFm.setParentObjectName(parent);
           String valveType = "AccessLogValve";
  -        StringBuffer sb = new StringBuffer("Valve (");
  -        sb.append(valveType);
  -        sb.append(")");
  +        StringBuffer sb = new StringBuffer("");
  +        String host = vname.getKeyProperty("host");
  +        String context = vname.getKeyProperty("path");        
  +        if (host!=null) {
  +            sb.append("Host (" + host + ") > ");
  +        }
  +        if (context!=null) {
  +            sb.append("Context (" + context + ") > ");
  +        }
  +        sb.append("Valve");
           valveFm.setNodeLabel(sb.toString());
           valveFm.setValveType(valveType);
           valveFm.setDebugLvlVals(Lists.getDebugLevels());
  
  
  
  1.18      +1 -1      jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp
  
  Index: connector.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- connector.jsp	14 May 2002 18:26:32 -0000	1.17
  +++ connector.jsp	21 May 2002 00:36:43 -0000	1.18
  @@ -35,7 +35,7 @@
               <bean:message key="actions.connectors.create"/>
             </logic:equal>
             <logic:equal name="connectorForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.connectors.edit"/>
  +           <bean:write name="connectorForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  
  1.8       +1 -1      jakarta-tomcat-4.0/webapps/admin/context/context.jsp
  
  Index: context.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context/context.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- context.jsp	10 May 2002 22:41:40 -0000	1.7
  +++ context.jsp	21 May 2002 00:36:43 -0000	1.8
  @@ -33,7 +33,7 @@
               <bean:message key="actions.contexts.create"/>
             </logic:equal>
             <logic:equal name="contextForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.contexts.edit"/>
  +            <bean:write name="contextForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  
  1.16      +1 -1      jakarta-tomcat-4.0/webapps/admin/host/host.jsp
  
  Index: host.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/host/host.jsp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- host.jsp	10 May 2002 22:41:40 -0000	1.15
  +++ host.jsp	21 May 2002 00:36:43 -0000	1.16
  @@ -33,7 +33,7 @@
               <bean:message key="actions.hosts.create"/>
             </logic:equal>
             <logic:equal name="hostForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.hosts.edit"/>
  +            <bean:write name="hostForm" property="nodeLabel"/>
             </logic:equal>
           </div>
         </td>
  
  
  
  1.4       +1 -1      jakarta-tomcat-4.0/webapps/admin/logger/logger.jsp
  
  Index: logger.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/logger/logger.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- logger.jsp	24 Mar 2002 04:13:24 -0000	1.3
  +++ logger.jsp	21 May 2002 00:36:43 -0000	1.4
  @@ -34,7 +34,7 @@
               <bean:message key="actions.loggers.create"/>
             </logic:equal>
             <logic:equal name="loggerForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.loggers.edit"/>
  +            <bean:write name="loggerForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  
  1.6       +1 -1      jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp
  
  Index: jdbcRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jdbcRealm.jsp	10 May 2002 22:41:40 -0000	1.5
  +++ jdbcRealm.jsp	21 May 2002 00:36:43 -0000	1.6
  @@ -33,7 +33,7 @@
               <bean:message key="actions.realms.create"/>
             </logic:equal>
             <logic:equal name="jdbcRealmForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.realms.edit"/>
  +            <bean:write name="jdbcRealmForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  
  1.6       +1 -1      jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp
  
  Index: jndiRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jndiRealm.jsp	10 May 2002 22:41:40 -0000	1.5
  +++ jndiRealm.jsp	21 May 2002 00:36:43 -0000	1.6
  @@ -32,7 +32,7 @@
               <bean:message key="actions.realms.create"/>
             </logic:equal>
             <logic:equal name="jndiRealmForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.realms.edit"/>
  +            <bean:write name="jndiRealmForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  
  1.6       +1 -1      jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp
  
  Index: memoryRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- memoryRealm.jsp	10 May 2002 22:41:40 -0000	1.5
  +++ memoryRealm.jsp	21 May 2002 00:36:43 -0000	1.6
  @@ -33,7 +33,7 @@
               <bean:message key="actions.realms.create"/>
             </logic:equal>
             <logic:equal name="memoryRealmForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.realms.edit"/>
  +            <bean:write name="memoryRealmForm" property="nodeLabel"/>
             </logic:equal>
           </div>
         </td>
  
  
  
  1.7       +1 -1      jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp
  
  Index: userDatabaseRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- userDatabaseRealm.jsp	10 May 2002 22:41:40 -0000	1.6
  +++ userDatabaseRealm.jsp	21 May 2002 00:36:43 -0000	1.7
  @@ -33,7 +33,7 @@
               <bean:message key="actions.realms.create"/>
             </logic:equal>
             <logic:equal name="userDatabaseRealmForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.realms.edit"/>
  +            <bean:write name="userDatabaseRealmForm" property="nodeLabel"/>
             </logic:equal>
           </div>
         </td>
  
  
  
  1.18      +1 -1      jakarta-tomcat-4.0/webapps/admin/service/service.jsp
  
  Index: service.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/service/service.jsp,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- service.jsp	11 May 2002 00:39:48 -0000	1.17
  +++ service.jsp	21 May 2002 00:36:43 -0000	1.18
  @@ -39,7 +39,7 @@
               <bean:message key="actions.services.create"/>
             </logic:equal>
             <logic:equal name="serviceForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.services.edit"/>
  +            <bean:write name="serviceForm" property="nodeLabel"/>
             </logic:equal>
           </div>
         </td>
  
  
  
  1.7       +1 -1      jakarta-tomcat-4.0/webapps/admin/valve/accessLogValve.jsp
  
  Index: accessLogValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/accessLogValve.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- accessLogValve.jsp	10 May 2002 22:41:41 -0000	1.6
  +++ accessLogValve.jsp	21 May 2002 00:36:43 -0000	1.7
  @@ -35,7 +35,7 @@
               <bean:message key="actions.valves.create"/>
             </logic:equal>
             <logic:equal name="accessLogValveForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.valves.edit"/>
  +            <bean:write name="accessLogValveForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  
  1.6       +1 -1      jakarta-tomcat-4.0/webapps/admin/valve/remoteAddrValve.jsp
  
  Index: remoteAddrValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/remoteAddrValve.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- remoteAddrValve.jsp	10 May 2002 22:41:41 -0000	1.5
  +++ remoteAddrValve.jsp	21 May 2002 00:36:43 -0000	1.6
  @@ -35,7 +35,7 @@
               <bean:message key="actions.valves.create"/>
             </logic:equal>
             <logic:equal name="remoteAddrValveForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.valves.edit"/>
  +            <bean:write name="remoteAddrValveForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  
  1.6       +1 -1      jakarta-tomcat-4.0/webapps/admin/valve/remoteHostValve.jsp
  
  Index: remoteHostValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/remoteHostValve.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- remoteHostValve.jsp	10 May 2002 22:41:41 -0000	1.5
  +++ remoteHostValve.jsp	21 May 2002 00:36:43 -0000	1.6
  @@ -35,7 +35,7 @@
               <bean:message key="actions.valves.create"/>
             </logic:equal>
             <logic:equal name="remoteHostValveForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.valves.edit"/>
  +            <bean:write name="remoteHostValveForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  
  1.7       +1 -1      jakarta-tomcat-4.0/webapps/admin/valve/requestDumperValve.jsp
  
  Index: requestDumperValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/requestDumperValve.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- requestDumperValve.jsp	10 May 2002 22:41:41 -0000	1.6
  +++ requestDumperValve.jsp	21 May 2002 00:36:43 -0000	1.7
  @@ -35,7 +35,7 @@
               <bean:message key="actions.valves.create"/>
             </logic:equal>
             <logic:equal name="requestDumperValveForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.valves.edit"/>
  +            <bean:write name="requestDumperValveForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  
  1.6       +1 -1      jakarta-tomcat-4.0/webapps/admin/valve/singleSignOnValve.jsp
  
  Index: singleSignOnValve.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/valve/singleSignOnValve.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- singleSignOnValve.jsp	10 May 2002 22:41:41 -0000	1.5
  +++ singleSignOnValve.jsp	21 May 2002 00:36:43 -0000	1.6
  @@ -35,7 +35,7 @@
               <bean:message key="actions.valves.create"/>
             </logic:equal>
             <logic:equal name="singleSignOnValveForm" property="adminAction" value="Edit">
  -            <bean:message key="actions.valves.edit"/>
  +            <bean:write name="singleSignOnValveForm" property="nodeLabel"/>
             </logic:equal>
          </div>
         </td>
  
  
  

--
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