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

2003-03-11 Thread Amy Roh 
 
> I don't see anything you get in return for changing the names. Sure, 
> it's more consistent, but it doesn't help stability (hopefully, 4.1.x 
> has now entered the "mature" phase of its lifecycle), so I don't see any 
> incentive.
> 
> The changes can be easily reverted based on the TOMCAT_4_1_22 tag.

What's the easiest way to revert with a given tag?

Amy

> 
> Remy
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

2003-03-11 Thread Amy Roh 
> [EMAIL PROTECTED] wrote:
> > amyroh  2003/03/11 06:15:45
> >
> >   Modified:webapps/admin banner.jsp
> >webapps/admin/WEB-INF/classes/org/apache/webapp/admin
> > Lists.java TomcatTreeBuilder.java
> >
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
> > AddConnectorAction.java
> >
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
> > AddContextAction.java DeleteContextAction.java
> > EditContextAction.java SaveContextAction.java
> >
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
> > EditHostAction.java
> >
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
> > AddLoggerAction.java DeleteLoggerAction.java
> > EditLoggerAction.java LoggerForm.java
> > SaveLoggerAction.java
> >
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
> > AddRealmAction.java DeleteRealmAction.java
> > EditRealmAction.java RealmForm.java
> > SaveJDBCRealmAction.java
SaveJNDIRealmAction.java
> > SaveMemoryRealmAction.java
> > SaveUserDatabaseRealmAction.java
> >
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
> > ListDataSourcesAction.java
> >
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
> > EditServiceAction.java
> >
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
> > AddValveAction.java DeleteValveAction.java
> > DeleteValvesAction.java EditValveAction.java
> > SaveAccessLogValveAction.java
> > SaveRemoteAddrValveAction.java
> > SaveRemoteHostValveAction.java
> > SaveRequestDumperValveAction.java
> > SaveSingleSignOnValveAction.java ValveForm.java
> > ValveUtil.java
> >webapps/admin/context context.jsp
> >webapps/admin/logger logger.jsp
> >webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp
> > memoryRealm.jsp userDatabaseRealm.jsp
> >webapps/admin/valve accessLogValve.jsp
remoteAddrValve.jsp
> > remoteHostValve.jsp requestDumperValve.jsp
> > singleSignOnValve.jsp
> >   Log:
> >   Update create/remove/edit for context, logger, realm, and valve to
> >   support the new jsr77 name for context.  Need to test all the
component ops
> >   more tomorrow...
>
> Amy, could you talk to someone before making that sort of changes ?
>
> The idea is that the stable branch is stable, and that big changes will
> bring no interesting feature except instability.
> Why didn't you start doing them in the 5.0 branch and then eventually
> port them ?


OK.  I can change 5 first and port them to 4 after I'm done with 5.  I
figured it won't make a big difference if I'm going to do both of them
anyway.  Do you want me to revert the changes and work on 5 fist?  The
changes are mostly done.  Better yet, do we want to use the new name for
tomcat 4 at all?  Maybe I should just make the changes to 5 only?

Thanks,
Amy

>
> Remy
>
>
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

2003-03-11 Thread amyroh 
amyroh  2003/03/11 06:15:45

  Modified:webapps/admin banner.jsp
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java TomcatTreeBuilder.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
AddContextAction.java DeleteContextAction.java
EditContextAction.java SaveContextAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
EditHostAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
AddLoggerAction.java DeleteLoggerAction.java
EditLoggerAction.java LoggerForm.java
SaveLoggerAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
AddRealmAction.java DeleteRealmAction.java
EditRealmAction.java RealmForm.java
SaveJDBCRealmAction.java SaveJNDIRealmAction.java
SaveMemoryRealmAction.java
SaveUserDatabaseRealmAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ListDataSourcesAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
EditServiceAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
AddValveAction.java DeleteValveAction.java
DeleteValvesAction.java EditValveAction.java
SaveAccessLogValveAction.java
SaveRemoteAddrValveAction.java
SaveRemoteHostValveAction.java
SaveRequestDumperValveAction.java
SaveSingleSignOnValveAction.java ValveForm.java
ValveUtil.java
   webapps/admin/context context.jsp
   webapps/admin/logger logger.jsp
   webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp
