Author: markt
Date: Fri Nov 24 15:01:05 2006
New Revision: 479037
URL: http://svn.apache.org/viewvc?view=rev&rev=479037
Log:
Code clean-up thanks to Eclipse for o.a.webapp.admin.realm
- 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/realm/AddRealmAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveDataSourceRealmAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
Fri Nov 24 15:01:05 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,10 +69,8 @@
// 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
+ // Fill in the form values for display and editing
String realmTypes[] = new String[5];
realmTypes[0] = "UserDatabaseRealm";
realmTypes[1] = "JNDIRealm";
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java
Fri Nov 24 15:01:05 2006
@@ -18,15 +18,11 @@
package org.apache.webapp.admin.realm;
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.struts.action.ActionMessage;
-import org.apache.webapp.admin.ApplicationServlet;
-import org.apache.webapp.admin.LabelValueBean;
+import java.util.List;
/**
* Form bean for the datasource realm page.
@@ -320,44 +316,36 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
- //String type = request.getParameter("realmType");
-
// front end validation when save is clicked.
- //if (submit != null) {
- // the following fields are required.
-
- if ((dataSourceName == null) || (dataSourceName.length() < 1)) {
- errors.add("dataSourceName",
- new ActionError("error.dataSourceName.required"));
- }
-
- if ((roleNameCol == null) || (roleNameCol.length() < 1)) {
- errors.add("roleNameCol",
- new ActionError("error.roleNameCol.required"));
- }
-
- if ((userCredCol == null) || (userCredCol.length() < 1)) {
- errors.add("userCredCol",
- new ActionError("error.userCredCol.required"));
- }
-
- if ((userNameCol == null) || (userNameCol.length() < 1)) {
- errors.add("userNameCol",
- new ActionError("error.userNameCol.required"));
- }
-
- if ((userRoleTable == null) || (userRoleTable.length() < 1)) {
- errors.add("userRoleTable",
- new ActionError("error.userRoleTable.required"));
- }
-
- if ((userTable == null) || (userTable.length() < 1)) {
- errors.add("userTable",
- new ActionError("error.userTable.required"));
- }
-
- //}
+ if ((dataSourceName == null) || (dataSourceName.length() < 1)) {
+ errors.add("dataSourceName",
+ new ActionMessage("error.dataSourceName.required"));
+ }
+
+ if ((roleNameCol == null) || (roleNameCol.length() < 1)) {
+ errors.add("roleNameCol",
+ new ActionMessage("error.roleNameCol.required"));
+ }
+
+ if ((userCredCol == null) || (userCredCol.length() < 1)) {
+ errors.add("userCredCol",
+ new ActionMessage("error.userCredCol.required"));
+ }
+
+ if ((userNameCol == null) || (userNameCol.length() < 1)) {
+ errors.add("userNameCol",
+ new ActionMessage("error.userNameCol.required"));
+ }
+
+ if ((userRoleTable == null) || (userRoleTable.length() < 1)) {
+ errors.add("userRoleTable",
+ new ActionMessage("error.userRoleTable.required"));
+ }
+
+ if ((userTable == null) || (userTable.length() < 1)) {
+ errors.add("userTable",
+ new ActionMessage("error.userTable.required"));
+ }
return errors;
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java
Fri Nov 24 15:01:05 2006
@@ -21,28 +21,18 @@
import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
-import java.util.TreeSet;
-import java.util.Set;
import java.util.ArrayList;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.QueryExp;
-import javax.management.Query;
-import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import javax.management.JMException;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
@@ -90,7 +80,6 @@
// Acquire the resources that we need
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
MessageResources resources = getResources(request);
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java
Fri Nov 24 15:01:05 2006
@@ -19,15 +19,9 @@
package org.apache.webapp.admin.realm;
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;
@@ -122,7 +116,6 @@
if (control != null) {
control.selectNode(null);
TreeControlNode node = control.findNode(realms[i]);
- String domain = node.getDomain();
ObjectName fname =
TomcatTreeBuilder.getMBeanFactory();
mBServer.invoke(fname, operation,
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
Fri Nov 24 15:01:05 2006
@@ -18,30 +18,22 @@
package org.apache.webapp.admin.realm;
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 rname = null;
- StringBuffer sb = null;
try {
rname = new ObjectName(request.getParameter("select"));
} catch (Exception e) {
@@ -457,13 +447,10 @@
boolean retVal = true;
try{
// admin app's values
- String adminService = Lists.getAdminAppService(
- mBServer, rname.getDomain(),request);
String adminHost = request.getServerName();
String adminContext = request.getContextPath();
//String thisService = rname.getKeyProperty("service");
- String domain = rname.getDomain();
String thisHost = rname.getKeyProperty("host");
String thisContext = rname.getKeyProperty("path");
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java
Fri Nov 24 15:01:05 2006
@@ -18,15 +18,9 @@
package org.apache.webapp.admin.realm;
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;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the jdbc realm page.
@@ -40,12 +34,6 @@
// ----------------------------------------------------- Instance Variables
/**
- * The text for the realm name, used to retrieve
- * the corresponding realm mBean.
- */
- private String realmName = null;
-
- /**
* The text for the digest.
*/
private String digest = null;
@@ -358,58 +346,51 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
- //String type = request.getParameter("realmType");
-
// front end validation when save is clicked.
- //if (submit != null) {
- // the following fields are required.
-
- if ((driver == null) || (driver.length() < 1)) {
- errors.add("driver",
- new ActionError("error.driver.required"));
- }
-
- if ((roleNameCol == null) || (roleNameCol.length() < 1)) {
- errors.add("roleNameCol",
- new ActionError("error.roleNameCol.required"));
- }
+ if ((driver == null) || (driver.length() < 1)) {
+ errors.add("driver",
+ new ActionMessage("error.driver.required"));
+ }
+
+ if ((roleNameCol == null) || (roleNameCol.length() < 1)) {
+ errors.add("roleNameCol",
+ new ActionMessage("error.roleNameCol.required"));
+ }
- if ((userNameCol == null) || (userNameCol.length() < 1)) {
- errors.add("userNameCol",
- new ActionError("error.userNameCol.required"));
- }
+ if ((userNameCol == null) || (userNameCol.length() < 1)) {
+ errors.add("userNameCol",
+ new ActionMessage("error.userNameCol.required"));
+ }
- if ((passwordCol == null) || (passwordCol.length() < 1)) {
- errors.add("passwordCol",
- new ActionError("error.passwordCol.required"));
- }
-
- if ((userTable == null) || (userTable.length() < 1)) {
- errors.add("userTable",
- new ActionError("error.userTable.required"));
- }
-
- if ((roleTable == null) || (roleTable.length() < 1)) {
- errors.add("roleTable",
- new ActionError("error.roleTable.required"));
- }
-
- if ((connectionName == null) || (connectionName.length() < 1)) {
- errors.add("connectionName",
- new ActionError("error.connectionName.required"));
- }
+ if ((passwordCol == null) || (passwordCol.length() < 1)) {
+ errors.add("passwordCol",
+ new ActionMessage("error.passwordCol.required"));
+ }
- if ((connectionPassword == null) || (connectionPassword.length() <
1)) {
- errors.add("connectionPassword",
- new ActionError("error.connectionPassword.required"));
- }
+ if ((userTable == null) || (userTable.length() < 1)) {
+ errors.add("userTable",
+ new ActionMessage("error.userTable.required"));
+ }
- if ((connectionURL == null) || (connectionURL.length() < 1)) {
- errors.add("connectionURL",
- new ActionError("error.connectionURL.required"));
- }
- //}
+ if ((roleTable == null) || (roleTable.length() < 1)) {
+ errors.add("roleTable",
+ new ActionMessage("error.roleTable.required"));
+ }
+
+ if ((connectionName == null) || (connectionName.length() < 1)) {
+ errors.add("connectionName",
+ new ActionMessage("error.connectionName.required"));
+ }
+
+ if ((connectionPassword == null) || (connectionPassword.length() < 1))
{
+ errors.add("connectionPassword",
+ new ActionMessage("error.connectionPassword.required"));
+ }
+
+ if ((connectionURL == null) || (connectionURL.length() < 1)) {
+ errors.add("connectionURL",
+ new ActionMessage("error.connectionURL.required"));
+ }
return errors;
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java
Fri Nov 24 15:01:05 2006
@@ -18,15 +18,11 @@
package org.apache.webapp.admin.realm;
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.struts.action.ActionMessage;
-import org.apache.webapp.admin.ApplicationServlet;
-import org.apache.webapp.admin.LabelValueBean;
+import java.util.List;
/**
* Form bean for the JNDI realm page.
@@ -506,93 +502,89 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
// front end validation when save is clicked.
- //if (submit != null) {
- // the following fields are required.
+ // the following fields are required.
- if ((connectionURL == null) || (connectionURL.length() < 1)) {
- errors.add("connectionURL",
- new ActionError("error.connURL.required"));
- }
-
- // Either userPattern or userSearch should be specified not both
- boolean isUserPatternSpecified = false;
- boolean isUserSearchSpecified = false;
- if ((userPattern != null) && (userPattern.length() > 0)) {
- isUserPatternSpecified = true;
- }
-
- if ((userSearch != null) && (userSearch.length() > 0)) {
- isUserSearchSpecified = true;
- }
-
- if (isUserPatternSpecified && isUserSearchSpecified) {
- errors.add("userPattern" ,
- new ActionError("error.userPattern.userSearch.defined"));
- }
-
- /*if ((digest == null) || (digest.length() < 1)) {
- errors.add("digest",
- new ActionError("error.digest.required"));
- } */
-
- /*if ((roleName == null) || (roleName.length() < 1)) {
- errors.add("roleName",
- new ActionError("error.roleName.required"));
- }
-
- if ((userRoleName == null) || (userRoleName.length() < 1)) {
- errors.add("userRoleName",
- new ActionError("error.userRoleName.required"));
- }
-
- if ((rolePattern == null) || (rolePattern.length() < 1)) {
- errors.add("rolePattern",
- new ActionError("error.rolePattern.required"));
- }
-
- if ((roleBase == null) || (roleBase.length() < 1)) {
- errors.add("roleBase",
- new ActionError("error.roleBase.required"));
- }
-
- if ((userBase == null) || (userBase.length() < 1)) {
- errors.add("userBase",
- new ActionError("error.userBase.required"));
- }
-
- if ((userPassword == null) || (userPassword.length() < 1)) {
- errors.add("userPassword",
- new ActionError("error.userPassword.required"));
- }
-
- if ((userPattern == null) || (userPattern.length() < 1)) {
- errors.add("userPattern",
- new ActionError("error.userPattern.required"));
- }
-
- if ((userSearch == null) || (userSearch.length() < 1)) {
- errors.add("userSearch",
- new ActionError("error.userSearch.required"));
- }
-
- if ((connectionName == null) || (connectionName.length() < 1)) {
- errors.add("connectionName",
- new ActionError("error.connName.required"));
- }
-
- if ((connectionPassword == null) || (connectionPassword.length() <
1)) {
- errors.add("connectionPassword",
- new ActionError("error.connPassword.required"));
- }
-
- if ((contextFactory == null) || (contextFactory.length() < 1)) {
- errors.add("contextFactory",
- new ActionError("error.contextFactory.required"));
- } */
- //}
+ if ((connectionURL == null) || (connectionURL.length() < 1)) {
+ errors.add("connectionURL",
+ new ActionMessage("error.connURL.required"));
+ }
+
+ // Either userPattern or userSearch should be specified not both
+ boolean isUserPatternSpecified = false;
+ boolean isUserSearchSpecified = false;
+ if ((userPattern != null) && (userPattern.length() > 0)) {
+ isUserPatternSpecified = true;
+ }
+
+ if ((userSearch != null) && (userSearch.length() > 0)) {
+ isUserSearchSpecified = true;
+ }
+
+ if (isUserPatternSpecified && isUserSearchSpecified) {
+ errors.add("userPattern" ,
+ new ActionMessage("error.userPattern.userSearch.defined"));
+ }
+
+ /*if ((digest == null) || (digest.length() < 1)) {
+ errors.add("digest",
+ new ActionMessage("error.digest.required"));
+ } */
+
+ /*if ((roleName == null) || (roleName.length() < 1)) {
+ errors.add("roleName",
+ new ActionMessage("error.roleName.required"));
+ }
+
+ if ((userRoleName == null) || (userRoleName.length() < 1)) {
+ errors.add("userRoleName",
+ new ActionMessage("error.userRoleName.required"));
+ }
+
+ if ((rolePattern == null) || (rolePattern.length() < 1)) {
+ errors.add("rolePattern",
+ new ActionMessage("error.rolePattern.required"));
+ }
+
+ if ((roleBase == null) || (roleBase.length() < 1)) {
+ errors.add("roleBase",
+ new ActionMessage("error.roleBase.required"));
+ }
+
+ if ((userBase == null) || (userBase.length() < 1)) {
+ errors.add("userBase",
+ new ActionMessage("error.userBase.required"));
+ }
+
+ if ((userPassword == null) || (userPassword.length() < 1)) {
+ errors.add("userPassword",
+ new ActionMessage("error.userPassword.required"));
+ }
+
+ if ((userPattern == null) || (userPattern.length() < 1)) {
+ errors.add("userPattern",
+ new ActionMessage("error.userPattern.required"));
+ }
+
+ if ((userSearch == null) || (userSearch.length() < 1)) {
+ errors.add("userSearch",
+ new ActionMessage("error.userSearch.required"));
+ }
+
+ if ((connectionName == null) || (connectionName.length() < 1)) {
+ errors.add("connectionName",
+ new ActionMessage("error.connName.required"));
+ }
+
+ if ((connectionPassword == null) || (connectionPassword.length() < 1))
{
+ errors.add("connectionPassword",
+ new ActionMessage("error.connPassword.required"));
+ }
+
+ if ((contextFactory == null) || (contextFactory.length() < 1)) {
+ errors.add("contextFactory",
+ new ActionMessage("error.contextFactory.required"));
+ } */
return errors;
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java
Fri Nov 24 15:01:05 2006
@@ -18,15 +18,9 @@
package org.apache.webapp.admin.realm;
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;
-import java.util.Enumeration;
-
-import org.apache.webapp.admin.ApplicationServlet;
-import org.apache.webapp.admin.LabelValueBean;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the memory realm page.
@@ -113,15 +107,12 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
// front end validation when save is clicked.
- //if (submit != null) {
- if ((pathName == null) || (pathName.length()<1)) {
- errors.add("pathName",
- new ActionError("error.pathName.required"));
- }
- //}
+ if ((pathName == null) || (pathName.length()<1)) {
+ errors.add("pathName",
+ new ActionMessage("error.pathName.required"));
+ }
+
return errors;
}
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java
Fri Nov 24 15:01:05 2006
@@ -18,15 +18,9 @@
package org.apache.webapp.admin.realm;
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 realm page.
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveDataSourceRealmAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveDataSourceRealmAction.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveDataSourceRealmAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveDataSourceRealmAction.java
Fri Nov 24 15:01:05 2006
@@ -19,27 +19,21 @@
import java.net.URLEncoder;
-import java.util.Iterator;
import java.util.Locale;
import java.io.IOException;
import javax.management.Attribute;
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.QueryExp;
-import javax.management.Query;
-import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import javax.management.JMException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.TomcatTreeBuilder;
@@ -157,9 +151,9 @@
ObjectName oname =
new ObjectName(objectName);
if (mBServer.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("realmName",
- new ActionError("error.realmName.exists"));
+ new ActionMessage("error.realmName.exists"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
Fri Nov 24 15:01:05 2006
@@ -19,15 +19,10 @@
import java.net.URLEncoder;
-import java.util.Iterator;
import java.util.Locale;
import java.io.IOException;
import javax.management.Attribute;
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.QueryExp;
-import javax.management.Query;
-import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.JMException;
import javax.servlet.ServletException;
@@ -35,11 +30,11 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.TomcatTreeBuilder;
@@ -155,9 +150,9 @@
ObjectName oname =
new ObjectName(objectName);
if (mBServer.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("realmName",
- new ActionError("error.realmName.exists"));
+ new ActionMessage("error.realmName.exists"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
Fri Nov 24 15:01:05 2006
@@ -29,11 +29,11 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.TomcatTreeBuilder;
@@ -149,9 +149,9 @@
ObjectName oname =
new ObjectName(objectName);
if (mBServer.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("realmName",
- new ActionError("error.realmName.exists"));
+ new ActionMessage("error.realmName.exists"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java
Fri Nov 24 15:01:05 2006
@@ -19,27 +19,21 @@
import java.net.URLEncoder;
-import java.util.Iterator;
import java.util.Locale;
import java.io.IOException;
import javax.management.Attribute;
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.QueryExp;
-import javax.management.Query;
-import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import javax.management.JMException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.TomcatTreeBuilder;
@@ -151,9 +145,9 @@
ObjectName oname =
new ObjectName(objectName);
if (mBServer.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("realmName",
- new ActionError("error.realmName.exists"));
+ new ActionMessage("error.realmName.exists"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java
Fri Nov 24 15:01:05 2006
@@ -19,27 +19,21 @@
import java.net.URLEncoder;
-import java.util.Iterator;
import java.util.Locale;
import java.io.IOException;
import javax.management.Attribute;
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.QueryExp;
-import javax.management.Query;
-import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import javax.management.JMException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.TomcatTreeBuilder;
@@ -152,9 +146,9 @@
ObjectName oname =
new ObjectName(objectName);
if (mBServer.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("realmName",
- new ActionError("error.realmName.exists"));
+ new ActionMessage("error.realmName.exists"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java?view=diff&rev=479037&r1=479036&r2=479037
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java
Fri Nov 24 15:01:05 2006
@@ -18,15 +18,9 @@
package org.apache.webapp.admin.realm;
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;
+import org.apache.struts.action.ActionMessage;
/**
* Form bean for the User Database realm page.
@@ -114,15 +108,12 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
// front end validation when save is clicked.
- //if (submit != null) {
- if ((resource == null) || (resource.length() < 1)) {
- errors.add("resource",
- new ActionError("error.resource.required"));
- }
- //}
+ if ((resource == null) || (resource.length() < 1)) {
+ errors.add("resource",
+ new ActionMessage("error.resource.required"));
+ }
+
return errors;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
