tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pier...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
Date Sun, 29 Oct 2000 06:10:09 GMT
pierred     00/10/28 23:10:09

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        TagLibraryInfoImpl.java
  Log:
  Support for the following PFD changes:
  "- Added initialization parameters to TagLibraryInformation validation in TLD, adding a
     new <validator> element, renaming <validatorclass> to <validator-class>
for consistency,
     and adding <init-param> as in the Servlet web.xml descriptor.
   - Added method to pass the initialization parameters to the validator class and removed
the
     use of TagLibraryInfo. Added prefix and uri String arguments to validate() method."
  
  Revision  Changes    Path
  1.8       +78 -28    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TagLibraryInfoImpl.java	2000/10/29 05:12:56	1.7
  +++ TagLibraryInfoImpl.java	2000/10/29 06:10:08	1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.7 2000/10/29 05:12:56 pierred Exp $
  - * $Revision: 1.7 $
  - * $Date: 2000/10/29 05:12:56 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
1.8 2000/10/29 06:10:08 pierred Exp $
  + * $Revision: 1.8 $
  + * $Date: 2000/10/29 06:10:08 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -74,6 +74,7 @@
   import java.io.FileNotFoundException;
   import java.util.Vector;
   import java.util.Hashtable;
  +import java.util.Map;
   
   import javax.servlet.jsp.tagext.TagLibraryInfo;
   import javax.servlet.jsp.tagext.TagInfo;
  @@ -353,7 +354,6 @@
       private void parseTLD(String uri, InputStream in) 
           throws JasperException
       {
  -        String validatorclass = null;
   	tld = JspUtil.parseXMLDoc(uri, in);
           Vector tagVector = new Vector();
           NodeList list = tld.getElementsByTagName("taglib");
  @@ -389,10 +389,8 @@
                   Text t = (Text) e.getFirstChild();
                   if (t != null)
                       this.info = t.getData();
  -            } else if (tname.equals("validatorclass")) {
  -                Text t = (Text) e.getFirstChild();
  -                if (t != null)
  -                    validatorclass = t.getData().trim();
  +            } else if (tname.equals("validator")) {
  +		this.tagLibraryValidator = createValidator(e);
               } else if (tname.equals("tag"))
                   tagVector.addElement(createTagInfo(e));
               else {
  @@ -405,26 +403,6 @@
   	    }
           }
   
  -        // Setup the TagLibraryValidator object if the validatorclass tag
  -        // has been set for the library.
  -        
  -        TagLibraryValidator tlv = null;
  -        if (validatorclass != null && !validatorclass.equals("")) {
  -            try {
  -                Class tlvClass = 
  -		    ctxt.getClassLoader().loadClass(validatorclass);
  -                tlv = (TagLibraryValidator) tlvClass.newInstance();
  -                //@@@ removed in 1.2PFD tlv.setTagLibraryInfo(this);
  -                this.tagLibraryValidator = tlv;
  -            } catch (Exception ex) {
  -                Constants.message("jsp.warning.tlvclass.is.null",
  -				  new Object[] {
  -				      validatorclass, 
  -				      "EXCEPTION: " + ex.getMessage()
  -				  },
  -				  Logger.ERROR);
  -            }
  -        }
   
           this.tags = new TagInfo[tagVector.size()];
           tagVector.copyInto (this.tags);
  @@ -638,6 +616,78 @@
           }
           return new TagVariableInfo(nameGiven, nameFromAttribute,
   				   className, declare, scope);
  +    }
  +
  +    private TagLibraryValidator createValidator(Element elem) {
  +        String validatorClass = null;
  +	Map initParams = new Hashtable();
  +        
  +        NodeList list = elem.getChildNodes();
  +        for(int i=0; i<list.getLength(); i++) {
  +            Node tmp  = list.item(i);
  +	    if (!(tmp instanceof Element)) continue;
  +	    Element e = (Element) tmp;
  +            String tname = e.getTagName();
  +            if (tname.equals("validator-class"))  {
  +                Text t = (Text) e.getFirstChild();
  +                if (t != null)
  +                    validatorClass = t.getData();
  +            } else if (tname.equals("init-param"))  {
  +		String[] initParam = createInitParam(e);
  +		initParams.put(initParam[0], initParam[1]);
  +            } else 
  +                Constants.message("jsp.warning.unknown.element.in.validator", //@@@ add
in properties
  +                                  new Object[] {e.getTagName()},
  +                                  Logger.WARNING);
  +        }
  +
  +        TagLibraryValidator tlv = null;
  +        if (validatorClass != null && !validatorClass.equals("")) {
  +            try {
  +                Class tlvClass = 
  +		    ctxt.getClassLoader().loadClass(validatorClass);
  +                tlv = (TagLibraryValidator)tlvClass.newInstance();
  +                //@@@ removed in 1.2PFD tlv.setTagLibraryInfo(this);
  +            } catch (Exception ex) {
  +                Constants.message("jsp.warning.tlvclass.is.null",
  +				  new Object[] {
  +				      validatorClass, 
  +				      "EXCEPTION: " + ex.getMessage()
  +				  },
  +				  Logger.ERROR);
  +            }
  +        }
  +	if (tlv != null) {
  +	    tlv.setInitParameters(initParams);
  +	}
  +	return tlv;
  +    }
  +
  +    String[] createInitParam(Element elem) {
  +        String[] initParam = new String[2];
  +        
  +        NodeList list = elem.getChildNodes();
  +        for(int i=0; i<list.getLength(); i++) {
  +            Node tmp  = list.item(i);
  +	    if (!(tmp instanceof Element)) continue;
  +	    Element e = (Element) tmp;
  +            String tname = e.getTagName();
  +            if (tname.equals("param-name"))  {
  +                Text t = (Text) e.getFirstChild();
  +                if (t != null)
  +                    initParam[0] = t.getData();
  +            } else if (tname.equals("param-value"))  {
  +                Text t = (Text) e.getFirstChild();
  +                if (t != null)
  +                    initParam[1] = t.getData();
  +            } else if (tname.equals("description"))  {
  +		// do nothing
  +            } else 
  +                Constants.message("jsp.warning.unknown.element.in.initParam", //@@@ properties
  +                                  new Object[] {e.getTagName()},
  +                                  Logger.WARNING);
  +        }
  +	return initParam;
       }
   
       static void copy(InputStream in, String fileName) 
  
  
  

Mime
View raw message