tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources messages.properties
Date Thu, 16 May 2002 19:31:37 GMT
kinman      02/05/16 12:31:36

  Modified:    jasper/src/share/org/apache/jasper/compiler Tag:
                        tomcat_40_branch TagLibraryInfoImpl.java
               jasper/src/share/org/apache/jasper/resources Tag:
                        tomcat_40_branch messages.properties
  Log:
  - Fixed 5793.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.23.2.3  +14 -3     jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
  
  Index: TagLibraryInfoImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
  retrieving revision 1.23.2.2
  retrieving revision 1.23.2.3
  diff -u -r1.23.2.2 -r1.23.2.3
  --- TagLibraryInfoImpl.java	12 Dec 2001 18:47:24 -0000	1.23.2.2
  +++ TagLibraryInfoImpl.java	16 May 2002 19:31:36 -0000	1.23.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.23.2.2 2001/12/12 18:47:24 kinman Exp $
  - * $Revision: 1.23.2.2 $
  - * $Date: 2001/12/12 18:47:24 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.23.2.3 2002/05/16 19:31:36 kinman Exp $
  + * $Revision: 1.23.2.3 $
  + * $Date: 2002/05/16 19:31:36 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -415,6 +415,17 @@
                                     );
               }
   
  +        // JSP.C1: It is a (translation time) error for an action that
  +	// has one or more variable subelements to have a TagExtraInfo
  +	// class that returns a non-null object.
  +
  +	if (tei != null && variableVector.size() != 0) {
  +	    throw new JasperException(
  +                          Constants.getString(
  +                              "jsp.warning.teiclass.is.nonnull",
  +                              new Object[] {teiclass}));
  +        }
  +	
           TagInfo taginfo = new TagInfo(name, tagclass, bodycontent,
                                         info, this, 
                                         tei,
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.7  +2 -1      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties
  
  Index: messages.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
  retrieving revision 1.20.2.6
  retrieving revision 1.20.2.7
  diff -u -r1.20.2.6 -r1.20.2.7
  --- messages.properties	6 May 2002 23:35:28 -0000	1.20.2.6
  +++ messages.properties	16 May 2002 19:31:36 -0000	1.20.2.7
  @@ -1,4 +1,4 @@
  -# $Id: messages.properties,v 1.20.2.6 2002/05/06 23:35:28 kinman Exp $
  +# $Id: messages.properties,v 1.20.2.7 2002/05/16 19:31:36 kinman Exp $
   #
   # Default localized string information
   # Localized this the Default Locale as is en_US
  @@ -122,6 +122,7 @@
   jsp.warning.unknown.element.in.attribute=Warning: Unknown element {0} in attribute
   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 susbelement defined in tld when TagExtraInfo class
{0} is non-null
   jsp.error.parse.error.in.TLD=Parse Error in the tag library descriptor: {0}
   jsp.error.unable.to.open.TLD=Unable to open the tag library descriptor: {0}
   jsp.buffer.size.zero=Buffer size <= 0
  
  
  

--
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