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/resources messages.properties
Date Thu, 12 Dec 2002 22:57:43 GMT
luehe       2002/12/12 14:57:43

  Modified:    jasper2/src/share/org/apache/jasper/compiler Parser.java
               jasper2/src/share/org/apache/jasper/resources
                        messages.properties
  Log:
  Fixed 15338: jsp:params action used outside of the expected context yields misleading error
message.
  
  Revision  Changes    Path
  1.45      +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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Parser.java	12 Dec 2002 03:30:58 -0000	1.44
  +++ Parser.java	12 Dec 2002 22:57:43 -0000	1.45
  @@ -1196,6 +1196,8 @@
   	    parsePlugin(parent);
   	} else if (reader.matches("element")) {
   	    parseElement(parent);
  +	} else if (reader.matches("params")) {
  +	    err.jspError(start, "jsp.error.params.invalidUse");
   	} else if (reader.matches("param")) {
   	    err.jspError(start, "jsp.error.param.invalidUse");
   	} else {
  
  
  
  1.70      +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.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- messages.properties	12 Dec 2002 22:30:30 -0000	1.69
  +++ messages.properties	12 Dec 2002 22:57:43 -0000	1.70
  @@ -104,6 +104,7 @@
   jsp.error.overflow=Error: JSP Buffer overflow
   jsp.error.paramexpected=Expected \"param\" tag with \"name\" and \"value\" attributes
   jsp.error.param.invalidUse=The jsp:param action must not be used outside the jsp:include,
jsp:forward, or jsp:params elements
  +jsp.error.params.invalidUse=The jsp:params action must be a direct child of jsp:plugin
   jsp.error.closeindividualparam=param tag needs to be closed with \"/>\"
   jsp.error.closeparams=param tag needs to be closed with /params
   jsp.error.plugin.notype=type not declared in jsp:plugin
  
  
  

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


Mime
View raw message