amyroh 2003/03/25 00:29:06
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
ContextForm.java SaveContextAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext
AddDefaultContextAction.java
SaveDefaultContextAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
AliasForm.java HostForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
LoggerForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
JDBCRealmForm.java JNDIRealmForm.java
MemoryRealmForm.java UserDatabaseRealmForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
DataSourceForm.java EnvEntryForm.java
MailSessionForm.java ResourceLinkForm.java
UserDatabaseForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server
ServerForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
ServiceForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
GroupForm.java RoleForm.java UserForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
AccessLogValveForm.java RemoteAddrValveForm.java
RemoteHostValveForm.java
webapps/admin/host host.jsp
webapps/admin/service service.jsp
Log:
Fix validation.
Revision Changes Path
1.3 +7 -8
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectorForm.java 21 Mar 2003 08:19:13 -0000 1.2
+++ ConnectorForm.java 25 Mar 2003 08:29:04 -0000 1.3
@@ -727,13 +727,12 @@
public ActionErrors validate(ActionMapping mapping,
HttpServletRequest request) {
-
+
errors = new ActionErrors();
String submit = request.getParameter("submit");
-
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
/* general */
numberCheck("acceptCountText", acceptCountText, true, 0, 128);
@@ -779,7 +778,7 @@
// supported only by Coyote HTTP and HTTPS connectors
if (!("AJP".equalsIgnoreCase(connectorType)))
numberCheck("proxyPortText", proxyPortText, true, 0, 65535);
- }
+ //}
return errors;
}
1.3 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
Index: ContextForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextForm.java 8 Dec 2002 13:42:10 -0000 1.2
+++ ContextForm.java 25 Mar 2003 08:29:04 -0000 1.3
@@ -790,7 +790,7 @@
String submit = request.getParameter("submit");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
// docBase cannot be null
if ((docBase == null) || (docBase.length() < 1)) {
@@ -818,7 +818,7 @@
//if ((mgrSessionIDInit == null) || (mgrSessionIDInit.length() < 1)) {
// errors.add("mgrSessionIDInit", new
ActionError("error.mgrSessionIDInit.required"));
//}
- }
+ //}
return errors;
}
1.8 +4 -12
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
Index: SaveContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SaveContextAction.java 24 Mar 2003 09:17:01 -0000 1.7
+++ SaveContextAction.java 25 Mar 2003 08:29:04 -0000 1.8
@@ -196,14 +196,6 @@
Object values[] = null;
try {
- String docBase = cform.getDocBase();
- if ((docBase == null) || (docBase.length() < 1)) {
- ActionErrors errors = new ActionErrors();
- errors.add("docBase",
- new ActionError("error.docBase.required"));
- saveErrors(request, errors);
- return (new ActionForward(mapping.getInput()));
- }
// get the parent host name
String parentName = cform.getParentObjectName();
ObjectName honame = new ObjectName(parentName);
1.5 +14 -13
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/AddDefaultContextAction.java
Index: AddDefaultContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/AddDefaultContextAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AddDefaultContextAction.java 18 Mar 2003 10:48:17 -0000 1.4
+++ AddDefaultContextAction.java 25 Mar 2003 08:29:04 -0000 1.5
@@ -129,14 +129,13 @@
String service = request.getParameter("serviceName");
String parent = request.getParameter("parent");
String defaultContext = null;
- int index = parent.indexOf(":");
- String domain = parent.substring(0,index);
+ String domain = null;
if (service != null) {
+ domain = service.substring(0,service.indexOf(":"));
defaultContext = domain + TomcatTreeBuilder.DEFAULTCONTEXT_TYPE;
- parent = domain + TomcatTreeBuilder.SERVICE_TYPE +
- ",name=" + service;
- defaultContextFm.setParentObjectName(parent);
+ defaultContextFm.setParentObjectName(service);
} else if (parent != null) {
+ domain = parent.substring(0,parent.indexOf(":"));
defaultContextFm.setParentObjectName(parent);
int position = parent.indexOf(",");
defaultContext = domain + TomcatTreeBuilder.DEFAULTCONTEXT_TYPE +
@@ -144,10 +143,12 @@
}
defaultContextFm.setObjectName(defaultContext);
int position = defaultContext.indexOf(",");
- String loader = domain + TomcatTreeBuilder.LOADER_TYPE +
- defaultContext.substring(position, defaultContext.length());
- String manager = domain + TomcatTreeBuilder.MANAGER_TYPE +
- defaultContext.substring(position, defaultContext.length());
+ String loader = domain + TomcatTreeBuilder.LOADER_TYPE;
+ String manager = domain + TomcatTreeBuilder.MANAGER_TYPE;
+ if (position > 0) {
+ loader += defaultContext.substring(position, defaultContext.length());
+ manager += defaultContext.substring(position, defaultContext.length());
+ }
defaultContextFm.setLoaderObjectName(loader);
defaultContextFm.setManagerObjectName(manager);
defaultContextFm.setNodeLabel("");
1.7 +5 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.java
Index: SaveDefaultContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SaveDefaultContextAction.java 20 Mar 2003 05:40:09 -0000 1.6
+++ SaveDefaultContextAction.java 25 Mar 2003 08:29:04 -0000 1.7
@@ -205,8 +205,7 @@
",host=" + host);
} else {
oname = new ObjectName(domain +
- TomcatTreeBuilder.DEFAULTCONTEXT_TYPE +
- ",service=" +
poname.getKeyProperty("name"));
+ TomcatTreeBuilder.DEFAULTCONTEXT_TYPE);
}
if (mBServer.isRegistered(oname)) {
1.2 +7 -7
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java
Index: AliasForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AliasForm.java 18 Jul 2002 16:48:25 -0000 1.1
+++ AliasForm.java 25 Mar 2003 08:29:04 -0000 1.2
@@ -197,14 +197,14 @@
String submit = request.getParameter("submit");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
- // hostName cannot be null
+ // aliasName cannot be null
if ((aliasName== null) || (aliasName.length() < 1)) {
errors.add("aliasName", new
ActionError("error.aliasName.required"));
}
- }
+ //}
return errors;
}
1.5 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java
Index: HostForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HostForm.java 21 Mar 2003 08:19:14 -0000 1.4
+++ HostForm.java 25 Mar 2003 08:29:04 -0000 1.5
@@ -540,7 +540,7 @@
String submit = request.getParameter("submit");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
// hostName cannot be null
if ((hostName== null) || (hostName.length() < 1)) {
@@ -552,7 +552,7 @@
errors.add("appBase", new ActionError("error.appBase.required"));
}
- }
+ //}
return errors;
}
1.2 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java
Index: LoggerForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggerForm.java 18 Jul 2002 16:48:25 -0000 1.1
+++ LoggerForm.java 25 Mar 2003 08:29:05 -0000 1.2
@@ -489,8 +489,8 @@
// front end validation when save is clicked.
// these checks should be done only if it is FileLogger.
// No checks needed otherwise
- if ((submit != null)
- && ("FileLogger").equalsIgnoreCase(type)) {
+ //if ((submit != null) &&
+ if (("FileLogger").equalsIgnoreCase(type)) {
if ((directory == null) || (directory.length() < 1)) {
errors.add("directory",
1.2 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java
Index: JDBCRealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDBCRealmForm.java 18 Jul 2002 16:48:25 -0000 1.1
+++ JDBCRealmForm.java 25 Mar 2003 08:29:05 -0000 1.2
@@ -408,7 +408,7 @@
//String type = request.getParameter("realmType");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
// the following fields are required.
if ((driver == null) || (driver.length() < 1)) {
@@ -455,7 +455,7 @@
errors.add("connectionURL",
new ActionError("error.connectionURL.required"));
}
- }
+ //}
return errors;
}
1.4 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java
Index: JNDIRealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JNDIRealmForm.java 16 Aug 2002 23:24:45 -0000 1.3
+++ JNDIRealmForm.java 25 Mar 2003 08:29:05 -0000 1.4
@@ -555,7 +555,7 @@
String submit = request.getParameter("submit");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
// the following fields are required.
if ((connectionURL == null) || (connectionURL.length() < 1)) {
@@ -638,7 +638,7 @@
errors.add("contextFactory",
new ActionError("error.contextFactory.required"));
} */
- }
+ //}
return errors;
}
1.2 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java
Index: MemoryRealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MemoryRealmForm.java 18 Jul 2002 16:48:24 -0000 1.1
+++ MemoryRealmForm.java 25 Mar 2003 08:29:05 -0000 1.2
@@ -162,12 +162,12 @@
String submit = request.getParameter("submit");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
if ((pathName == null) || (pathName.length()<1)) {
errors.add("pathName",
new ActionError("error.pathName.required"));
}
- }
+ //}
return errors;
}
}
1.2 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java
Index: UserDatabaseRealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserDatabaseRealmForm.java 18 Jul 2002 16:48:24 -0000 1.1
+++ UserDatabaseRealmForm.java 25 Mar 2003 08:29:05 -0000 1.2
@@ -163,12 +163,12 @@
String submit = request.getParameter("submit");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
if ((resource == null) || (resource.length() < 1)) {
errors.add("resource",
new ActionError("error.resource.required"));
}
- }
+ //}
return errors;
}
}
1.3 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java
Index: DataSourceForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataSourceForm.java 23 Mar 2003 02:10:26 -0000 1.2
+++ DataSourceForm.java 25 Mar 2003 08:29:05 -0000 1.3
@@ -342,7 +342,7 @@
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
// url is a required field
if ((url == null) || (url.length() < 1)) {
@@ -391,7 +391,7 @@
errors.add("password",
new ActionError("users.error.quotes"));
}
- }
+ //}
return (errors);
}
1.3 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
Index: EnvEntryForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EnvEntryForm.java 23 Mar 2003 02:10:26 -0000 1.2
+++ EnvEntryForm.java 25 Mar 2003 08:29:05 -0000 1.3
@@ -307,7 +307,7 @@
errors = new ActionErrors();
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
// name is a required field
if ((name == null) || (name.length() < 1)) {
@@ -346,7 +346,7 @@
errors.add("value",
new ActionError("resources.error.value.mismatch"));
}
- }
+ //}
return (errors);
}
1.3 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
Index: MailSessionForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailSessionForm.java 23 Mar 2003 02:10:26 -0000 1.2
+++ MailSessionForm.java 25 Mar 2003 08:29:05 -0000 1.3
@@ -239,14 +239,14 @@
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
// mailSmtpHost is a required field
if ((mailhost == null) || (mailhost.length() < 1)) {
errors.add("mailhost",
new ActionError("resources.error.mailhost.required"));
}
- }
+ //}
return (errors);
}
1.3 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
Index: ResourceLinkForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceLinkForm.java 23 Mar 2003 02:10:27 -0000 1.2
+++ ResourceLinkForm.java 25 Mar 2003 08:29:05 -0000 1.3
@@ -239,7 +239,7 @@
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
// name is a required field
if ((name == null) || (name.length() < 1)) {
@@ -259,7 +259,7 @@
new ActionError("resources.error.type.required"));
}
- }
+ //}
return (errors);
1.2 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
Index: UserDatabaseForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserDatabaseForm.java 18 Jul 2002 16:48:27 -0000 1.1
+++ UserDatabaseForm.java 25 Mar 2003 08:29:05 -0000 1.2
@@ -193,7 +193,7 @@
errors = new ActionErrors();
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
// name is a required field
if ((name == null) || (name.length() < 1)) {
@@ -224,7 +224,7 @@
errors.add("description",
new ActionError("users.error.quotes"));
}
- }
+ //}
return (errors);
}
1.3 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java
Index: ServerForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerForm.java 20 Mar 2003 05:40:10 -0000 1.2
+++ ServerForm.java 25 Mar 2003 08:29:05 -0000 1.3
@@ -253,7 +253,7 @@
ActionErrors errors = new ActionErrors();
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
// check for portNumber -- must not be blank, must be in
// the range 1 to 65535.
@@ -279,7 +279,7 @@
errors.add("shutdownText",
new ActionError("error.shutdownText.length"));
- }
+ //}
return errors;
1.3 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java
Index: ServiceForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceForm.java 20 Mar 2003 05:40:11 -0000 1.2
+++ ServiceForm.java 25 Mar 2003 08:29:05 -0000 1.3
@@ -435,7 +435,7 @@
ActionErrors errors = new ActionErrors();
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
if ((serviceName == null) || (serviceName.length() < 1)) {
errors.add("serviceName",
@@ -447,7 +447,7 @@
new ActionError("error.engineName.required"));
}
- }
+ //}
return errors;
}
1.2 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java
Index: GroupForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GroupForm.java 18 Jul 2002 16:48:22 -0000 1.1
+++ GroupForm.java 25 Mar 2003 08:29:05 -0000 1.2
@@ -166,7 +166,7 @@
ActionErrors errors = new ActionErrors();
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
// groupname is a required field
if ((groupname == null) || (groupname.length() < 1)) {
@@ -186,7 +186,7 @@
new ActionError("users.error.quotes"));
}
- }
+ //}
return (errors);
1.2 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java
Index: RoleForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RoleForm.java 18 Jul 2002 16:48:22 -0000 1.1
+++ RoleForm.java 25 Mar 2003 08:29:05 -0000 1.2
@@ -148,7 +148,7 @@
ActionErrors errors = new ActionErrors();
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
// rolename is a required field
if ((rolename == null) || (rolename.length() < 1)) {
@@ -168,7 +168,7 @@
new ActionError("users.error.quotes"));
}
- }
+ //}
return (errors);
1.2 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java
Index: UserForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserForm.java 18 Jul 2002 16:48:22 -0000 1.1
+++ UserForm.java 25 Mar 2003 08:29:05 -0000 1.2
@@ -198,7 +198,7 @@
ActionErrors errors = new ActionErrors();
String submit = request.getParameter("submit");
- if (submit != null) {
+ //if (submit != null) {
// username is a required field
if ((username == null) || (username.length() < 1)) {
@@ -230,7 +230,7 @@
new ActionError("users.error.quotes"));
}
- }
+ //}
return (errors);
1.3 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
Index: AccessLogValveForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AccessLogValveForm.java 22 Nov 2002 22:24:56 -0000 1.2
+++ AccessLogValveForm.java 25 Mar 2003 08:29:05 -0000 1.3
@@ -356,7 +356,7 @@
String submit = request.getParameter("submit");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
// if not specified, default is access_log.
// to specify no prefix, specify a 0 length string...
@@ -379,7 +379,7 @@
errors.add("pattern",
new ActionError("error.pattern.required"));
}
- }
+ //}
return errors;
}
1.4 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java
Index: RemoteAddrValveForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoteAddrValveForm.java 12 Feb 2003 11:47:41 -0000 1.3
+++ RemoteAddrValveForm.java 25 Mar 2003 08:29:05 -0000 1.4
@@ -206,7 +206,7 @@
String submit = request.getParameter("submit");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
// validate allow/deny patterns
if ((allow == null) || (allow.length() < 1)) {
if ((deny == null) || (deny.length() < 1)) {
@@ -214,7 +214,7 @@
new ActionError("error.allow.deny.required"));
}
}
- }
+ //}
try {
allows = ValveUtil.precalculate(allow);
1.4 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java
Index: RemoteHostValveForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoteHostValveForm.java 12 Feb 2003 11:47:41 -0000 1.3
+++ RemoteHostValveForm.java 25 Mar 2003 08:29:05 -0000 1.4
@@ -205,7 +205,7 @@
String submit = request.getParameter("submit");
// front end validation when save is clicked.
- if (submit != null) {
+ //if (submit != null) {
// TBD
// validate allow/deny IPs
if ((allow == null) || (allow.length() < 1)) {
@@ -214,7 +214,7 @@
new ActionError("error.allow.deny.required"));
}
}
- }
+ //}
try {
allows = ValveUtil.precalculate(allow);
1.8 +3 -2 jakarta-tomcat-catalina/webapps/admin/host/host.jsp
Index: host.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/host.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- host.jsp 3 Feb 2003 23:16:52 -0000 1.7
+++ host.jsp 25 Mar 2003 08:29:06 -0000 1.8
@@ -70,10 +70,11 @@
<bean:message key="actions.contexts.deletes"/>
</controls:action>
<controls:action disabled="true"> -------------------------------------
</controls:action>
- <controls:action url='<%= "/AddDefaultContext.do?parent=" +
+ <!--FIXME add/remove defaultcontext-->
+ <!--controls:action url='<%= "/AddDefaultContext.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.defaultcontexts.create"/>
- </controls:action>
+ </controls:action-->
<!--controls:action url='<%= "/DeleteDefaultContext.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.defaultcontexts.deletes"/>
1.7 +3 -2 jakarta-tomcat-catalina/webapps/admin/service/service.jsp
Index: service.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/service/service.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- service.jsp 23 Mar 2003 02:10:30 -0000 1.6
+++ service.jsp 25 Mar 2003 08:29:06 -0000 1.7
@@ -64,10 +64,11 @@
<controls:action>
-------------------------------------
</controls:action>
- <controls:action url='<%= "/AddDefaultContext.do?serviceName=" +
+ <!-- FIXME add/remove defaultcontext-->
+ <!--controls:action url='<%= "/AddDefaultContext.do?serviceName=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.defaultcontexts.create"/>
- </controls:action>
+ </controls:action-->
<!--controls:action url='<%= "/DeleteDefaultContext.do?serviceName=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.defaultcontexts.deletes"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
