Author: markt
Date: Fri Nov 24 13:46:09 2006
New Revision: 479010
URL: http://svn.apache.org/viewvc?view=rev&rev=479010
Log:
Code clean up.
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SingleSignOnValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
Fri Nov 24 13:46:09 2006
@@ -18,10 +18,10 @@
package org.apache.webapp.admin.valve;
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;
/**
@@ -309,34 +309,28 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
- // front end validation when save is clicked.
- //if (submit != null) {
+ // if not specified, default is access_log.
+ // to specify no prefix, specify a 0 length string...
+ if ((prefix == null) || (prefix.length() == 0)){
+ prefix = "access_log.";
+ }
- // if not specified, default is access_log.
- // to specify no prefix, specify a 0 length string...
- if ((prefix == null) || (prefix.length() == 0)){
- prefix = "access_log.";
- }
-
- // default is a 0 length string
- if ((suffix == null) || (suffix.length() < 1)) {
- suffix = "";
- }
+ // default is a 0 length string
+ if ((suffix == null) || (suffix.length() < 1)) {
+ suffix = "";
+ }
- // If no directory attribute is specified, the default
- // value is "logs".
- if ((directory == null) || (directory.length() < 1)) {
- directory = "logs";
- }
+ // If no directory attribute is specified, the default
+ // value is "logs".
+ if ((directory == null) || (directory.length() < 1)) {
+ directory = "logs";
+ }
+
+ if ((pattern == null) || (pattern.length() < 1)) {
+ errors.add("pattern",
+ new ActionMessage("error.pattern.required"));
+ }
- if ((pattern == null) || (pattern.length() < 1)) {
- errors.add("pattern",
- new ActionError("error.pattern.required"));
- }
- //}
-
return errors;
}
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
Fri Nov 24 13:46:09 2006
@@ -19,18 +19,15 @@
import java.io.IOException;
import java.net.URLEncoder;
-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.TomcatTreeBuilder;
import org.apache.webapp.admin.LabelValueBean;
import org.apache.webapp.admin.Lists;
@@ -72,8 +69,6 @@
// Acquire the resources that we need
HttpSession session = request.getSession();
- Locale locale = getLocale(request);
- MessageResources resources = getResources(request);
// Fill in the form values for display and editing
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java
Fri Nov 24 13:46:09 2006
@@ -21,32 +21,20 @@
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;
-import org.apache.webapp.admin.TomcatTreeBuilder;
import org.apache.webapp.admin.Lists;
/**
@@ -90,7 +78,6 @@
// Acquire the resources that we need
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
MessageResources resources = getResources(request);
@@ -102,7 +89,6 @@
("Cannot acquire MBeanServer reference", t);
}
- String pattern = null;
// Set up a form bean containing the currently selected
// objects to be deleted
ValvesForm valvesForm = new ValvesForm();
@@ -111,7 +97,6 @@
String valves[] = new String[1];
valves[0] = select;
valvesForm.setValves(valves);
- pattern = select;
}
request.setAttribute("valvesForm", valvesForm);
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java
Fri Nov 24 13:46:09 2006
@@ -19,15 +19,9 @@
package org.apache.webapp.admin.valve;
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,7 +114,6 @@
// Remove the specified valves
for (int i = 0; i < valves.length; i++) {
values[0] = valves[i];
- String domain = (new ObjectName(valves[i])).getDomain();
ObjectName fname = TomcatTreeBuilder.getMBeanFactory();
mBServer.invoke(fname, operation,
values, removeValveTypes);
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
Fri Nov 24 13:46:09 2006
@@ -18,30 +18,22 @@
package org.apache.webapp.admin.valve;
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 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;
/**
* A generic <code>Action</code> that sets up <em>Edit
@@ -84,7 +76,6 @@
throws IOException, ServletException {
// Acquire the resources that we need
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
MessageResources resources = getResources(request);
@@ -98,7 +89,6 @@
// Set up the object names of the MBeans we are manipulating
ObjectName vname = null;
- StringBuffer sb = null;
try {
vname = new ObjectName(request.getParameter("select"));
} catch (Exception e) {
@@ -110,7 +100,6 @@
return (null);
}
- String parent = request.getParameter("parent");
String valveType = null;
String attribute = null;
@@ -217,8 +206,6 @@
throws IOException {
// Fill in the form values for display and editing
HttpSession session = request.getSession();
- Locale locale = getLocale(request);
- MessageResources resources = getResources(request);
String parent = request.getParameter("parent");
RequestDumperValveForm valveFm = new RequestDumperValveForm();
session.setAttribute("requestDumperValveForm", valveFm);
@@ -231,7 +218,6 @@
sb.append(")");
valveFm.setNodeLabel(sb.toString());
valveFm.setValveType(valveType);
- String attribute = null;
}
private void setUpSingleSignOnValve(ObjectName vname, HttpServletRequest
request,
@@ -239,8 +225,6 @@
throws IOException {
// Fill in the form values for display and editing
HttpSession session = request.getSession();
- Locale locale = getLocale(request);
- MessageResources resources = getResources(request);
String parent = request.getParameter("parent");
SingleSignOnValveForm valveFm = new SingleSignOnValveForm();
session.setAttribute("singleSignOnValveForm", valveFm);
@@ -253,7 +237,6 @@
sb.append(")");
valveFm.setNodeLabel(sb.toString());
valveFm.setValveType(valveType);
- String attribute = null;
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java
Fri Nov 24 13:46:09 2006
@@ -18,18 +18,12 @@
package org.apache.webapp.admin.valve;
import java.lang.IllegalArgumentException;
-import java.net.InetAddress;
-import java.util.List;
import java.util.regex.Pattern;
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.LabelValueBean;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the remote addr valve page.
@@ -159,30 +153,26 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
// front end validation when save is clicked.
- //if (submit != null) {
- // validate allow/deny patterns
- if ((allow == null) || (allow.length() < 1)) {
- if ((deny == null) || (deny.length() < 1)) {
- errors.add("allow",
- new ActionError("error.allow.deny.required"));
- }
- }
- //}
+ // validate allow/deny patterns
+ if ((allow == null) || (allow.length() < 1)) {
+ if ((deny == null) || (deny.length() < 1)) {
+ errors.add("allow",
+ new ActionMessage("error.allow.deny.required"));
+ }
+ }
try {
allows = ValveUtil.precalculate(allow);
} catch (IllegalArgumentException e) {
- errors.add("allow", new ActionError("error.syntax"));
+ errors.add("allow", new ActionMessage("error.syntax"));
return errors;
}
try {
denies = ValveUtil.precalculate(deny);
} catch (IllegalArgumentException e) {
- errors.add("allow", new ActionError("error.syntax"));
+ errors.add("allow", new ActionMessage("error.syntax"));
return errors;
}
@@ -196,12 +186,12 @@
if (denies[i].matcher(ip).matches()) {
if (allows.length < 1) {
errors.add("deny",
- new ActionError("error.denyIP"));
+ new ActionMessage("error.denyIP"));
}
for (int j = 0; j < allows.length; j++) {
if (!allows[j].matcher(ip).matches()) {
errors.add("deny",
- new ActionError("error.denyIP"));
+ new ActionMessage("error.denyIP"));
}
}
}
@@ -217,7 +207,7 @@
}
}
if (!allowMatch) {
- errors.add("allow", new ActionError("error.allowIP"));
+ errors.add("allow", new ActionMessage("error.allowIP"));
}
return errors;
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java
Fri Nov 24 13:46:09 2006
@@ -18,18 +18,12 @@
package org.apache.webapp.admin.valve;
import java.lang.IllegalArgumentException;
-import java.net.InetAddress;
-import java.util.List;
import java.util.regex.Pattern;
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.LabelValueBean;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the remote host valve page.
@@ -158,31 +152,26 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
// front end validation when save is clicked.
- //if (submit != null) {
- // TBD
- // validate allow/deny IPs
- if ((allow == null) || (allow.length() < 1)) {
- if ((deny == null) || (deny.length() < 1)) {
- errors.add("allow",
- new ActionError("error.allow.deny.required"));
- }
- }
- //}
+ // validate allow/deny IPs
+ if ((allow == null) || (allow.length() < 1)) {
+ if ((deny == null) || (deny.length() < 1)) {
+ errors.add("allow",
+ new ActionMessage("error.allow.deny.required"));
+ }
+ }
try {
allows = ValveUtil.precalculate(allow);
} catch (IllegalArgumentException e) {
- errors.add("allow", new ActionError("error.syntax"));
+ errors.add("allow", new ActionMessage("error.syntax"));
return errors;
}
try {
denies = ValveUtil.precalculate(deny);
} catch (IllegalArgumentException e) {
- errors.add("allow", new ActionError("error.syntax"));
+ errors.add("allow", new ActionMessage("error.syntax"));
return errors;
}
@@ -199,23 +188,23 @@
if (denies[i].matcher(host).matches()) {
if (allows.length < 1) {
errors.add("deny",
- new ActionError("error.denyHost"));
+ new ActionMessage("error.denyHost"));
}
for (int j = 0; j < allows.length; j++) {
if (!allows[j].matcher(host).matches()) {
errors.add("deny",
- new ActionError("error.denyHost"));
+ new ActionMessage("error.denyHost"));
}
}
} else if (denies[i].matcher(ip).matches()) {
if (allows.length < 1) {
errors.add("deny",
- new ActionError("error.denyHost"));
+ new ActionMessage("error.denyHost"));
}
for (int j = 0; j < allows.length; j++) {
if (!allows[j].matcher(ip).matches()) {
errors.add("deny",
- new ActionError("error.denyHost"));
+ new ActionMessage("error.denyHost"));
}
}
}
@@ -234,7 +223,7 @@
}
if (!allowMatch) {
- errors.add("allow", new ActionError("error.allowHost"));
+ errors.add("allow", new ActionMessage("error.allowHost"));
}
return errors;
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java
Fri Nov 24 13:46:09 2006
@@ -18,11 +18,8 @@
package org.apache.webapp.admin.valve;
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 java.util.List;
/**
* Form bean for the Request Dumper valve page.
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
Fri Nov 24 13:46:09 2006
@@ -21,18 +21,12 @@
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.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;
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java
Fri Nov 24 13:46:09 2006
@@ -21,18 +21,12 @@
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.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;
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java
Fri Nov 24 13:46:09 2006
@@ -21,18 +21,12 @@
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.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;
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
Fri Nov 24 13:46:09 2006
@@ -17,26 +17,15 @@
package org.apache.webapp.admin.valve;
-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.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.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
/**
@@ -49,14 +38,6 @@
public final class SaveRequestDumperValveAction extends Action {
-
- // ----------------------------------------------------- Instance Variables
-
- /**
- * The MBeanServer we will be interacting with.
- */
- private MBeanServer mBServer = null;
-
// --------------------------------------------------------- Public Methods
@@ -83,36 +64,21 @@
// Acquire the resources that we need
HttpSession session = request.getSession();
- Locale locale = getLocale(request);
- MessageResources resources = getResources(request);
-
- // 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);
- }
// Identify the requested action
RequestDumperValveForm vform = (RequestDumperValveForm) form;
String adminAction = vform.getAdminAction();
- String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
- response, request, mapping,
+ ValveUtil.createValve(parent, valveType, response, request,
mapping,
(ApplicationServlet) getServlet());
}
- // Perform attribute updates as requested
- String attribute = null;
-
// Forward to the success reporting page
session.removeAttribute(mapping.getAttribute());
return (mapping.findForward("Save Successful"));
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
Fri Nov 24 13:46:09 2006
@@ -19,24 +19,18 @@
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;
@@ -98,7 +92,6 @@
// Identify the requested action
SingleSignOnValveForm vform = (SingleSignOnValveForm) form;
String adminAction = vform.getAdminAction();
- String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
String valveType = vform.getValveType();
@@ -113,9 +106,9 @@
":type=Valve,name=SingleSignOn");
if (mBServer.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("singleSignOnValve",
- new ActionError("error.singleSignOn.exists"));
+ new ActionMessage("error.singleSignOn.exists"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
@@ -131,15 +124,11 @@
}
- vObjectName = ValveUtil.createValve(parent, valveType,
- response, request, mapping,
- (ApplicationServlet) getServlet());
+ ValveUtil.createValve(parent, valveType, response, request,
mapping,
+ (ApplicationServlet) getServlet());
}
- // Perform attribute updates as requested
- String attribute = null;
-
// Forward to the success reporting page
session.removeAttribute(mapping.getAttribute());
return (mapping.findForward("Save Successful"));
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SingleSignOnValveForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SingleSignOnValveForm.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SingleSignOnValveForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SingleSignOnValveForm.java
Fri Nov 24 13:46:09 2006
@@ -18,15 +18,8 @@
package org.apache.webapp.admin.valve;
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 java.net.InetAddress;
-import java.util.List;
-
-import org.apache.webapp.admin.ApplicationServlet;
-import org.apache.webapp.admin.LabelValueBean;
/**
* Form bean for the single sign on valve page.
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.java
Fri Nov 24 13:46:09 2006
@@ -18,16 +18,10 @@
package org.apache.webapp.admin.valve;
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 java.net.InetAddress;
import java.util.List;
-import org.apache.webapp.admin.ApplicationServlet;
-import org.apache.webapp.admin.LabelValueBean;
-
/**
* Form bean for the generic valve page.
*
@@ -49,12 +43,6 @@
*/
private String objectName = null;
- /**
- * The text for the valve name, used to retrieve
- * the corresponding valve mBean.
- */
- private String valveName = null;
-
/**
* The text for the valve type.
*/
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java?view=diff&rev=479010&r1=479009&r2=479010
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
Fri Nov 24 13:46:09 2006
@@ -19,29 +19,17 @@
import java.net.URLEncoder;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Locale;
import java.io.IOException;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-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.Globals;
-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.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -95,10 +83,6 @@
String vObjectName = null;
try {
-
- String objectName = ValveUtil.getObjectName(parent,
- TomcatTreeBuilder.VALVE_TYPE);
-
String parentNodeName = parent;
ObjectName pname = new ObjectName(parent);
StringBuffer sb = new StringBuffer(pname.getDomain());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
