tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@hyperreal.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/jasper/resources messages.properties
Date Wed, 27 Oct 1999 23:08:18 GMT
akv         99/10/27 16:08:17

  Modified:    src/share/org/apache/jasper/compiler Tag:
                        TOMCAT_J2EE_10F_102199 TagLibraries.java
               src/share/org/apache/jasper/resources Tag:
                        TOMCAT_J2EE_10F_102199 messages.properties
  Log:
  Fix to report invalid tag reference.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +16 -5     jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraries.java
  
  Index: TagLibraries.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraries.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- TagLibraries.java	1999/10/20 11:22:55	1.2
  +++ TagLibraries.java	1999/10/27 23:08:11	1.2.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraries.java,v
1.2 1999/10/20 11:22:55 akv Exp $
  - * $Revision: 1.2 $
  - * $Date: 1999/10/20 11:22:55 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraries.java,v
1.2.2.1 1999/10/27 23:08:11 akv Exp $
  + * $Revision: 1.2.2.1 $
  + * $Date: 1999/10/27 23:08:11 $
    *
    * ====================================================================
    * 
  @@ -68,6 +68,10 @@
   import javax.servlet.jsp.tagext.TagInfo;
   import javax.servlet.jsp.tagext.Tag;
   
  +import org.apache.jasper.Constants;
  +import org.apache.jasper.JasperException;
  +
  +
   /**
    * A container for all tag libraries that have been imported using
    * the taglib directive. 
  @@ -85,13 +89,20 @@
           tagLibInfos.put(prefix, tli);
       }
       
  -    public boolean isUserDefinedTag(String prefix, String shortTagName) {
  +    public boolean isUserDefinedTag(String prefix, String shortTagName) 
  +        throws JasperException
  +    {
           TagLibraryInfo tli = (TagLibraryInfo) tagLibInfos.get(prefix);
           if (tli == null)
               return false;
           else if (tli.getTag(shortTagName) != null)
               return true;
  -        return false;
  +        throw new JasperException(Constants.getString("jsp.error.bad_tag",
  +                                                      new Object[] {
  +                                                          shortTagName,
  +                                                          prefix
  +                                                      }
  +                                                      ));
       }
       
       public TagLibraryInfoImpl getTagLibInfo(String prefix) {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.2   +2 -1      jakarta-tomcat/src/share/org/apache/jasper/resources/messages.properties
  
  Index: messages.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/resources/messages.properties,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- messages.properties	1999/10/27 10:30:22	1.4.2.1
  +++ messages.properties	1999/10/27 23:08:14	1.4.2.2
  @@ -133,4 +133,5 @@
   jsp.error.unable.to_load_taghandler_class=Unable to load tag handler class {0} because
of {1}
   jsp.error.unable.to_find_method=Unable to find setter method for attribute: {0}
   jsp.error.unable.to_introspect=Unable to introspect on tag handler class: {0} because of
{1}
  -jsp.error.invalid_attributes=Attributes are invalid according to TagInfo
  \ No newline at end of file
  +jsp.error.invalid_attributes=Attributes are invalid according to TagInfo
  +jsp.error.bad_tag=No such tag {0} in the tag library imported with prefix {1}
  \ No newline at end of file
  
  
  

Mime
View raw message