You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by yo...@apache.org on 2005/11/28 20:44:50 UTC

svn commit: r349479 - in /tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper: compiler/Validator.java resources/LocalStrings.properties resources/LocalStrings_es.properties resources/LocalStrings_fr.properties resources/LocalStrings_ja.properties

Author: yoavs
Date: Mon Nov 28 11:44:47 2005
New Revision: 349479

URL: http://svn.apache.org/viewcvs?rev=349479&view=rev
Log:
Bugzilla 37612: http://issues.apache.org/bugzilla/show_bug.cgi?id=37612

Modified:
    tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/Validator.java
    tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties
    tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties
    tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties
    tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties

Modified: tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/Validator.java
URL: http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/Validator.java?rev=349479&r1=349478&r2=349479&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/compiler/Validator.java Mon Nov 28 11:44:47 2005
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1531,7 +1531,7 @@
 		}
                 errMsg.append("<h3>");
                 errMsg.append(Localizer.getMessage("jsp.error.tlv.invalid.page",
-						   tli.getShortName()));
+						   tli.getShortName(), compiler.getPageInfo().getJspFile()));
                 errMsg.append("</h3>");
                 for (int i=0; i<errors.length; i++) {
 		    if (errors[i] != null) {

Modified: tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties
URL: http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties?rev=349479&r1=349478&r2=349479&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties (original)
+++ tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings.properties Mon Nov 28 11:44:47 2005
@@ -267,7 +267,7 @@
 jspc.error.emptyWebApp=-webapp requires a trailing file argument
 jsp.error.library.invalid=JSP page is invalid according to library {0}: {1}
 jsp.error.tlvclass.instantiation=Failed to load or instantiate TagLibraryValidator class: {0}
-jsp.error.tlv.invalid.page=Validation error messages from TagLibraryValidator for {0}
+jsp.error.tlv.invalid.page=Validation error messages from TagLibraryValidator for {0} in {1}
 jsp.error.tei.invalid.attributes=Validation error messages from TagExtraInfo for {0}
 jsp.parser.sax.propertynotsupported=SAX property not supported: {0}
 jsp.parser.sax.propertynotrecognized=SAX property not recognized: {0}

Modified: tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties
URL: http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties?rev=349479&r1=349478&r2=349479&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties (original)
+++ tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_es.properties Mon Nov 28 11:44:47 2005
@@ -267,7 +267,7 @@
 jspc.error.emptyWebApp=-webapp necesita un argumento de archivo
 jsp.error.library.invalid=La página JSP es incorrecta de acuerdo a la biblioteca {0}: {1}
 jsp.error.tlvclass.instantiation=No pude cargar o instanciar clase TagLibraryValidator: {0}
-jsp.error.tlv.invalid.page=Mensajes de error de validación desde TagLibraryValidator para {0}
+jsp.error.tlv.invalid.page=Mensajes de error de validación desde TagLibraryValidator para {0} in {1}
 jsp.error.tei.invalid.attributes=Mensajes de error de validación desde TagExtraInfo para {0}
 jsp.parser.sax.propertynotsupported=Propiedad SAX no soportada: {0}
 jsp.parser.sax.propertynotrecognized=Propiedad SAX no reconocida: {0}

Modified: tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties
URL: http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties?rev=349479&r1=349478&r2=349479&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties (original)
+++ tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_fr.properties Mon Nov 28 11:44:47 2005
@@ -218,7 +218,7 @@
 jspc.error.emptyWebApp=-webapp nécessite à sa suite un argument fichier
 jsp.error.library.invalid=La page JSP page est incorrecte d''après la librairie {0}: {1}
 jsp.error.tlvclass.instantiation=Impossible de charger ou d''instancier la classe TagLibraryValidator: {0}
-jsp.error.tlv.invalid.page=Message d''erreurs de validation provenant du TagLibraryValidator pour {0}
+jsp.error.tlv.invalid.page=Message d''erreurs de validation provenant du TagLibraryValidator pour {0} en {1}
 jsp.error.tei.invalid.attributes=Message d''erreurs de validation provenant du TagExtraInfo pour {0}
 jsp.parser.sax.propertynotsupported=Propriété SAX non supportée: {0}
 jsp.parser.sax.propertynotrecognized=Propriété SAX non reconnue: {0}

Modified: tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties
URL: http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties?rev=349479&r1=349478&r2=349479&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties (original)
+++ tomcat/jasper/tc5.5.x/jasper2/src/share/org/apache/jasper/resources/LocalStrings_ja.properties Mon Nov 28 11:44:47 2005
@@ -263,7 +263,7 @@
 jspc.error.emptyWebApp=-webapp\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u306f\u3001\u30d5\u30a1\u30a4\u30eb\u5f15\u6570\u304c\u5fc5\u8981\u3067\u3059
 jsp.error.library.invalid=\u30e9\u30a4\u30d6\u30e9\u30ea{0}\u306b\u5f93\u3046\u3068JSP\u30da\u30fc\u30b8\u306f\u7121\u52b9\u3067\u3059: {1}
 jsp.error.tlvclass.instantiation=TagLibraryValidator\u30af\u30e9\u30b9\u306e\u30ed\u30fc\u30c9\u53c8\u306f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}
-jsp.error.tlv.invalid.page={0} \u306b\u5bfe\u3059\u308bTagLibraryValidator\u306e\u691c\u8a3c\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3067\u3059
+jsp.error.tlv.invalid.page={0} \u306b\u5bfe\u3059\u308bTagLibraryValidator\u306e\u691c\u8a3c\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3067\u3059 ({1})
 jsp.error.tei.invalid.attributes={0} \u306b\u5bfe\u3059\u308bTagExtraInfo\u304b\u3089\u306e\u691c\u8a3c\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3067\u3059
 jsp.parser.sax.propertynotsupported=SAX\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093: {0}
 jsp.parser.sax.propertynotrecognized=SAX\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u8a8d\u8b58\u3055\u308c\u307e\u305b\u3093: {0}



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org