Author: markt
Date: Sat Oct 21 13:09:12 2006
New Revision: 466442
URL: http://svn.apache.org/viewvc?view=rev&rev=466442
Log:
Remove unused code from admin webapp. No functional change.
Modified:
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
Modified:
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java?view=diff&rev=466442&r1=466441&r2=466442
==============================================================================
---
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
(original)
+++
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
Sat Oct 21 13:09:12 2006
@@ -210,16 +210,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;
}
@@ -332,7 +332,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;
}
Modified:
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java?view=diff&rev=466442&r1=466441&r2=466442
==============================================================================
---
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
(original)
+++
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
Sat Oct 21 13:09:12 2006
@@ -187,16 +187,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 ActionMessage("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/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java?view=diff&rev=466442&r1=466441&r2=466442
==============================================================================
---
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
(original)
+++
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
Sat Oct 21 13:09:12 2006
@@ -187,30 +187,24 @@
HttpServletRequest request) {
errors = new ActionErrors();
- String submit = request.getParameter("submit");
+ // name is a required field
+ if ((name == null) || (name.length() < 1)) {
+ errors.add("name",
+ new ActionMessage("resources.error.name.required"));
+ }
- //if (submit != null) {
-
- // 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"));
- }
+ // 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"));
+ }
- // 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/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java?view=diff&rev=466442&r1=466441&r2=466442
==============================================================================
---
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
(original)
+++
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
Sat Oct 21 13:09:12 2006
@@ -67,7 +67,6 @@
throws Exception {
ObjectName ename = null;
- StringBuffer sb = null;
if (resourcetype!=null) {
if (resourcetype.equals("Global")) {
ename = new ObjectName( ENVIRONMENT_TYPE + GLOBAL_TYPE + ",*");
Modified:
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java?view=diff&rev=466442&r1=466441&r2=466442
==============================================================================
---
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
(original)
+++
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
Sat Oct 21 13:09:12 2006
@@ -140,39 +140,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"));
+ }
- // 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"));
+ }
- // 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 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 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"));
+ }
- // Quotes not allowed in description
- if ((description != null) && (description.indexOf('"') > 0)) {
- errors.add("description",
- new ActionMessage("users.error.quotes"));
- }
- //}
return (errors);
}
Modified:
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java?view=diff&rev=466442&r1=466441&r2=466442
==============================================================================
---
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java
(original)
+++
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java
Sat Oct 21 13:09:12 2006
@@ -141,28 +141,23 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
- //if (submit != null) {
+ // groupname is a required field
+ if ((groupname == null) || (groupname.length() < 1)) {
+ errors.add("groupname",
+ new ActionMessage("users.error.groupname.required"));
+ }
- // groupname is a required field
- if ((groupname == null) || (groupname.length() < 1)) {
- errors.add("groupname",
- new
ActionMessage("users.error.groupname.required"));
- }
+ // Quotes not allowed in groupname
+ if ((groupname != null) && (groupname.indexOf('"') >= 0)) {
+ errors.add("groupname",
+ new ActionMessage("users.error.quotes"));
+ }
- // Quotes not allowed in groupname
- if ((groupname != null) && (groupname.indexOf('"') >= 0)) {
- errors.add("groupname",
- new ActionMessage("users.error.quotes"));
- }
-
- // Quotes not allowed in description
- if ((description != null) && (description.indexOf('"') > 0)) {
- errors.add("description",
- new ActionMessage("users.error.quotes"));
- }
-
- //}
+ // Quotes not allowed in description
+ if ((description != null) && (description.indexOf('"') > 0)) {
+ errors.add("description",
+ new ActionMessage("users.error.quotes"));
+ }
return (errors);
Modified:
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java?view=diff&rev=466442&r1=466441&r2=466442
==============================================================================
---
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java
(original)
+++
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java
Sat Oct 21 13:09:12 2006
@@ -101,28 +101,23 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
- //if (submit != null) {
+ // rolename is a required field
+ if ((rolename == null) || (rolename.length() < 1)) {
+ errors.add("rolename",
+ new ActionMessage("users.error.rolename.required"));
+ }
- // rolename is a required field
- if ((rolename == null) || (rolename.length() < 1)) {
- errors.add("rolename",
- new ActionMessage("users.error.rolename.required"));
- }
+ // Quotes not allowed in rolename
+ if ((rolename != null) && (rolename.indexOf('"') >= 0)) {
+ errors.add("rolename",
+ new ActionMessage("users.error.quotes"));
+ }
- // Quotes not allowed in rolename
- if ((rolename != null) && (rolename.indexOf('"') >= 0)) {
- errors.add("rolename",
- new ActionMessage("users.error.quotes"));
- }
-
- // Quotes not allowed in description
- if ((description != null) && (description.indexOf('"') > 0)) {
- errors.add("description",
- new ActionMessage("users.error.quotes"));
- }
-
- //}
+ // Quotes not allowed in description
+ if ((description != null) && (description.indexOf('"') > 0)) {
+ errors.add("description",
+ new ActionMessage("users.error.quotes"));
+ }
return (errors);
Modified:
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java?view=diff&rev=466442&r1=466441&r2=466442
==============================================================================
---
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java
(original)
+++
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java
Sat Oct 21 13:09:12 2006
@@ -177,40 +177,35 @@
ActionErrors errors = new ActionErrors();
- String submit = request.getParameter("submit");
- //if (submit != null) {
-
- // username is a required field
- if ((username == null) || (username.length() < 1)) {
- errors.add("username",
- new ActionMessage("users.error.username.required"));
- }
-
- // uassword is a required field
- if ((password == null) || (username.length() < 1)) {
- errors.add("password",
- new ActionMessage("users.error.password.required"));
- }
-
- // 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("description",
- new ActionMessage("users.error.quotes"));
- }
-
- // Quotes not allowed in fullName
- if ((fullName != null) && (fullName.indexOf('"') > 0)) {
- errors.add("fullName",
- new ActionMessage("users.error.quotes"));
- }
-
- //}
+ // username is a required field
+ if ((username == null) || (username.length() < 1)) {
+ errors.add("username",
+ new ActionMessage("users.error.username.required"));
+ }
+
+ // uassword is a required field
+ if ((password == null) || (username.length() < 1)) {
+ errors.add("password",
+ new ActionMessage("users.error.password.required"));
+ }
+
+ // 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("description",
+ new ActionMessage("users.error.quotes"));
+ }
+
+ // Quotes not allowed in fullName
+ if ((fullName != null) && (fullName.indexOf('"') > 0)) {
+ errors.add("fullName",
+ new ActionMessage("users.error.quotes"));
+ }
return (errors);
Modified:
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java?view=diff&rev=466442&r1=466441&r2=466442
==============================================================================
---
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
(original)
+++
tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
Sat Oct 21 13:09:12 2006
@@ -80,16 +80,14 @@
// Identify the requested action
RequestDumperValveForm vform = (RequestDumperValveForm) form;
String adminAction = vform.getAdminAction();
- String vObjectName = vform.getObjectName();
String parent = vform.getParentObjectName();
String valveType = vform.getValveType();
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
- vObjectName = ValveUtil.createValve(parent, valveType,
- response, request, mapping,
- (ApplicationServlet) getServlet());
+ ValveUtil.createValve(parent, valveType, response, request,
mapping,
+ (ApplicationServlet) getServlet());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
