Author: markt Date: Fri Nov 24 15:03:05 2006 New Revision: 479043 URL: http://svn.apache.org/viewvc?view=rev&rev=479043 Log: Code clean-up thanks to Eclipse for o.a.webapp.admin - remove unused code - removed unused imports - don't use deprecated methods No functional change
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpServerAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LogOutAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestAction.java Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java Fri Nov 24 15:03:05 2006 @@ -19,14 +19,9 @@ package org.apache.webapp.admin; -import java.io.IOException; -import java.net.URLEncoder; -import java.util.ArrayList; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.Tag; @@ -121,7 +116,7 @@ this.label = null; // Do no further processing for now - return (EVAL_BODY_TAG); + return (EVAL_BODY_BUFFERED); } Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java Fri Nov 24 15:03:05 2006 @@ -20,11 +20,9 @@ import java.io.IOException; -import java.net.URLEncoder; import java.util.ArrayList; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; @@ -141,7 +139,7 @@ this.selecteds.clear(); this.urls.clear(); - return (EVAL_BODY_TAG); + return (EVAL_BODY_BUFFERED); } Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java Fri Nov 24 15:03:05 2006 @@ -18,16 +18,11 @@ package org.apache.webapp.admin; -import java.text.DateFormat; -import java.util.HashSet; -import java.util.Locale; -import java.util.ResourceBundle; import javax.management.MBeanServer; import javax.servlet.ServletException; import javax.servlet.UnavailableException; import org.apache.commons.modeler.Registry; import org.apache.struts.action.ActionServlet; -import org.apache.struts.util.MessageResources; /** @@ -133,9 +128,8 @@ */ protected void initRegistry() throws ServletException { - registry = Registry.getRegistry(); - //(Registry) getServletContext().getAttribute - // ("org.apache.catalina.Registry"); + registry = Registry.getRegistry(null, null); + if (registry == null) throw new UnavailableException("Registry is not available"); @@ -152,7 +146,7 @@ */ protected void initServer() throws ServletException { - server = Registry.getRegistry().getMBeanServer(); + server = Registry.getRegistry(null, null).getMBeanServer(); //(MBeanServer) getServletContext().getAttribute // ("org.apache.catalina.MBeanServer"); if (server == null) Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java Fri Nov 24 15:03:05 2006 @@ -19,15 +19,11 @@ import java.io.IOException; -import java.util.Iterator; -import java.util.List; import java.util.Locale; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -35,9 +31,7 @@ import org.apache.struts.util.MessageResources; import javax.management.MBeanServer; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; /** * Implementation of <strong>Action</strong> that saves the current settings @@ -88,7 +82,6 @@ } // Acquire the resources that we need - HttpSession session = request.getSession(); Locale locale = getLocale(request); MessageResources resources = getResources(request); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java Fri Nov 24 15:03:05 2006 @@ -19,13 +19,7 @@ package org.apache.webapp.admin; -import java.io.IOException; -import java.net.URLEncoder; -import java.util.ArrayList; -import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.Tag; @@ -69,7 +63,7 @@ this.data = null; // Do no further processing for now - return (EVAL_BODY_TAG); + return (EVAL_BODY_BUFFERED); } @@ -107,8 +101,6 @@ // Register the information for the action represented by // this action - HttpServletResponse response = - (HttpServletResponse) pageContext.getResponse(); row.setData(data); return (EVAL_PAGE); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java Fri Nov 24 15:03:05 2006 @@ -20,16 +20,13 @@ import java.io.IOException; -import java.io.PrintWriter; import java.util.Arrays; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.commons.modeler.ManagedBean; import org.apache.commons.modeler.Registry; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpServerAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpServerAction.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpServerAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpServerAction.java Fri Nov 24 15:03:05 2006 @@ -20,18 +20,14 @@ import java.io.IOException; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import javax.management.MBeanServer; -import javax.management.ObjectName; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelTag.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelTag.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelTag.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelTag.java Fri Nov 24 15:03:05 2006 @@ -19,13 +19,7 @@ package org.apache.webapp.admin; -import java.io.IOException; -import java.net.URLEncoder; -import java.util.ArrayList; -import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.Tag; @@ -69,7 +63,7 @@ this.label = null; // Do no further processing for now - return (EVAL_BODY_TAG); + return (EVAL_BODY_BUFFERED); } @@ -107,8 +101,6 @@ // Register the information for the action represented by // this action - HttpServletResponse response = - (HttpServletResponse) pageContext.getResponse(); row.setLabel(label); return (EVAL_PAGE); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LogOutAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LogOutAction.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LogOutAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LogOutAction.java Fri Nov 24 15:03:05 2006 @@ -20,15 +20,11 @@ import java.io.IOException; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java Fri Nov 24 15:03:05 2006 @@ -19,13 +19,7 @@ package org.apache.webapp.admin; -import java.io.IOException; -import java.net.URLEncoder; -import java.util.ArrayList; -import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.Tag; @@ -135,7 +129,7 @@ public int doStartTag() throws JspException { // Do no further processing for now - return (EVAL_BODY_TAG); + return (EVAL_BODY_BUFFERED); } @@ -171,8 +165,6 @@ // Register the information for the row represented by // this row - HttpServletResponse response = - (HttpServletResponse) pageContext.getResponse(); table.addRow(header, label, data, labelStyle, dataStyle, styleId); return (EVAL_PAGE); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleAction.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleAction.java Fri Nov 24 15:03:05 2006 @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.Iterator; -import java.util.List; import java.util.Locale; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -29,7 +28,6 @@ import javax.servlet.http.HttpSession; import org.apache.struts.Globals; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java Fri Nov 24 15:03:05 2006 @@ -20,9 +20,6 @@ import java.io.IOException; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; import java.util.StringTokenizer; import java.util.ArrayList; import javax.servlet.ServletException; @@ -30,7 +27,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java Fri Nov 24 15:03:05 2006 @@ -20,11 +20,9 @@ import java.io.IOException; -import java.net.URLEncoder; import java.util.ArrayList; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; @@ -156,7 +154,7 @@ this.dataStyles.clear(); this.styleIds.clear(); - return (EVAL_BODY_TAG); + return (EVAL_BODY_BUFFERED); } Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java Fri Nov 24 15:03:05 2006 @@ -17,37 +17,17 @@ package org.apache.webapp.admin; -import java.io.IOException; import java.util.Iterator; -import java.util.List; -import java.util.ArrayList; -import java.util.Collections; import java.util.Locale; import java.net.URLEncoder; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.modeler.ManagedBean; -import org.apache.commons.modeler.Registry; import org.apache.struts.Globals; -import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; -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 javax.management.AttributeNotFoundException; import javax.management.MalformedObjectNameException; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanInfo; /** * <p> Implementation of TreeBuilder interface for Tomcat Tree Controller @@ -129,7 +109,6 @@ Lists.getServers(mBServer,domain).iterator(); while (serverNames.hasNext()) { String serverName = (String) serverNames.next(); - ObjectName objectName = new ObjectName(serverName); String nodeLabel = SERVER_LABEL; TreeControlNode serverNode = new TreeControlNode(serverName, @@ -464,7 +443,6 @@ Lists.getValves(mBServer, containerName).iterator(); while (valveNames.hasNext()) { String valveName = (String) valveNames.next(); - ObjectName objectName = new ObjectName(valveName); String nodeLabel = "Valve for " + containerNode.getLabel(); TreeControlNode valveNode = new TreeControlNode(valveName, Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestAction.java?view=diff&rev=479043&r1=479042&r2=479043 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestAction.java Fri Nov 24 15:03:05 2006 @@ -20,16 +20,11 @@ import java.io.IOException; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.net.URLDecoder; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]