manveen     02/01/30 22:58:03

  Modified:    webapps/admin service.jsp
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
                        SetUpDeleteServiceAction.java
  Log:
  Implemented an option to delete the service that is being edited itself.
  ("delete this service" action or delete self action on service).
  
  Revision  Changes    Path
  1.5       +4 -2      jakarta-tomcat-4.0/webapps/admin/service.jsp
  
  Index: service.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/service.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- service.jsp       10 Jan 2002 03:41:13 -0000      1.4
  +++ service.jsp       31 Jan 2002 06:58:03 -0000      1.5
  @@ -23,6 +23,7 @@
         <td width="81%"> 
           <div class="page-title-text" align="left">
           <bean:write name="serviceForm" property="nodeLabel" scope="session"/>
  +        <bean:define id="serviceName" name="serviceForm" property="serviceName"/>
           </div>
         </td>
         <td width="19%"> 
  @@ -52,7 +53,9 @@
               <controls:action url="">  <bean:message key="actions.valve.create"/> 
</controls:action>
               <controls:action url="">  <bean:message key="actions.valve.delete"/> 
</controls:action>
               <controls:action> ------------------------------------- 
</controls:action>
  -            <controls:action url="">  <bean:message key="actions.service.delete"/> 
</controls:action>
  +            <controls:action url='<%= "setUpDeleteService.do?this=" + serviceName 
%>'>  
  +                    <bean:message key="actions.service.delete"/> 
  +            </controls:action>
           </controls:actions>
             </div>
         </td>
  @@ -82,7 +85,6 @@
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="service.name"/>:</controls:label>
               <controls:data>
  -              <html:hidden property="serviceName"/>
                 <bean:write name="serviceForm" property="serviceName" 
                             scope="session"/> 
               </controls:data>
  
  
  
  1.2       +17 -7     
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SetUpDeleteServiceAction.java
  
  Index: SetUpDeleteServiceAction.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SetUpDeleteServiceAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SetUpDeleteServiceAction.java     31 Jan 2002 05:25:25 -0000      1.1
  +++ SetUpDeleteServiceAction.java     31 Jan 2002 06:58:03 -0000      1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SetUpDeleteServiceAction.java,v
 1.1 2002/01/31 05:25:25 manveen Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/01/31 05:25:25 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SetUpDeleteServiceAction.java,v
 1.2 2002/01/31 06:58:03 manveen Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/01/31 06:58:03 $
    *
    * ====================================================================
    *
  @@ -95,7 +95,7 @@
    * Test <code>Action</code> that handles events to delete services.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.1 $ $Date: 2002/01/31 05:25:25 $
  + * @version $Revision: 1.2 $ $Date: 2002/01/31 06:58:03 $
    */
   
   public class SetUpDeleteServiceAction extends Action {
  @@ -135,9 +135,19 @@
               ("Cannot acquire MBeanServer reference", t);
           }
           
  -        // Acquire the set of service MBean names to be listed
  -        String pattern = TomcatTreeBuilder.SERVICE_TYPE +
  -        TomcatTreeBuilder.WILDCARD;
  +        String pattern = null;
  +        
  +        String deleteThis = request.getParameter("this");
  +        if (deleteThis != null) {
  +            // this particular service is to be deleted.
  +            pattern = TomcatTreeBuilder.SERVICE_TYPE + 
  +                      ",name=" + deleteThis;
  +        } else {            
  +            // Acquire the entire set of service MBean names to be listed
  +            pattern = TomcatTreeBuilder.SERVICE_TYPE +
  +                      TomcatTreeBuilder.WILDCARD;
  +        }
  +        
           Set results = null;
           try {
               results = mBServer.queryNames(new ObjectName(pattern), null);
  
  
  

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

Reply via email to