You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2006/11/25 00:02:42 UTC
svn commit: r479042 - in
/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server:
EditServerAction.java SaveServerAction.java ServerForm.java
Author: markt
Date: Fri Nov 24 15:02:41 2006
New Revision: 479042
URL: http://svn.apache.org/viewvc?view=rev&rev=479042
Log:
Code clean-up thanks to Eclipse for o.a.webapp.admin.server
- 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/server/EditServerAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java?view=diff&rev=479042&r1=479041&r2=479042
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java Fri Nov 24 15:02:41 2006
@@ -19,34 +19,19 @@
package org.apache.webapp.admin.server;
import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
-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 javax.management.modelmbean.ModelMBean;
-import javax.management.modelmbean.ModelMBeanInfo;
import org.apache.struts.util.MessageResources;
-import org.apache.webapp.admin.LabelValueBean;
-import org.apache.webapp.admin.Lists;
-import org.apache.webapp.admin.TomcatTreeBuilder;
import org.apache.webapp.admin.ApplicationServlet;
/**
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java?view=diff&rev=479042&r1=479041&r2=479042
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java Fri Nov 24 15:02:41 2006
@@ -18,7 +18,6 @@
package org.apache.webapp.admin.server;
-import java.util.Iterator;
import java.util.Locale;
import java.io.IOException;
import javax.servlet.ServletException;
@@ -26,19 +25,15 @@
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.action.ActionMessages;
+
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 org.apache.webapp.admin.ApplicationServlet;
-import org.apache.webapp.admin.TomcatTreeBuilder;
import org.apache.struts.util.MessageResources;
/**
@@ -93,7 +88,7 @@
("Cannot acquire MBeanServer reference", t);
}
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
// Report any errors we have discovered back to the original form
if (!errors.isEmpty()) {
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java?view=diff&rev=479042&r1=479041&r2=479042
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java Fri Nov 24 15:02:41 2006
@@ -19,14 +19,10 @@
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.webapp.admin.ApplicationServlet;
-import org.apache.webapp.admin.TomcatTreeBuilder;
-
-import java.util.List;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the server form page.
@@ -164,35 +160,30 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
- //if (submit != null) {
-
- // check for portNumber -- must not be blank, must be in
- // the range 1 to 65535.
-
- if ((portNumberText == null) || (portNumberText.length() < 1)) {
- errors.add("portNumberText",
- new ActionError("error.portNumber.required"));
- } else {
- try {
- int port = Integer.parseInt(portNumberText);
- if ((port <= 0) || (port >65535 ))
- errors.add("portNumberText",
- new ActionError("error.portNumber.range"));
- } catch (NumberFormatException e) {
+ // check for portNumber -- must not be blank, must be in
+ // the range 1 to 65535.
+
+ if ((portNumberText == null) || (portNumberText.length() < 1)) {
+ errors.add("portNumberText",
+ new ActionMessage("error.portNumber.required"));
+ } else {
+ try {
+ int port = Integer.parseInt(portNumberText);
+ if ((port <= 0) || (port >65535 ))
errors.add("portNumberText",
- new ActionError("error.portNumber.format"));
- }
+ new ActionMessage("error.portNumber.range"));
+ } catch (NumberFormatException e) {
+ errors.add("portNumberText",
+ new ActionMessage("error.portNumber.format"));
}
+ }
+
+ // shutdown text can be any non-empty string of atleast 6 characters.
- // shutdown text can be any non-empty string of atleast 6 characters.
-
- if ((shutdownText == null) || (shutdownText.length() < 7))
- errors.add("shutdownText",
- new ActionError("error.shutdownText.length"));
+ if ((shutdownText == null) || (shutdownText.length() < 7))
+ errors.add("shutdownText",
+ new ActionMessage("error.shutdownText.length"));
- //}
-
return errors;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org