luehe 2002/07/08 10:28:58 Modified: jasper2/src/share/org/apache/jasper/compiler JspDocumentParser.java Validator.java jasper2/src/share/org/apache/jasper/resources messages.properties messages_es.properties Log: Minor compliance fix and some resource bundle key fixes (Patch provided by Ryan Lubke) Revision Changes Path 1.4 +12 -3 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JspDocumentParser.java 20 Jun 2002 23:02:16 -0000 1.3 +++ JspDocumentParser.java 8 Jul 2002 17:28:58 -0000 1.4 @@ -434,6 +434,15 @@ // 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()); 1.11 +12 -12 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java Index: Validator.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Validator.java 20 Jun 2002 23:48:23 -0000 1.10 +++ Validator.java 8 Jul 2002 17:28:58 -0000 1.11 @@ -138,14 +138,14 @@ if ("language".equals(attr)) { if (languageSeen) - err.jspError(n, "jsp.error.language.multiple"); + err.jspError(n, "jsp.error.page.multiple.language"); languageSeen = true; if (!"java".equalsIgnoreCase(value)) err.jspError(n, "jsp.error.language.nonjava"); pageInfo.setLanguage(value); } else if ("extends".equals(attr)) { if (extendsSeen) - err.jspError(n, "jsp.error.extends.multiple"); + err.jspError(n, "jsp.error.page.multiple.extends"); extendsSeen = true; pageInfo.setExtends(value); /* @@ -158,7 +158,7 @@ n.addImport(value); } else if ("contentType".equals(attr)) { if (contentTypeSeen) - err.jspError(n, "jsp.error.contentType.multiple"); + err.jspError(n, "jsp.error.page.multiple.contenttypes"); contentTypeSeen = true; pageInfo.setContentType(value); } else if ("session".equals(attr)) { @@ -173,7 +173,7 @@ err.jspError(n, "jsp.error.session.invalid"); } else if ("buffer".equals(attr)) { if (bufferSeen) - err.jspError(n, "jsp.error.buffer.multiple"); + err.jspError(n, "jsp.error.page.multiple.buffer"); bufferSeen = true; if ("none".equalsIgnoreCase(value)) @@ -192,7 +192,7 @@ } } else if ("autoFlush".equals(attr)) { if (autoFlushSeen) - err.jspError(n, "jsp.error.autoFlush.multiple"); + err.jspError(n, "jsp.error.page.multiple.autoflush"); autoFlushSeen = true; if ("true".equalsIgnoreCase(value)) pageInfo.setAutoFlush(true); @@ -202,7 +202,7 @@ err.jspError(n, "jsp.error.autoFlush.invalid"); } else if ("isthreadSafe".equals(attr)) { if (isThreadSafeSeen) - err.jspError(n, "jsp.error.isThreadSafe.multiple"); + err.jspError(n, "jsp.error.page.multiple.threadsafe"); isThreadSafeSeen = true; if ("true".equalsIgnoreCase(value)) pageInfo.setThreadSafe(true); @@ -212,7 +212,7 @@ err.jspError(n, "jsp.error.isThreadSafe.invalid"); } else if ("isErrorPage".equals(attr)) { if (isErrorPageSeen) - err.jspError(n, "jsp.error.isErrorPage.multiple"); + err.jspError(n, "jsp.error.page.multiple.iserrorpage"); isErrorPageSeen = true; if ("true".equalsIgnoreCase(value)) pageInfo.setIsErrorPage(true); @@ -222,7 +222,7 @@ err.jspError(n, "jsp.error.isErrorPage.invalid"); } else if ("errorPage".equals(attr)) { if (errorPageSeen) - err.jspError(n, "jsp.error.errorPage.multiple"); + err.jspError(n, "jsp.error.page.multiple.errorpage"); errorPageSeen = true; pageInfo.setErrorPage(value); } else if ("info".equals(attr)) { @@ -231,7 +231,7 @@ infoSeen = true; } else if ("pageEncoding".equals(attr)) { if (pageEncodingSeen) - err.jspError(n, "jsp.error.pageEncoding.multiple"); + err.jspError(n, "jsp.error.page.multiple.pageencoding"); pageEncodingSeen = true; pageInfo.setPageEncoding(value); } 1.9 +2 -1 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- messages.properties 26 Jun 2002 16:50:38 -0000 1.8 +++ messages.properties 8 Jul 2002 17:28:58 -0000 1.9 @@ -125,6 +125,7 @@ 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 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- messages_es.properties 26 Jun 2002 16:50:38 -0000 1.2 +++ messages_es.properties 8 Jul 2002 17:28:58 -0000 1.3 @@ -106,6 +106,7 @@ 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]>