Author: markt
Date: Fri Nov 24 15:00:53 2006
New Revision: 479035
URL: http://svn.apache.org/viewvc?view=rev&rev=479035
Log:
Code clean-up thanks to Eclipse for o.a.webapp.admin.host
- 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/host/AddAliasAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasesAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.java
Fri Nov 24 15:00:53 2006
@@ -27,14 +27,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.ApplicationServlet;
-import org.apache.webapp.admin.LabelValueBean;
-import org.apache.webapp.admin.Lists;
import javax.management.ObjectName;
/**
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java
Fri Nov 24 15:00:53 2006
@@ -18,19 +18,14 @@
package org.apache.webapp.admin.host;
import java.io.IOException;
-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 org.apache.struts.util.MessageResources;
-import org.apache.webapp.admin.LabelValueBean;
import org.apache.webapp.admin.Lists;
/**
@@ -67,8 +62,6 @@
// Acquire the resources that we need
HttpSession session = request.getSession();
- Locale locale = getLocale(request);
- MessageResources resources = getResources(request);
// the service Name is needed to retrieve the engine mBean to
// which the new host mBean will be added.
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java
Fri Nov 24 15:00:53 2006
@@ -19,10 +19,11 @@
package org.apache.webapp.admin.host;
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;
/**
@@ -150,17 +151,13 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
// front end validation when save is clicked.
- //if (submit != null) {
-
- // aliasName cannot be null
- if ((aliasName== null) || (aliasName.length() < 1)) {
- errors.add("aliasName", new
ActionError("error.aliasName.required"));
- }
+ // aliasName cannot be null
+ if ((aliasName== null) || (aliasName.length() < 1)) {
+ errors.add("aliasName",
+ new ActionMessage("error.aliasName.required"));
+ }
- //}
return errors;
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasAction.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasAction.java
Fri Nov 24 15:00:53 2006
@@ -20,34 +20,22 @@
import java.io.IOException;
import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
import java.util.Arrays;
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;
-import org.apache.webapp.admin.TomcatTreeBuilder;
/**
* The <code>Action</code> that sets up <em>Delete Aliases</em> transactions.
@@ -90,7 +78,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/host/DeleteAliasForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasForm.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasForm.java
Fri Nov 24 15:00:53 2006
@@ -17,9 +17,7 @@
package org.apache.webapp.admin.host;
-import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
/**
* Form bean for the "Delete Alias" page.
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasesAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasesAction.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasesAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasesAction.java
Fri Nov 24 15:00:53 2006
@@ -19,17 +19,10 @@
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;
@@ -91,7 +84,6 @@
// Look up the components we will be using as needed
- 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/host/DeleteHostAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
Fri Nov 24 15:00:53 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/host/DeleteHostsAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.java
Fri Nov 24 15:00:53 2006
@@ -19,15 +19,9 @@
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;
@@ -127,7 +121,6 @@
if (control != null) {
control.selectNode(null);
TreeControlNode node = control.findNode(hosts[i]);
- String domain = node.getDomain();
ObjectName fname = TomcatTreeBuilder.getMBeanFactory();
mBServer.invoke(fname, operation,
values, removeHostTypes);
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
Fri Nov 24 15:00:53 2006
@@ -18,8 +18,6 @@
package org.apache.webapp.admin.host;
import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
import java.util.Arrays;
import java.util.ArrayList;
@@ -28,21 +26,16 @@
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 Host</em> transactions.
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java
Fri Nov 24 15:00:53 2006
@@ -19,10 +19,11 @@
package org.apache.webapp.admin.host;
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;
/**
@@ -87,11 +88,6 @@
*/
private String unpackWARs = "false";
- /**
- * The text for the port. -- TBD
- */
- private String findAliases = null;
-
/*
* Represent boolean (true, false) values for unpackWARs etc.
*/
@@ -442,22 +438,17 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
// front end validation when save is clicked.
- //if (submit != null) {
-
- // hostName cannot be null
- if ((hostName== null) || (hostName.length() < 1)) {
- errors.add("hostName", new
ActionError("error.hostName.required"));
- }
-
- // appBase cannot be null
- if ((appBase == null) || (appBase.length() < 1)) {
- errors.add("appBase", new
ActionError("error.appBase.required"));
- }
+ // hostName cannot be null
+ if ((hostName== null) || (hostName.length() < 1)) {
+ errors.add("hostName", new
ActionMessage("error.hostName.required"));
+ }
+
+ // appBase cannot be null
+ if ((appBase == null) || (appBase.length() < 1)) {
+ errors.add("appBase", new ActionMessage("error.appBase.required"));
+ }
- //}
return errors;
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java
Fri Nov 24 15:00:53 2006
@@ -17,36 +17,23 @@
package org.apache.webapp.admin.host;
-import java.net.URLEncoder;
-import java.util.Iterator;
import java.util.Locale;
import java.util.List;
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.TomcatTreeBuilder;
-import org.apache.webapp.admin.TreeControl;
-import org.apache.webapp.admin.TreeControlNode;
-
-
/**
* The <code>Action</code> that completes <em>Add Alias</em> and
@@ -126,9 +113,9 @@
// validate if this alias already exists.
List aliasVals = aform.getAliasVals();
if (aliasVals.contains(values[0])) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("aliasName",
- new ActionError("error.aliasName.exists"));
+ new ActionMessage("error.aliasName.exists"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java?view=diff&rev=479035&r1=479034&r2=479035
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java
Fri Nov 24 15:00:53 2006
@@ -19,27 +19,21 @@
import java.net.URLEncoder;
-import java.util.Iterator;
import java.util.Locale;
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.TomcatTreeBuilder;
@@ -141,9 +135,9 @@
TomcatTreeBuilder.HOST_TYPE +
",host=" + hform.getHostName());
if (mBServer.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("hostName",
- new ActionError("error.hostName.exists"));
+ new ActionMessage("error.hostName.exists"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
