tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Parser.java
Date Wed, 26 Feb 2003 17:10:49 GMT
luehe       2003/02/26 09:10:49

  Modified:    jasper2/src/share/org/apache/jasper/resources
                        messages.properties
               jasper2/src/share/org/apache/jasper/compiler Parser.java
  Log:
  Fixed 17394: Misleading error message generated when jsp:output is
  used in an invalid context
  
  Revision  Changes    Path
  1.101     +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.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- messages.properties	26 Feb 2003 01:57:30 -0000	1.100
  +++ messages.properties	26 Feb 2003 17:10:48 -0000	1.101
  @@ -356,6 +356,7 @@
   jsp.error.xml.invalidHighSurrogate = High surrogate bits in UTF-8 sequence must not exceed
0x10 but found 0x{0}.
   jsp.error.multiple.jspoutput = Cannot have multiple occurrences of <jsp:output>
   jsp.error.jspoutput.nonemptybody=<jsp:output> must not have a body
  +jsp.error.jspoutput.invalidUse=<jsp:output> must not be used in standard
syntax
   jsp.error.attributes.not.allowed = {0} must not have any attributes
   jsp.error.tagfile.badSuffix=Missing \".tag\" suffix in tag file path {0}
   jsp.error.tagfile.illegalPath=Illegal tag file path: {0}, must start with \"/WEB-INF/tags\"
or \"/META-INF/tags\"
  
  
  
  1.64      +5 -3      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Parser.java	24 Feb 2003 23:43:59 -0000	1.63
  +++ Parser.java	26 Feb 2003 17:10:48 -0000	1.64
  @@ -1266,6 +1266,8 @@
   	    err.jspError(start, "jsp.error.params.invalidUse");
   	} else if (reader.matches(PARAM_ACTION)) {
   	    err.jspError(start, "jsp.error.param.invalidUse");
  +	} else if (reader.matches(OUTPUT_ACTION)) {
  +	    err.jspError(start, "jsp.error.jspoutput.invalidUse");
   	} else {
   	    err.jspError(start, "jsp.error.badStandardAction");
   	}
  
  
  

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


Mime
View raw message