memoryRealm.jsp userDatabaseRealm.jsp
   webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp
remoteHostValve.jsp requestDumperValve.jsp
singleSignOnValve.jsp
  Log:
  Update create/remove/edit for context, logger, realm, and valve to
  support the new jsr77 name for context.  Need to test all the component ops
  more tomorrow...
  
  Revision  ChangesPath
  1.10  +2 -2  jakarta-tomcat-4.0/webapps/admin/banner.jsp
  
  Index: banner.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/banner.jsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- banner.jsp15 Jan 2003 22:25:17 -  1.9
  +++ banner.jsp11 Mar 2003 14:15:38 -  1.10
  @@ -20,7 +20,7 @@
 
   
 
  -  
  +  
 
   
 
  @@ -30,7 +30,7 @@
 
     
 
  -
  +
 
   
 
  
  
  
  1.16  +99 -4 
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
  
  Index: Lists.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Lists.java11 Mar 2003 03:26:19 -  1.15
  +++ Lists.java11 Mar 2003 14:15:38 -  1.16
  @@ -78,6 +78,7 @@
* is returned.
*
* @author Craig R. McClanahan
  + * @author Amy Roh
* @version $Revision$ $Date$
*/
   
  @@ -607,6 +608,100 @@
   
   }
   
  +
  +/**
  + * Return a list of Valve object name strings
  + * for the specified container (service, host, or context) object name.
  + *
  + * @param mbserver MBeanServer from which to retrieve the list
  + * @param container Object name of the container for which to select
  + *  Valves
  + * @param host Object name of the host for which to select
  + *  Valves 
  + *
  + * @exception Exception if thrown while retrieving the list
  + */
  +public static List getValves(MBeanServer mbserver, String parent,
  +String hostName) throws Exception {
  +
  +ObjectName container = null;
  +if (parent != null) {
  +container = new ObjectName(parent);
  +}
  +ObjectName hname = null;
  +if (hostName != null) {
  +hname = new ObjectName(hostName)

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

2002-05-20 Thread manveen 

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  ChangesPath
  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 -  1.3
  +++ admin.css 21 May 2002 00:36:42 -  1.4
  @@ -69,7 +69,7 @@
   }
   
   .line-row {
  -  background-color:#CC;
  +  background-color: #CC;
 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 -  1.2
  +++ EditLoggerAction.java 21 May 2002 00:36:42 -  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 Action that sets up Edit Logger 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 -   1.4
  +++ EditRealmAction.java  21 May 2002 00:36:43 -  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/

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

2002-05-10 Thread manveen 

manveen 02/05/10 15:41:42

  Modified:webapps/admin blank.jsp error.jsp saved.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/realm jdbcRealm.jsp jndiRealm.jsp
memoryRealm.jsp realms.jsp userDatabaseRealm.jsp
   webapps/admin/resources dataSource.jsp deleteDataSources.jsp
deleteEnvEntries.jsp deleteUserDatabases.jsp
envEntry.jsp listDataSources.jsp listEnvEntries.jsp
listUserDatabases.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
  Log:
  - fix for addHost and addConnector when the service name contains blanks and other 
special characters.
  
  - minor cosmetic change, added a background imange to all content pages.
  
  Revision  ChangesPath
  1.2   +1 -1  jakarta-tomcat-4.0/webapps/admin/blank.jsp
  
  Index: blank.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/blank.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- blank.jsp 6 Dec 2001 23:49:19 -   1.1
  +++ blank.jsp 10 May 2002 22:41:40 -  1.2
  @@ -13,7 +13,7 @@
   
   
   
  -
  +
   
   
   
  
  
  
  1.6   +1 -1  jakarta-tomcat-4.0/webapps/admin/error.jsp
  
  Index: error.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/error.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- error.jsp 20 Nov 2001 13:57:44 -  1.5
  +++ error.jsp 10 May 2002 22:41:40 -  1.6
  @@ -13,7 +13,7 @@
   
   
   
  -
  +
   
   
   
  
  
  
  1.4   +1 -1  jakarta-tomcat-4.0/webapps/admin/saved.jsp
  
  Index: saved.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/saved.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- saved.jsp 24 Apr 2002 06:02:40 -  1.3
  +++ saved.jsp 10 May 2002 22:41:40 -  1.4
  @@ -7,7 +7,7 @@
   
   
   
  -  
  +  
   
   <%-- Cause our tree control to refresh itself --%>

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

2002-04-16 Thread manveen 

manveen 02/04/16 10:04:19

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
TomcatTreeBuilder.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
DeleteValveAction.java EditValveAction.java
   webapps/admin/context context.jsp
   webapps/admin/service service.jsp
   webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp
remoteHostValve.jsp requestDumperValve.jsp
singleSignOnValve.jsp
  Log:
  "Delete valve" operation enabled/made available from contextand each of the valve 
screens.
  
  Revision  ChangesPath
  1.42  +1 -1  
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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ApplicationResources_en.properties10 Apr 2002 00:37:07 -  1.41
  +++ ApplicationResources_en.properties16 Apr 2002 17:04:19 -  1.42
  @@ -101,7 +101,7 @@
   actions.valves.create=Create New Valve
   actions.valves.edit=Edit Valve
   actions.valves.delete=Delete This Valve
  -actions.valves.deletes=Delete Valves
  +actions.valves.deletes=Delete Existing Valves
   actions.alias.create=Create New Aliases
   actions.alias.delete=Delete Aliases
   connector.type=Type
  
  
  
  1.27  +7 -5  
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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- TomcatTreeBuilder.java11 Apr 2002 07:44:22 -  1.26
  +++ TomcatTreeBuilder.java16 Apr 2002 17:04:19 -  1.27
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
 1.26 2002/04/11 07:44:22 manveen Exp $
  - * $Revision: 1.26 $
  - * $Date: 2002/04/11 07:44:22 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
 1.27 2002/04/16 17:04:19 manveen Exp $
  + * $Revision: 1.27 $
  + * $Date: 2002/04/16 17:04:19 $
*
* 
*
  @@ -93,7 +93,7 @@
*
* @author Jazmin Jonson
* @author Manveen Kaur
  - * @version $Revision: 1.26 $ $Date: 2002/04/11 07:44:22 $
  + * @version $Revision: 1.27 $ $Date: 2002/04/16 17:04:19 $
*/
   
   
  @@ -411,7 +411,9 @@
   "EditValve.do?select=" +
   URLEncoder.encode(valveName) +
   "&nodeLabel=" +
  -URLEncoder.encode(nodeLabel),
  +URLEncoder.encode(nodeLabel) +
  +"&parent=" +
  +URLEncoder.encode(containerName),
   "content",
   false);
   containerNode.addChild(valveNode);
  
  
  
  1.3   +5 -5  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java
  
  Index: DeleteValveAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DeleteValveAction.java12 Apr 2002 22:06:30 -  1.2
  +++ DeleteValveAction.java16 Apr 2002 17:04:19 -  1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java,v
 1.2 2002/04/12 22:06:30 manveen Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/12 22:06:30 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java,v
 1.3 2002/04/16 17:04:19 manveen Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/16 17:04:19 $
*
* 
*
  @@ -97,7 +97,7 @@
* The Action that sets up Delete Valves transactions.
*
* @author Manveen Kaur
  - * @version $Revision: 1.2 $ $Date: 2002/