manveen 02/04/28 18:07:53
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
ContextForm.java
Log:
Minor bug fixes while testing context.
* check that path begins with '/'
* validate with appropriate error message if context already exists.
Revision Changes Path
1.47 +2 -1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ApplicationResources_en.properties 27 Apr 2002 01:05:03 -0000 1.46
+++ ApplicationResources_en.properties 29 Apr 2002 01:07:53 -0000 1.47
@@ -192,7 +192,8 @@
error.realmName.required=<li>Realm Name required.</li>
error.realmName.exists=<li>A realm already exists.</li>
error.contextName.bad=Invalid context name {0}
-error.adminContext.delete=<li>Cannot delete admin context</li>
+error.contextName.exists=<li>Context already exists.</li>
+error.path.prefix=<li>Path must begin with a '/'.</li>
error.loaderName.bad=Invalid loader name {0}
error.managerName.bad=Invalid manager name {0}
error.connectorName.bad=Invalid connector name {0}
1.41 +2 -1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ApplicationResources_es.properties 26 Apr 2002 03:39:04 -0000 1.40
+++ ApplicationResources_es.properties 29 Apr 2002 01:07:53 -0000 1.41
@@ -192,7 +192,8 @@
error.realmName.required=<li>Realm nombre requiredo</li>
error.realmName.exists=<li>Realm ya existe</li>
error.contextName.bad=Invalido context nombre {0}
-error.adminContext.delete=<li>No puede suprimir contexto del admin</li>
+error.contextName.exists=<li>Context ya existe.</li>
+error.path.prefix=<li>La path debe comenzar con un '/'.</li>
error.loaderName.bad=Invalido loader nombre {0}
error.managerName.bad=Invalido manager nombre {0}
error.connectorName.bad=Invalido connector nombre {0}
1.5 +7 -9
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
Index: ContextForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContextForm.java 26 Mar 2002 00:04:44 -0000 1.4
+++ ContextForm.java 29 Apr 2002 01:07:53 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.4 2002/03/26 00:04:44 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/03/26 00:04:44 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.5 2002/04/29 01:07:53 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/29 01:07:53 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
* Form bean for the context page.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/03/26 00:04:44 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/29 01:07:53 $
*/
public final class ContextForm extends ActionForm {
@@ -769,12 +769,10 @@
errors.add("docBase", new ActionError("error.docBase.required"));
}
- /* FIXME - zero length path ok on the root context
- if ((path == null) || (path.length() < 1)) {
- errors.add("path", new ActionError("error.path.required"));
+ if (!path.startsWith("/")) {
+ errors.add("path", new ActionError("error.path.prefix"));
}
- */
-
+
if ((workDir == null) || (workDir.length() < 1)) {
errors.add("workDir", new ActionError("error.workDir.required"));
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
