Author: markt Date: Fri Nov 24 15:01:49 2006 New Revision: 479039 URL: http://svn.apache.org/viewvc?view=rev&rev=479039 Log: Code clean-up thanks to Eclipse for o.a.webapp.admin.service - 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/service/AddServiceAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java?view=diff&rev=479039&r1=479038&r2=479039 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java Fri Nov 24 15:01:49 2006 @@ -25,13 +25,11 @@ 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; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.LabelValueBean; -import org.apache.webapp.admin.Lists; /** * The <code>Action</code> that sets up <em>Add Service</em> transactions. Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java?view=diff&rev=479039&r1=479038&r2=479039 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java Fri Nov 24 15:01:49 2006 @@ -21,28 +21,18 @@ import java.io.IOException; import java.util.Collections; import java.util.Iterator; -import java.util.List; import java.util.Locale; -import java.util.TreeSet; -import java.util.Set; import java.util.ArrayList; 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; 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 org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; @@ -90,7 +80,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/service/DeleteServicesAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.java?view=diff&rev=479039&r1=479038&r2=479039 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.java Fri Nov 24 15:01:49 2006 @@ -19,15 +19,9 @@ package org.apache.webapp.admin.service; 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; @@ -120,8 +114,6 @@ // Remove the specified services for (int i = 0; i < services.length; i++) { values[0] = services[i]; - ObjectName oname = new ObjectName(services[i]); - String domain = oname.getDomain(); ObjectName fname = TomcatTreeBuilder.getMBeanFactory(); mBServer.invoke(fname, operation, Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java?view=diff&rev=479039&r1=479038&r2=479039 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java Fri Nov 24 15:01:49 2006 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Iterator; -import java.util.List; import java.util.Locale; import java.util.ArrayList; import javax.servlet.ServletException; @@ -27,21 +26,17 @@ 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; import org.apache.struts.util.MessageResources; import javax.management.MBeanServer; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; import org.apache.webapp.admin.ApplicationServlet; import org.apache.webapp.admin.LabelValueBean; import org.apache.webapp.admin.Lists; -import org.apache.webapp.admin.TomcatTreeBuilder; /** * The <code>Action</code> that sets up <em>Edit Service</em> transactions. Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java?view=diff&rev=479039&r1=479038&r2=479039 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java Fri Nov 24 15:01:49 2006 @@ -25,25 +25,19 @@ import java.io.IOException; import javax.management.Attribute; 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.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.ActionError; -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.action.ActionMessage; +import org.apache.struts.action.ActionMessages; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; -import org.apache.webapp.admin.Lists; import org.apache.webapp.admin.TomcatTreeBuilder; import org.apache.webapp.admin.TreeControl; import org.apache.webapp.admin.TreeControlNode; @@ -67,26 +61,6 @@ /** - * Signature for the <code>createStandardEngine</code> operation. - */ - private String createStandardEngineTypes[] = - { "java.lang.String", // parent - "java.lang.String", // name - "java.lang.String", // defaultHost - }; - - - /** - * Signature for the <code>createStandardService</code> operation. - */ - private String createStandardServiceTypes[] = - { "java.lang.String", // parent - "java.lang.String", // name - "java.lang.String" // domain - }; - - - /** * Signature for the <code>createStandardEngineService</code> operation. */ private String createStandardEngineServiceTypes[] = @@ -98,15 +72,6 @@ /** - * Signature for the <code>createUserDatabaseRealm</code> operation. - */ - private String createUserDatabaseRealmTypes[] = - { "java.lang.String", // parent - "java.lang.String", // name - }; - - - /** * The MBeanServer we will be interacting with. */ private MBeanServer mBServer = null; @@ -154,7 +119,6 @@ String adminAction = sform.getAdminAction(); String sObjectName = sform.getObjectName(); String eObjectName = sform.getEngineObjectName(); - String serverObjectName = sform.getServerObjectName(); ObjectName eoname = null; ObjectName soname = null; // Perform a "Create Service" transaction (if requested) @@ -174,9 +138,9 @@ Iterator names = mBServer.queryNames(oname, null).iterator(); while (names.hasNext()) { if (mBServer.isRegistered((ObjectName)names.next())) { - ActionErrors errors = new ActionErrors(); + ActionMessages errors = new ActionMessages(); errors.add("serviceName", - new ActionError("error.serviceName.exists")); + new ActionMessage("error.serviceName.exists")); saveErrors(request, errors); return (new ActionForward(mapping.getInput())); } @@ -184,9 +148,9 @@ oname = new ObjectName(engineName + TomcatTreeBuilder.ENGINE_TYPE); if (mBServer.isRegistered(oname)) { - ActionErrors errors = new ActionErrors(); + ActionMessages errors = new ActionMessages(); errors.add("serviceName", - new ActionError("error.engineName.exists")); + new ActionMessage("error.engineName.exists")); saveErrors(request, errors); return (new ActionForward(mapping.getInput())); } Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java?view=diff&rev=479039&r1=479038&r2=479039 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java Fri Nov 24 15:01:49 2006 @@ -19,10 +19,11 @@ package org.apache.webapp.admin.service; import javax.servlet.http.HttpServletRequest; -import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; + import java.util.List; /** @@ -342,22 +343,17 @@ HttpServletRequest request) { ActionErrors errors = new ActionErrors(); - String submit = request.getParameter("submit"); - - //if (submit != null) { - if ((serviceName == null) || (serviceName.length() < 1)) { - errors.add("serviceName", - new ActionError("error.serviceName.required")); - } - - if ((engineName == null) || (engineName.length() < 1)) { - errors.add("engineName", - new ActionError("error.engineName.required")); - } + if ((serviceName == null) || (serviceName.length() < 1)) { + errors.add("serviceName", + new ActionMessage("error.serviceName.required")); + } + + if ((engineName == null) || (engineName.length() < 1)) { + errors.add("engineName", + new ActionMessage("error.engineName.required")); + } - //} - return errors; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]