luehe 2002/07/18 16:25:05
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch JspDocumentParser.java
jasper2/src/share/org/apache/jasper/resources Tag:
tomcat_4_branch messages.properties
messages_es.properties
Log:
Undid patch for Bug 10291, which turned out to be not a bug
Revision Changes Path
No revision
No revision
1.4.2.1 +3 -12
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- JspDocumentParser.java 8 Jul 2002 17:28:58 -0000 1.4
+++ JspDocumentParser.java 18 Jul 2002 23:25:05 -0000 1.4.2.1
@@ -434,15 +434,6 @@
// get the uri
String uri = attrs.getValue(i);
- /*
- * make sure that a relative path is prefixed with
- * urn:jsptld:path
- */
- if (uri.charAt(0) == '/') {
- throw new JasperException(
- err.getString("jsp.error.xml.taglib.uri.not_prefixed",
- uri));
- }
if (uri.startsWith(URN_JSPTLD)) {
// uri value is of the form "urn:jsptld:path"
uri = uri.substring(URN_JSPTLD.length());
No revision
No revision
1.9.2.1 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- messages.properties 8 Jul 2002 17:28:58 -0000 1.9
+++ messages.properties 18 Jul 2002 23:25:05 -0000 1.9.2.1
@@ -125,7 +125,6 @@
jsp.warning.unknown.element.in.TLD=Warning: Unknown element {0} in TLD
jsp.warning.unknown.element.in.tag=Warning: Unknown element {0} in tag
jsp.warning.unknown.element.in.attribute=Warning: Unknown element {0} in attribute
-jsp.error.xml.taglib.uri.not_prefixed=The relative URI \"{0}\" must be prefixed by
\"urn:jsptld:\"
jsp.error.more.than.one.taglib=More than one taglib in the TLD: {0}
jsp.warning.teiclass.is.null=Could not load TagExtraInfo class {0}: {1}
jsp.warning.teiclass.is.nonnull=variable subelement defined in tld when
TagExtraInfo class {0} is non-null
1.3.2.1 +1 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- messages_es.properties 8 Jul 2002 17:28:58 -0000 1.3
+++ messages_es.properties 18 Jul 2002 23:25:05 -0000 1.3.2.1
@@ -106,7 +106,6 @@
jsp.warning.unknown.element.in.TLD=Aviso: Elemento {0} desconocido en el TLD
jsp.warning.unknown.element.in.tag=Aviso: Elemento {0} desconocido en el tag
jsp.warning.unknown.element.in.attribute=Aviso: Elemento {0} desconocido en el
atributo
-jsp.error.xml.taglib.uri.not_prefixed=El URI relativo {0} se debe prefijar por
\"urn:jsptld:\"
jsp.error.more.than.one.taglib=Mas de una libreria de tags en el TLD: {0}
jsp.warning.teiclass.is.null=No se puedee cargar la clase TagExtraInfo llamada {0}:
{1}
jsp.error.parse.error.in.TLD=Error de analisis en el descriptor de libreria de
tags: {0}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
