Return-Path: 
 <tomcat-dev-return-26902-apmail-jakarta-tomcat-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org
Received: (qmail 62824 invoked by uid 500); 5 Sep 2001 05:16:27 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:tomcat-dev-help@jakarta.apache.org>
list-unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
list-post: <mailto:tomcat-dev@jakarta.apache.org>
Reply-To: tomcat-dev@jakarta.apache.org
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 62815 invoked by uid 500); 5 Sep 2001 05:16:27 -0000
Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org
Date: 5 Sep 2001 05:14:01 -0000
Message-ID: <20010905051401.36947.qmail@icarus.apache.org>
From: craigmcc@apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-4.0/webapps/examples/jsp/simpletag foo.jsp
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

craigmcc    01/09/04 22:14:01

  Modified:    webapps/examples/WEB-INF web.xml
               webapps/examples/WEB-INF/jsp example-taglib.tld
               webapps/examples/jsp/simpletag foo.jsp
  Added:       webapps/examples/WEB-INF/classes/validators
                        DebugValidator.java
  Log:
  Update the example tag library descriptor to JSP 1.2 syntax.
  
  Add a debug tag library whose sole purpose is to dump the XML view of the
  JSP page to standard output (normally $CATALINA_HOME/logs/catalina.out on
  a Unix-ish system) when the corresponding taglib directive is included.
  
  Revision  Changes    Path
  1.19      +10 -1     jakarta-tomcat-4.0/webapps/examples/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/web.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- web.xml	2001/08/27 20:57:21	1.18
  +++ web.xml	2001/09/05 05:14:00	1.19
  @@ -159,7 +159,16 @@
   
       <taglib>
           <taglib-uri>
  -	   http://java.apache.org/tomcat/examples-taglib
  +	   http://jakarta.apache.org/tomcat/debug-taglib
  +        </taglib-uri>
  +        <taglib-location>
  +           /WEB-INF/jsp/debug-taglib.tld
  +        </taglib-location>
  +    </taglib>
  +
  +    <taglib>
  +        <taglib-uri>
  +	   http://jakarta.apache.org/tomcat/examples-taglib
           </taglib-uri>
           <taglib-location>
              /WEB-INF/jsp/example-taglib.tld
  
  
  
  1.1                  jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
  
  Index: DebugValidator.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/validators/DebugValidator.java,v 1.1 2001/09/05 05:14:01 craigmcc Exp $
   * $Revision: 1.1 $
   * $Date: 2001/09/05 05:14:01 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  
  package validators;
  
  
  import java.io.InputStream;
  import java.io.IOException;
  import javax.servlet.jsp.tagext.PageData;
  import javax.servlet.jsp.tagext.TagLibraryValidator;
  import javax.servlet.jsp.tagext.ValidationMessage;
  
  
  /**
   * Example tag library validator that simply dumps the XML version of each
   * page to standard output (which will typically be sent to the file
   * <code>$CATALINA_HOME/logs/catalina.out</code>).  To utilize it, simply
   * include a <code>taglib</code> directive for this tag library at the top
   * of your JSP page.
   *
   * @author Craig McClanahan
   * @version $Revision: 1.1 $ $Date: 2001/09/05 05:14:01 $
   */
  
  public class DebugValidator extends TagLibraryValidator {
  
  
      // ----------------------------------------------------- Instance Variables
  
  
      // --------------------------------------------------------- Public Methods
  
  
      /**
       * Validate a JSP page.  This will get invoked once per directive in the
       * JSP page.  This method will return <code>null</code> if the page is
       * valid; otherwise the method should return an array of
       * <code>ValidationMessage</code> objects.  An array of length zero is
       * also interpreted as no errors.
       *
       * @param prefix The value of the prefix argument in this directive
       * @param uri The value of the URI argument in this directive
       * @param page The page data for this page
       */
      public ValidationMessage[] validate(String prefix, String uri,
                                          PageData page) {
  
          System.out.println("---------- Prefix=" + prefix + " URI=" + uri +
                             "----------");
  
          InputStream is = page.getInputStream();
          while (true) {
              try {
                  int ch = is.read();
                  if (ch < 0)
                      break;
                  System.out.print((char) ch);
              } catch (IOException e) {
                  break;
              }
          }
          System.out.println();
          System.out.println("-----------------------------------------------");
          return (null);
  
      }
  
  
  }
  
  
  
  1.2       +20 -25    jakarta-tomcat-4.0/webapps/examples/WEB-INF/jsp/example-taglib.tld
  
  Index: example-taglib.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/jsp/example-taglib.tld,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- example-taglib.tld	2000/08/17 00:58:00	1.1
  +++ example-taglib.tld	2001/09/05 05:14:01	1.2
  @@ -1,27 +1,22 @@
   <?xml version="1.0" encoding="ISO-8859-1" ?>
   <!DOCTYPE taglib
  -        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
  -	"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
  +        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
  +	"http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd">
   
  -<!-- a tag library descriptor -->
  -
   <taglib>
  -  <!-- after this the default space is
  -	"http://java.sun.com/j2ee/dtds/jsptaglibrary_1_2.dtd"
  -   -->
  -
  -  <tlibversion>1.0</tlibversion>
  -  <jspversion>1.1</jspversion>
  -  <shortname>simple</shortname>
  -  <uri></uri>
  -  <info>
  +
  +  <tlib-version>1.0</tlib-version>
  +  <jsp-version>1.2</jsp-version>
  +  <short-name>simple</short-name>
  +  <uri>http://jakarta.apache.org/tomcat/example-taglib</uri>
  +  <description>
   	A simple tab library for the examples
  -  </info>
  +  </description>
   
     <tag>
       <name>ShowSource</name>
  -    <tagclass>examples.ShowSource</tagclass>
  -    <info> Display JSP sources </info>
  +    <tag-class>examples.ShowSource</tag-class>
  +    <description> Display JSP sources </description>
       <attribute>
          <name>jspFile</name>
          <required>true</required>
  @@ -33,12 +28,12 @@
     <!-- foo tag -->
     <tag>
       <name>foo</name>
  -    <tagclass>examples.FooTag</tagclass>
  -    <teiclass>examples.FooTagExtraInfo</teiclass>
  -    <bodycontent>JSP</bodycontent>
  -    <info>
  +    <tag-class>examples.FooTag</tag-class>
  +    <tei-class>examples.FooTagExtraInfo</tei-class>
  +    <body-content>JSP</body-content>
  +    <description>
   	Perform a server side action; uses 3 mandatory attributes
  -    </info>
  +    </description>
   
       <attribute>
         <name>att1</name>
  @@ -58,11 +53,11 @@
     <!-- log tag -->
     <tag>
       <name>log</name>
  -    <tagclass>examples.LogTag</tagclass>
  -    <bodycontent>TAGDEPENDENT</bodycontent>
  -    <info>
  +    <tag-class>examples.LogTag</tag-class>
  +    <body-content>TAGDEPENDENT</body-content>
  +    <description>
   	Perform a server side action; Log the message.
  -    </info>
  +    </description>
       <attribute>
   	<name>toBrowser</name>
   	<required>false</required>
  
  
  
  1.2       +3 -2      jakarta-tomcat-4.0/webapps/examples/jsp/simpletag/foo.jsp
  
  Index: foo.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/jsp/simpletag/foo.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- foo.jsp	2000/08/17 00:58:19	1.1
  +++ foo.jsp	2001/09/05 05:14:01	1.2
  @@ -1,10 +1,11 @@
   <html>
   <!--
  -  Copyright (c) 1999 The Apache Software Foundation.  All rights 
  +  Copyright (c) 1999-2001 The Apache Software Foundation.  All rights 
     reserved.
   -->
   <body>
  -<%@ taglib uri="http://java.apache.org/tomcat/examples-taglib" prefix="eg" %>
  +<%@ taglib uri="http://jakarta.apache.org/tomcat/debug-taglib" prefix="d"%>
  +<%@ taglib uri="http://jakarta.apache.org/tomcat/examples-taglib" prefix="eg"%>
   
   Radio stations that rock: