manveen 02/03/14 17:16:29
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ActionsTag.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
DeleteHostAction.java
webapps/admin/host host.jsp
webapps/admin/service service.jsp
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
DeleteHostsAction.java
Log:
"add and delete hosts" operations implemented and tested.
uncommented these operations from the jsp's.
Revision Changes Path
1.3 +6 -10
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java
Index: ActionsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionsTag.java 14 Mar 2002 08:49:40 -0000 1.2
+++ ActionsTag.java 15 Mar 2002 01:16:29 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java,v
1.2 2002/03/14 08:49:40 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/14 08:49:40 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java,v
1.3 2002/03/15 01:16:29 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/03/15 01:16:29 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* <strong>FIXME</strong> - Internationalize the exception messages!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2002/03/14 08:49:40 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/15 01:16:29 $
*/
public class ActionsTag extends BodyTagSupport {
@@ -217,14 +217,11 @@
boolean selected = ((Boolean) selecteds.get(i)).booleanValue();
boolean disabled = ((Boolean) disableds.get(i)).booleanValue();
String url = (String) urls.get(i);
- if (disabled) {
- out.println("<optgroup disabled> </optgroup>");
- } else {
out.print("<option");
if (selected)
out.print(" selected=\"selected\"");
- //if (disabled)
- // out.print(" disabled");
+ if (disabled)
+ out.print(" disabled=\"true\"");
out.print(" value=\"");
if (url != null)
out.print(url);
@@ -233,7 +230,6 @@
if (label != null)
out.print(label);
out.println("</option>");
- }
}
// Render the end of this element
1.3 +17 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
Index: DeleteHostAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteHostAction.java 14 Mar 2002 08:49:41 -0000 1.2
+++ DeleteHostAction.java 15 Mar 2002 01:16:29 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java,v
1.2 2002/03/14 08:49:41 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/14 08:49:41 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java,v
1.3 2002/03/15 01:16:29 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/03/15 01:16:29 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* The <code>Action</code> that sets up <em>Delete Hosts</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/03/14 08:49:41 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/15 01:16:29 $
*/
public class DeleteHostAction extends Action {
@@ -153,6 +153,7 @@
("Cannot acquire MBeanServer reference", t);
}
+ String serviceName = request.getParameter("serviceName");
// Set up a form bean containing the currently selected
// objects to be deleted
HostsForm hostsForm = new HostsForm();
@@ -161,16 +162,25 @@
String hosts[] = new String[1];
hosts[0] = select;
hostsForm.setHosts(hosts);
+
+ // get the service Name this selected host belongs to
+ try {
+ serviceName = (new ObjectName(select)).getKeyProperty("service");
+ } catch (Exception e) {
+ throw new ServletException
+ ("Error extracting service name from the host to be deleted", e);
+ }
}
request.setAttribute("hostsForm", hostsForm);
-
+
// Accumulate a list of all available hosts
ArrayList list = new ArrayList();
try {
- // FIX ME -- do we need serviceName here?
String pattern = TomcatTreeBuilder.HOST_TYPE +
TomcatTreeBuilder.WILDCARD;
- //+ ",service=" + serviceName;
+ // get all available hosts only for this service
+ if (serviceName!= null)
+ pattern = pattern.concat(",service=" + serviceName);
Iterator items =
mBServer.queryNames(new ObjectName(pattern), null).iterator();
while (items.hasNext()) {
1.1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.java
Index: DeleteHostsAction.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.java,v
1.1 2002/03/15 01:16:29 manveen Exp $
* $Revision: 1.1 $
* $Date: 2002/03/15 01:16:29 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.webapp.admin.host;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Locale;
import java.util.Set;
import java.util.TreeSet;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.ObjectInstance;
import javax.management.modelmbean.ModelMBean;
import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.TomcatTreeBuilder;
import org.apache.webapp.admin.TreeControl;
import org.apache.webapp.admin.TreeControlNode;
/**
* The <code>Action</code> that completes <em>Delete Hosts</em>
* transactions.
*
* @author Manveen Kaur
* @version $Revision: 1.1 $ $Date: 2002/03/15 01:16:29 $
*/
public class DeleteHostsAction extends Action {
/**
* Signature for the <code>removeHost</code> operation.
*/
private String removeHostTypes[] =
{ "java.lang.String", // Object name
};
/**
* The MBeanServer we will be interacting with.
*/
private MBeanServer mBServer = null;
/**
* The MessageResources we will be retrieving messages from.
*/
private MessageResources resources = null;
// --------------------------------------------------------- Public Methods
/**
* Process the specified HTTP request, and create the corresponding HTTP
* response (or forward to another web component that will create it).
* Return an <code>ActionForward</code> instance describing where and how
* control should be forwarded, or <code>null</code> if the response has
* already been completed.
*
* @param mapping The ActionMapping used to select this instance
* @param actionForm The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
* @param response The HTTP response we are creating
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
public ActionForward perform(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
// Look up the components we will be using as needed
HttpSession session = request.getSession();
Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
if (resources == null) {
resources = getServlet().getResources();
}
// Acquire a reference to the MBeanServer containing our MBeans
try {
mBServer = ((ApplicationServlet) getServlet()).getServer();
} catch (Throwable t) {
throw new ServletException
("Cannot acquire MBeanServer reference", t);
}
// Delete the specified Hosts
String hosts[] = ((HostsForm) form).getHosts();
String values[] = new String[1];
String operation = "removeHost";
try {
// Look up our MBeanFactory MBean
ObjectName fname =
new ObjectName(TomcatTreeBuilder.FACTORY_TYPE);
// Look up our tree control data structure
TreeControl control = (TreeControl)
session.getAttribute("treeControlTest");
// Remove the specified hosts
for (int i = 0; i < hosts.length; i++) {
values[0] = hosts[i];
mBServer.invoke(fname, operation,
values, removeHostTypes);
if (control != null) {
control.selectNode(null);
TreeControlNode node = control.findNode(hosts[i]);
if (node != null) {
node.remove();
} else {
getServlet().log("Missing TreeControlNode for " +
hosts[i]);
}
} else {
getServlet().log("Missing TreeControl attribute");
}
}
} catch (Exception e) {
e.printStackTrace();
getServlet().log
(resources.getMessage(locale, "users.error.invoke",
operation), e);
response.sendError
(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
resources.getMessage(locale, "users.error.invoke",
operation));
return (null);
}
// Report successful completion of this transaction
return (mapping.findForward("Save Successful"));
}
}
1.6 +3 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- host.jsp 14 Mar 2002 14:56:52 -0000 1.5
+++ host.jsp 15 Mar 2002 01:16:29 -0000 1.6
@@ -42,7 +42,7 @@
<div align="right">
<controls:actions>
<controls:action selected="true"> -----<bean:message
key="actions.available.actions"/>----- </controls:action>
- <controls:action> -------------------------------------
</controls:action>
+ <controls:action disabled="true"> -------------------------------------
</controls:action>
<logic:notEqual name="hostForm" property="adminAction" value="Create">
<%--
<controls:action url=""> <bean:message
key="actions.accesslogger.create"/> </controls:action>
@@ -63,11 +63,11 @@
<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='<%= "/DeleteHost.do?select=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.hosts.delete"/>
- </controls:action>
- --%>
+ </controls:action>
</logic:notEqual>
</controls:actions>
</div>
1.7 +7 -9 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- service.jsp 14 Mar 2002 14:56:52 -0000 1.6
+++ service.jsp 15 Mar 2002 01:16:29 -0000 1.7
@@ -44,7 +44,7 @@
<controls:action selected="true">
-----<bean:message key="actions.available.actions"/>-----
</controls:action>
- <controls:action>
+ <controls:action disabled="true">
-------------------------------------
</controls:action>
<logic:notEqual name="serviceForm" property="adminAction"
value="Create">
@@ -68,19 +68,17 @@
-------------------------------------
</controls:action>
--%>
- <%--
- <controls:action url='<%= "/setUpAddHost.do?serviceName=" +
+ <controls:action url='<%= "/AddHost.do?serviceName=" +
serviceName %>'>
- <bean:message key="actions.host.create"/>
- </controls:action>
- <controls:action url='<%= "/setUpDeleteHost.do?serviceName=" +
+ <bean:message key="actions.hosts.create"/>
+ </controls:action>
+ <controls:action url='<%= "/DeleteHost.do?serviceName=" +
serviceName %>'>
- <bean:message key="actions.host.delete"/>
+ <bean:message key="actions.hosts.deletes"/>
</controls:action>
- <controls:action>
+ <controls:action disabled="true">
-------------------------------------
</controls:action>
- --%>
<%--
<controls:action url="">
<bean:message key="actions.logger.create"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
