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:01:23 UTC
svn commit: r479038 -
/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/
Author: markt
Date: Fri Nov 24 15:01:21 2006
New Revision: 479038
URL: http://svn.apache.org/viewvc?view=rev&rev=479038
Log:
Code clean-up thanks to Eclipse for o.a.webapp.admin.resources
- 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/resources/BaseForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourcesForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteUserDatabasesAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListEnvEntriesAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListMailSessionsAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListResourceLinksAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpMailSessionAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabasesForm.java
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/BaseForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/BaseForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/BaseForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/BaseForm.java Fri Nov 24 15:01:21 2006
@@ -18,10 +18,7 @@
package org.apache.webapp.admin.resources;
-import javax.management.ObjectName;
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;
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java Fri Nov 24 15:01:21 2006
@@ -17,15 +17,10 @@
package org.apache.webapp.admin.resources;
-import java.util.List;
-import java.util.ArrayList;
-
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.LabelValueBean;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the individual data source page.
@@ -296,45 +291,41 @@
errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
- //if (submit != null) {
+ // url is a required field
+ if ((url == null) || (url.length() < 1)) {
+ errors.add("url",
+ new ActionMessage("resources.error.url.required"));
+ }
+
+ // jndiName is a required field
+ if (( jndiName == null) || (jndiName.length() < 1)) {
+ errors.add("jndiName",
+ new ActionMessage("resources.error.jndiName.required"));
+ }
+
+ // driverClass is a required field
+ if ((driverClass == null) || (driverClass.length() < 1)) {
+ errors.add("driverClass",
+ new ActionMessage("resources.error.driverClass.required"));
+ }
+
+ // FIX ME -- need to do a range check
+ numberCheck("active", active , false, 0, 10000);
+ numberCheck("idle", idle , false, 0, 10000);
+ numberCheck("wait", wait , false, 0, 10000);
+
+ // Quotes not allowed in username
+ if ((username != null) && (username.indexOf('"') >= 0)) {
+ errors.add("username",
+ new ActionMessage("users.error.quotes"));
+ }
+
+ // Quotes not allowed in password
+ if ((password != null) && (password.indexOf('"') > 0)) {
+ errors.add("password",
+ new ActionMessage("users.error.quotes"));
+ }
- // url is a required field
- if ((url == null) || (url.length() < 1)) {
- errors.add("url",
- new ActionError("resources.error.url.required"));
- }
-
- // jndiName is a required field
- if (( jndiName == null) || (jndiName.length() < 1)) {
- errors.add("jndiName",
- new ActionError("resources.error.jndiName.required"));
- }
-
- // driverClass is a required field
- if ((driverClass == null) || (driverClass.length() < 1)) {
- errors.add("driverClass",
- new ActionError("resources.error.driverClass.required"));
- }
-
- // FIX ME -- need to do a range check
- numberCheck("active", active , false, 0, 10000);
- numberCheck("idle", idle , false, 0, 10000);
- numberCheck("wait", wait , false, 0, 10000);
-
- // Quotes not allowed in username
- if ((username != null) && (username.indexOf('"') >= 0)) {
- errors.add("username",
- new ActionError("users.error.quotes"));
- }
-
- // Quotes not allowed in password
- if ((password != null) && (password.indexOf('"') > 0)) {
- errors.add("password",
- new ActionError("users.error.quotes"));
- }
- //}
return (errors);
}
@@ -356,7 +347,7 @@
// Check for 'is required'
if ((numText == null) || (numText.length() < 1)) {
- errors.add(field, new ActionError("resources.error."+field+".required"));
+ errors.add(field, new ActionMessage("resources.error."+field+".required"));
} else {
// check for 'must be a number' in the 'valid range'
@@ -366,11 +357,11 @@
if (rangeCheck) {
if ((num < min) || (num > max ))
errors.add( field,
- new ActionError("resources.error."+ field +".range"));
+ new ActionMessage("resources.error."+ field +".range"));
}
} catch (NumberFormatException e) {
errors.add(field,
- new ActionError("resources.integer.error"));
+ new ActionMessage("resources.integer.error"));
}
}
}
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourcesForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourcesForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourcesForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourcesForm.java Fri Nov 24 15:01:21 2006
@@ -18,9 +18,6 @@
package org.apache.webapp.admin.resources;
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;
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.java Fri Nov 24 15:01:21 2006
@@ -19,29 +19,16 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
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;
-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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -96,7 +83,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java Fri Nov 24 15:01:21 2006
@@ -20,29 +20,16 @@
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
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;
-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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -97,7 +84,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.java Fri Nov 24 15:01:21 2006
@@ -19,29 +19,16 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
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;
-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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -96,7 +83,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.java Fri Nov 24 15:01:21 2006
@@ -19,29 +19,16 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
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;
-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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -96,7 +83,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteUserDatabasesAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteUserDatabasesAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteUserDatabasesAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteUserDatabasesAction.java Fri Nov 24 15:01:21 2006
@@ -20,29 +20,16 @@
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
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;
-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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -97,7 +84,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.java Fri Nov 24 15:01:21 2006
@@ -19,9 +19,6 @@
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;
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java Fri Nov 24 15:01:21 2006
@@ -21,10 +21,9 @@
import java.util.ArrayList;
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 org.apache.webapp.admin.LabelValueBean;
import java.lang.reflect.Constructor;
@@ -212,16 +211,16 @@
*/
public List getTypeVals() {
- return this.typeVals;
+ return typeVals;
}
/**
* Set the typeVals.
*/
- public void setTypeVals(List typeVals) {
+ public void setTypeVals(List theTypeVals) {
- this.typeVals = typeVals;
+ typeVals = theTypeVals;
}
@@ -262,47 +261,44 @@
errors = new ActionErrors();
- String submit = request.getParameter("submit");
- //if (submit != null) {
-
- // name is a required field
- if ((name == null) || (name.length() < 1)) {
- errors.add("name",
- new ActionError("resources.error.name.required"));
- }
-
- // value is a required field
- if ((value == null) || (value.length() < 1)) {
- errors.add("value",
- new ActionError("resources.error.value.required"));
- }
-
- // Quotes not allowed in name
- if ((name != null) && (name.indexOf('"') >= 0)) {
- errors.add("name",
- new ActionError("users.error.quotes"));
- }
-
- // Quotes not allowed in value
- if ((value != null) && (value.indexOf('"') > 0)) {
- errors.add("value",
- new ActionError("users.error.quotes"));
- }
+ // name is a required field
+ if ((name == null) || (name.length() < 1)) {
+ errors.add("name",
+ new ActionMessage("resources.error.name.required"));
+ }
+
+ // value is a required field
+ if ((value == null) || (value.length() < 1)) {
+ errors.add("value",
+ new ActionMessage("resources.error.value.required"));
+ }
+
+ // Quotes not allowed in name
+ if ((name != null) && (name.indexOf('"') >= 0)) {
+ errors.add("name",
+ new ActionMessage("users.error.quotes"));
+ }
+
+ // Quotes not allowed in value
+ if ((value != null) && (value.indexOf('"') > 0)) {
+ errors.add("value",
+ new ActionMessage("users.error.quotes"));
+ }
+
+ // Quotes not allowed in description
+ if ((description != null) && (description.indexOf('"') > 0)) {
+ errors.add("description",
+ new ActionMessage("users.error.quotes"));
+ }
+
+ // if cehcked, override will be sent as a request parameter
+ override = (request.getParameter("override") != null);
+
+ if (validateType(entryType, value)) {
+ errors.add("value",
+ new ActionMessage("resources.error.value.mismatch"));
+ }
- // Quotes not allowed in description
- if ((description != null) && (description.indexOf('"') > 0)) {
- errors.add("description",
- new ActionError("users.error.quotes"));
- }
-
- // if cehcked, override will be sent as a request parameter
- override = (request.getParameter("override") != null);
-
- if (validateType(entryType, value)) {
- errors.add("value",
- new ActionError("resources.error.value.mismatch"));
- }
- //}
return (errors);
}
@@ -337,7 +333,7 @@
Class[] parameterTypes = {String.class};
Constructor ct = cls.getConstructor(parameterTypes);
Object arglist1[] = {value};
- Object retobj = ct.newInstance(arglist1);
+ ct.newInstance(arglist1);
} catch (Exception e) {
mismatch = true;
}
@@ -346,12 +342,12 @@
} else {
// validation for other types not implemented yet
errors.add("entryType",
- new ActionError("resources.error.entryType.notimpl"));
+ new ActionMessage("resources.error.entryType.notimpl"));
}
} catch (ClassNotFoundException cnfe) {
// entry type has an invalid entry
errors.add("entryType",
- new ActionError("resources.error.entryType.invalid"));
+ new ActionMessage("resources.error.entryType.invalid"));
}
return mismatch;
}
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.java Fri Nov 24 15:01:21 2006
@@ -23,11 +23,9 @@
import java.net.URLDecoder;
import java.util.Locale;
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.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -91,7 +89,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
String resourcetype = request.getParameter("resourcetype");
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListEnvEntriesAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListEnvEntriesAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListEnvEntriesAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListEnvEntriesAction.java Fri Nov 24 15:01:21 2006
@@ -23,11 +23,9 @@
import java.net.URLDecoder;
import java.util.Locale;
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.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -92,7 +90,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
String resourcetype = request.getParameter("resourcetype");
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListMailSessionsAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListMailSessionsAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListMailSessionsAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListMailSessionsAction.java Fri Nov 24 15:01:21 2006
@@ -23,11 +23,9 @@
import java.net.URLDecoder;
import java.util.Locale;
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.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -90,7 +88,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
String resourcetype = request.getParameter("resourcetype");
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListResourceLinksAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListResourceLinksAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListResourceLinksAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListResourceLinksAction.java Fri Nov 24 15:01:21 2006
@@ -23,11 +23,9 @@
import java.net.URLDecoder;
import java.util.Locale;
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.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -90,7 +88,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
String resourcetype = request.getParameter("resourcetype");
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java Fri Nov 24 15:01:21 2006
@@ -23,11 +23,9 @@
import java.net.URLDecoder;
import java.util.Locale;
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.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -92,7 +90,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
String domain = request.getParameter("domain");
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java Fri Nov 24 15:01:21 2006
@@ -17,15 +17,10 @@
package org.apache.webapp.admin.resources;
-import java.util.List;
-import java.util.ArrayList;
-
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.LabelValueBean;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the individual mail session page.
@@ -193,16 +188,11 @@
errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
- //if (submit != null) {
-
- // mailSmtpHost is a required field
- if ((mailhost == null) || (mailhost.length() < 1)) {
- errors.add("mailhost",
- new ActionError("resources.error.mailhost.required"));
- }
- //}
+ // mailSmtpHost is a required field
+ if ((mailhost == null) || (mailhost.length() < 1)) {
+ errors.add("mailhost",
+ new ActionMessage("resources.error.mailhost.required"));
+ }
return (errors);
}
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.java Fri Nov 24 15:01:21 2006
@@ -18,9 +18,6 @@
package org.apache.webapp.admin.resources;
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;
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java Fri Nov 24 15:01:21 2006
@@ -17,15 +17,10 @@
package org.apache.webapp.admin.resources;
-import java.util.List;
-import java.util.ArrayList;
-
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.LabelValueBean;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the individual resource link page.
@@ -193,29 +188,23 @@
HttpServletRequest request) {
errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
- //if (submit != null) {
-
- // name is a required field
- if ((name == null) || (name.length() < 1)) {
- errors.add("name",
- new ActionError("resources.error.name.required"));
- }
-
- // global is a required field
- if (( global == null) || (global.length() < 1)) {
- errors.add("global",
- new ActionError("resources.error.global.required"));
- }
-
- // type is a required field
- if ((type == null) || (type.length() < 1)) {
- errors.add("type",
- new ActionError("resources.error.type.required"));
- }
-
- //}
+ // name is a required field
+ if ((name == null) || (name.length() < 1)) {
+ errors.add("name",
+ new ActionMessage("resources.error.name.required"));
+ }
+
+ // global is a required field
+ if (( global == null) || (global.length() < 1)) {
+ errors.add("global",
+ new ActionMessage("resources.error.global.required"));
+ }
+
+ // type is a required field
+ if ((type == null) || (type.length() < 1)) {
+ errors.add("type",
+ new ActionMessage("resources.error.type.required"));
+ }
return (errors);
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.java Fri Nov 24 15:01:21 2006
@@ -18,9 +18,6 @@
package org.apache.webapp.admin.resources;
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;
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java Fri Nov 24 15:01:21 2006
@@ -18,7 +18,6 @@
package org.apache.webapp.admin.resources;
-import java.util.Arrays;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Collections;
@@ -103,7 +102,6 @@
throws Exception {
ObjectName ename = null;
- StringBuffer sb = null;
if (resourcetype!=null) {
if (resourcetype.equals("Global")) {
ename = new ObjectName( domain + ENVIRONMENT_TYPE +
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java Fri Nov 24 15:01:21 2006
@@ -20,30 +20,20 @@
import java.io.IOException;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Iterator;
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.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 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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -96,7 +86,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
@@ -165,9 +154,9 @@
if (mserver.isRegistered(oname) ||
mserver.isRegistered(encodedOName)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("jndiName",
- new ActionError("resources.invalid.name"));
+ new ActionMessage("resources.invalid.name"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java Fri Nov 24 15:01:21 2006
@@ -19,31 +19,20 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Iterator;
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.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 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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -97,7 +86,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
@@ -153,9 +141,9 @@
}
if (mserver.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("name",
- new ActionError("resources.invalid.env"));
+ new ActionMessage("resources.invalid.env"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java Fri Nov 24 15:01:21 2006
@@ -19,31 +19,20 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Iterator;
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.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 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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -96,7 +85,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
@@ -150,9 +138,9 @@
}
if (mserver.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("name",
- new ActionError("resources.invalid.name"));
+ new ActionMessage("resources.invalid.name"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java Fri Nov 24 15:01:21 2006
@@ -19,31 +19,20 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Iterator;
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.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 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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -96,7 +85,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
@@ -150,9 +138,9 @@
}
if (mserver.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("name",
- new ActionError("resources.invalid.name"));
+ new ActionMessage("resources.invalid.name"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java Fri Nov 24 15:01:21 2006
@@ -19,31 +19,20 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Iterator;
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.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 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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -101,7 +90,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Has this transaction been cancelled?
@@ -143,9 +131,9 @@
",name=" + params[0]);
if (mserver.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("name",
- new ActionError("resources.invalid.name"));
+ new ActionMessage("resources.invalid.name"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java Fri Nov 24 15:01:21 2006
@@ -18,27 +18,14 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.Iterator;
import java.util.Locale;
-import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
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.MBeanOperationInfo;
-import javax.management.MBeanInfo;
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;
@@ -97,7 +84,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Set up the form bean based on the creating or editing state
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java Fri Nov 24 15:01:21 2006
@@ -18,26 +18,13 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.Iterator;
import java.util.Locale;
-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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
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;
@@ -96,7 +83,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Set up the form bean based on the creating or editing state
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpMailSessionAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpMailSessionAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpMailSessionAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpMailSessionAction.java Fri Nov 24 15:01:21 2006
@@ -18,26 +18,13 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.Iterator;
import java.util.Locale;
-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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
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;
@@ -96,7 +83,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Set up the form bean based on the creating or editing state
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.java Fri Nov 24 15:01:21 2006
@@ -18,26 +18,13 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.Iterator;
import java.util.Locale;
-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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
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;
@@ -96,7 +83,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Set up the form bean based on the creating or editing state
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java Fri Nov 24 15:01:21 2006
@@ -18,26 +18,13 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.Iterator;
import java.util.Locale;
-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.management.MBeanAttributeInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanInfo;
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;
@@ -96,7 +83,6 @@
mserver = ((ApplicationServlet) getServlet()).getServer();
}
MessageResources resources = getResources(request);
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
// Set up the form bean based on the creating or editing state
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java Fri Nov 24 15:01:21 2006
@@ -17,17 +17,10 @@
package org.apache.webapp.admin.resources;
-import java.util.List;
-import java.util.ArrayList;
-
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.LabelValueBean;
-
-import java.lang.reflect.Constructor;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the individual user database page.
@@ -166,39 +159,36 @@
errors = new ActionErrors();
- String submit = request.getParameter("submit");
- //if (submit != null) {
+ // name is a required field
+ if ((name == null) || (name.length() < 1)) {
+ errors.add("name",
+ new ActionMessage("resources.error.name.required"));
+ }
+
+ // path is a required field
+ if ((path == null) || (path.length() < 1)) {
+ errors.add("path",
+ new ActionMessage("resources.error.path.required"));
+ }
+
+ // Quotes not allowed in name
+ if ((name != null) && (name.indexOf('"') >= 0)) {
+ errors.add("name",
+ new ActionMessage("users.error.quotes"));
+ }
+
+ // Quotes not allowed in path
+ if ((path != null) && (path.indexOf('"') > 0)) {
+ errors.add("path",
+ new ActionMessage("users.error.quotes"));
+ }
+
+ // Quotes not allowed in description
+ if ((description != null) && (description.indexOf('"') > 0)) {
+ errors.add("description",
+ new ActionMessage("users.error.quotes"));
+ }
- // name is a required field
- if ((name == null) || (name.length() < 1)) {
- errors.add("name",
- new ActionError("resources.error.name.required"));
- }
-
- // path is a required field
- if ((path == null) || (path.length() < 1)) {
- errors.add("path",
- new ActionError("resources.error.path.required"));
- }
-
- // Quotes not allowed in name
- if ((name != null) && (name.indexOf('"') >= 0)) {
- errors.add("name",
- new ActionError("users.error.quotes"));
- }
-
- // Quotes not allowed in path
- if ((path != null) && (path.indexOf('"') > 0)) {
- errors.add("path",
- new ActionError("users.error.quotes"));
- }
-
- // Quotes not allowed in description
- if ((description != null) && (description.indexOf('"') > 0)) {
- errors.add("description",
- new ActionError("users.error.quotes"));
- }
- //}
return (errors);
}
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabasesForm.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabasesForm.java?view=diff&rev=479038&r1=479037&r2=479038
==============================================================================
--- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabasesForm.java (original)
+++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabasesForm.java Fri Nov 24 15:01:21 2006
@@ -19,9 +19,6 @@
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org