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 2003/02/10 05:27:11 UTC

cvs commit: jakarta-tomcat-catalina/webapps/admin/logger loggers.jsp

amyroh      2003/02/09 20:27:10

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
                        SaveJNDIRealmAction.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
                        SaveAccessLogValveAction.java
                        SaveRemoteAddrValveAction.java
                        SaveRemoteHostValveAction.java
                        SaveRequestDumperValveAction.java
                        SaveSingleSignOnValveAction.java ValveUtil.java
               webapps/admin/logger loggers.jsp
  Log:
  Port change.
  
  Revision  Changes    Path
  1.4       +6 -6      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
  
  Index: SaveJNDIRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SaveJNDIRealmAction.java	16 Aug 2002 23:24:45 -0000	1.3
  +++ SaveJNDIRealmAction.java	10 Feb 2003 04:27:10 -0000	1.4
  @@ -332,11 +332,11 @@
                           new Attribute("roleName",  roleName));
               }
   
  -            attribute = "rolePattern";
  +            attribute = "roleSearch";
               String rolePattern = rform.getRolePattern();
               if ((rolePattern != null) && (rolePattern.length()>0)) {
                   mBServer.setAttribute(roname,
  -                        new Attribute("rolePattern",  rolePattern));
  +                        new Attribute("roleSearch",  rolePattern));
               }
   
               attribute = "roleSubtree";
  
  
  
  1.3       +7 -7      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
  
  Index: SaveAccessLogValveAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SaveAccessLogValveAction.java	22 Nov 2002 22:24:56 -0000	1.2
  +++ SaveAccessLogValveAction.java	10 Feb 2003 04:27:10 -0000	1.3
  @@ -155,9 +155,9 @@
           // Perform a "Create Valve" transaction (if requested)
           if ("Create".equals(adminAction)) {
           
  -           return ValveUtil.
  -                  createValve(parent, valveType, response, request, mapping,
  -                  (ApplicationServlet) getServlet());
  +            vObjectName = ValveUtil.createValve(parent, valveType, 
  +                                response, request, mapping, 
  +                                (ApplicationServlet) getServlet());
              
           }
   
  
  
  
  1.2       +8 -7      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java
  
  Index: SaveRemoteAddrValveAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SaveRemoteAddrValveAction.java	18 Jul 2002 16:48:28 -0000	1.1
  +++ SaveRemoteAddrValveAction.java	10 Feb 2003 04:27:10 -0000	1.2
  @@ -154,9 +154,10 @@
                  
           // Perform a "Create Valve" transaction (if requested)
           if ("Create".equals(adminAction)) {
  -           return ValveUtil.
  -                  createValve(parent, valveType, response, request, mapping,
  -                  (ApplicationServlet) getServlet());
  +
  +            vObjectName = ValveUtil.createValve(parent, valveType, 
  +                                response, request, mapping, 
  +                                (ApplicationServlet) getServlet());
              
           }
   
  
  
  
  1.2       +7 -7      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java
  
  Index: SaveRemoteHostValveAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SaveRemoteHostValveAction.java	18 Jul 2002 16:48:28 -0000	1.1
  +++ SaveRemoteHostValveAction.java	10 Feb 2003 04:27:10 -0000	1.2
  @@ -155,9 +155,9 @@
           // Perform a "Create Valve" transaction (if requested)
           if ("Create".equals(adminAction)) {
   
  -           return ValveUtil.
  -                  createValve(parent, valveType, response, request, mapping,
  -                  (ApplicationServlet) getServlet());
  +            vObjectName = ValveUtil.createValve(parent, valveType, 
  +                                response, request, mapping, 
  +                                (ApplicationServlet) getServlet());
              
           }
   
  
  
  
  1.2       +7 -7      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
  
  Index: SaveRequestDumperValveAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SaveRequestDumperValveAction.java	18 Jul 2002 16:48:28 -0000	1.1
  +++ SaveRequestDumperValveAction.java	10 Feb 2003 04:27:10 -0000	1.2
  @@ -155,9 +155,9 @@
           // Perform a "Create Valve" transaction (if requested)
           if ("Create".equals(adminAction)) {
           
  -           return ValveUtil.
  -                  createValve(parent, valveType, response, request, mapping,
  -                  (ApplicationServlet) getServlet());
  +            vObjectName = ValveUtil.createValve(parent, valveType, 
  +                                response, request, mapping, 
  +                                (ApplicationServlet) getServlet());
              
           }
   
  
  
  
  1.2       +8 -8      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
  
  Index: SaveSingleSignOnValveAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SaveSingleSignOnValveAction.java	18 Jul 2002 16:48:28 -0000	1.1
  +++ SaveSingleSignOnValveAction.java	10 Feb 2003 04:27:10 -0000	1.2
  @@ -155,10 +155,10 @@
                  
           // Perform a "Create Valve" transaction (if requested)
           if ("Create".equals(adminAction)) {
  -
  -           return ValveUtil.
  -                  createValve(parent, valveType, response, request, mapping,
  -                  (ApplicationServlet) getServlet());
  +  
  +        	vObjectName = ValveUtil.createValve(parent, valveType, 
  +                                response, request, mapping, 
  +                                (ApplicationServlet) getServlet());
                         
           }
   
  
  
  
  1.2       +9 -8      jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
  
  Index: ValveUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ValveUtil.java	18 Jul 2002 16:48:28 -0000	1.1
  +++ ValveUtil.java	10 Feb 2003 04:27:10 -0000	1.2
  @@ -112,7 +112,7 @@
       
       // --------------------------------------------------------- Public Methods
       
  -    public static ActionForward createValve(String parent, String valveType,
  +    public static String createValve(String parent, String valveType,
       HttpServletResponse response, HttpServletRequest request,
       ActionMapping mapping, ApplicationServlet servlet)
       throws IOException, ServletException {
  @@ -132,7 +132,8 @@
           
           String operation = null;
           String values[] = null;
  -        
  +        String vObjectName = null;
  +
           try {
               
               String objectName = DeleteLoggerAction.getObjectName(parent,
  @@ -187,7 +188,7 @@
               operation = "create" + valveType;
               if ("AccessLogValve".equalsIgnoreCase(valveType))
                   operation = "createAccessLoggerValve";
  -            String vObjectName = (String)
  +            vObjectName = (String)
                           mBServer.invoke(fname, operation, values, createStandardValveTypes);
               
               // Add the new Valve to our tree control node
  @@ -235,6 +236,6 @@
           
           // Forward to the success reporting page
           session.removeAttribute(mapping.getAttribute());
  -        return (mapping.findForward("Save Successful"));
  +        return vObjectName;
       }
   }
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- loggers.jsp	23 Jan 2003 00:07:08 -0000	1.3
  +++ loggers.jsp	10 Feb 2003 04:27:10 -0000	1.4
  @@ -10,7 +10,7 @@
   <%@ include file="../users/header.jsp" %>
   
   <!-- Body -->
  -<body bgcolor="white">
  +<body bgcolor="white" background="../images/PaperTexture.gif">
   
   <!--Form -->
   
  
  
  

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