jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rlu...@apache.org
Subject cvs commit: jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/misc PersistenceTag.java ReqTimeAttributesTag.java
Date Mon, 28 Jan 2002 23:35:16 GMT
rlubke      02/01/28 15:35:16

  Modified:    src/server/jsp-tests/WEB-INF/classes/tags ATag.java
                        BTag.java CheckCount.java Count.java Define.java
                        DefineExtraInfo.java ExampleTagBase.java
                        FooTagExtraInfo.java LifeCycleTag.java PageTag.java
                        SillyArgs.java SillyArgsExtraInfo.java TestTag.java
                        TestTagExtraInfo.java Verbatim.java
               src/server/jsp-tests/WEB-INF/classes/tags/misc
                        PersistenceTag.java ReqTimeAttributesTag.java
  Added:       src/server/jsp-tests/WEB-INF/classes/tags
                        SimpleIteratorTag.java
  Log:
   - Additions/modification for support of new/modified tests
  
  Revision  Changes    Path
  1.4       +76 -18    jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/ATag.java
  
  Index: ATag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/ATag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ATag.java	19 Dec 2000 22:05:29 -0000	1.3
  +++ ATag.java	28 Jan 2002 23:35:16 -0000	1.4
  @@ -1,6 +1,61 @@
  -/**
  - * A Tag Handler written from scratch without extending TagSupport
  - * Takes one attribute: att
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/ATag.java,v 1.4 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.4 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
    */
   
   package tags;
  @@ -8,44 +63,47 @@
   import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
   
  +/**
  + * A Tag Handler written from scratch without extending TagSupport
  + * Takes one attribute: att
  + */
   public class ATag implements Tag {
  +
       // Property Attributes
  -    public void setAtt(String s) {
  -	att = s;
  +    public void setAtt( String s ) {
  +        att = s;
       }
   
       public String getAtt() {
  -	return att;
  +        return att;
       }
   
       // Setters for standard tag handler attributes
  -
  -    public void setPageContext(PageContext pc) {
  -	this.pc = pc;
  +    public void setPageContext( PageContext pc ) {
  +        this.pc = pc;
       }
  -       
  -    public void setParent(Tag p) {
  -	this.parent = p;
  +
  +    public void setParent( Tag p ) {
  +        this.parent = p;
       }
   
       public Tag getParent() {
  -	return parent;
  +        return parent;
       }
   
       // The action methods
  -
       public int doStartTag() {
  -	return EVAL_BODY_INCLUDE;
  +        return EVAL_BODY_INCLUDE;
       }
   
       public int doEndTag() {
  -	return EVAL_PAGE;
  +        return EVAL_PAGE;
       }
   
  -    public void release() {
  -    }
  +    public void release() {}
   
       // ======
  +
       private String att = null;
       private PageContext pc = null;
       private Tag parent = null;
  
  
  
  1.4       +89 -29    jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/BTag.java
  
  Index: BTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/BTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BTag.java	19 Dec 2000 22:05:29 -0000	1.3
  +++ BTag.java	28 Jan 2002 23:35:16 -0000	1.4
  @@ -1,6 +1,61 @@
  -/**
  - * A Tag Handler written from scratch without extending TagSupport
  - * Takes one attribute: att
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/BTag.java,v 1.4 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.4 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
    */
   
   package tags;
  @@ -8,61 +63,66 @@
   import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
   
  +/**
  + * A Tag Handler written from scratch without extending TagSupport
  + * Takes one attribute: att
  + */
   public class BTag implements BodyTag {
  +
       // Property Attributes
  -    public void setAtt(String s) {
  -	att = s;
  +    public void setAtt( String s ) {
  +        att = s;
       }
   
       public String getAtt() {
  -	return att;
  +        return att;
       }
   
       // Setters for standard tag handler attributes
  -
  -    public void setPageContext(PageContext pc) {
  -	this.pc = pc;
  +    public void setPageContext( PageContext pc ) {
  +        this.pc = pc;
       }
  -       
  -    public void setParent(Tag p) {
  -	this.parent = p;
  +
  +    public void setParent( Tag p ) {
  +        this.parent = p;
       }
   
       public Tag getParent() {
  -	return parent;
  +        return parent;
       }
   
       // The action methods
  -
       public int doStartTag() {
  -	return EVAL_BODY_TAG;
  +        //return EVAL_BODY_TAG;
  +        return EVAL_BODY_BUFFERED;
       }
   
  -    public void setBodyContent(BodyContent b) {
  -	BodyContent body = b;
  +    public void setBodyContent( BodyContent b ) {
  +        BodyContent body = b;
       }
   
  -    public void doInitBody() {
  -    }
  +    public void doInitBody() {}
   
       public int doAfterBody() {
  -	try {
  -	    body.writeOut(pc.getOut());
  -	    body.clearBody();
  -	} catch (Exception ex) {
  -	    // ignore
  -	}
  -	return SKIP_BODY;
  +        try {
  +            body.writeOut( pc.getOut() );
  +            body.clearBody();
  +        } catch ( Exception ex ) {
  +            // ignore
  +        }
  +
  +        return SKIP_BODY;
       }
   
       public int doEndTag() {
  -	return EVAL_PAGE;
  +        return EVAL_PAGE;
       }
   
  -    public void release() {
  -    }
  +    public void release() {}
  +
   
       // ======
  +
       private String att = null;
       private PageContext pc = null;
       private Tag parent = null;
  
  
  
  1.2       +122 -62   jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/CheckCount.java
  
  Index: CheckCount.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/CheckCount.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CheckCount.java	3 Oct 2000 23:37:29 -0000	1.1
  +++ CheckCount.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,10 +1,61 @@
  -/**
  - * Check different types of counts related to the count tag.
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/CheckCount.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
    *
  - * This tag takes several optional attributes:
  - *   nexted - then number of enclosing count tags that should be active
  - *               note that we need to assume the name of the class...  This should really
  - *               be a parameter in TestLib.tld
    */
   
   package tags;
  @@ -12,33 +63,41 @@
   import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
   
  +/**
  + * Check different types of counts related to the count tag.
  + *
  + * This tag takes several optional attributes:
  + *   nexted - then number of enclosing count tags that should be active
  + *               note that we need to assume the name of the class...  This should really
  + *               be a parameter in TestLib.tld
  + */
   public class CheckCount extends TagSupport {
   
       //  nested
  -    public void setNested(String s) {
  -	try {
  -	    nestedCount = Integer.valueOf(s);
  -	} catch (Exception ex) {
  -	    nestedCount = null;
  -	}
  +    public void setNested( String s ) {
  +        try {
  +            nestedCount = Integer.valueOf( s );
  +        } catch ( Exception ex ) {
  +            nestedCount = null;
  +        }
       }
  -    
  +
       // startCount
  -    public void setStart(String s) {
  -	try {
  -	    startCount = Integer.valueOf(s);
  -	} catch (Exception ex) {
  -	    startCount = null;
  -	}
  +    public void setStart( String s ) {
  +        try {
  +            startCount = Integer.valueOf( s );
  +        } catch ( Exception ex ) {
  +            startCount = null;
  +        }
       }
   
       // endCount
  -    public void setEnd(String s) {
  -	try {
  -	    endCount = Integer.valueOf(s);
  -	} catch (Exception ex) {
  -	    endCount = null;
  -	}
  +    public void setEnd( String s ) {
  +        try {
  +            endCount = Integer.valueOf( s );
  +        } catch ( Exception ex ) {
  +            endCount = null;
  +        }
       }
   
   
  @@ -46,44 +105,45 @@
   
       // doStartTag
       public int doStartTag() {
  -	if (nestedCount != null) { 
  -	    // check for active nested tags.
  -
  -	    int k = nestedCount.intValue();
  -	    int c = 0;
  -	    Count t = (Count) TagSupport.findAncestorWithClass(this, tags.Count.class);
  -
  -	    while (t != null) {
  -		c += 1;
  -		t = (Count) TagSupport.findAncestorWithClass(t, tags.Count.class);
  -	    }
  -
  -	    if (c != k) {
  -		throw new Error("nested count: expecting "+k+" got "+c);
  -	    }
  -	}
  -
  -	if (startCount != null) {
  -	    // check for start tag invocations
  -	    int k = startCount.intValue();
  -
  -	    int c = Count.getCount(pageContext, Count.DO_START_TAG_COUNTER);
  -	    if (k != c) {
  -		throw new Error("start count: expecting "+k+" got "+c);
  -	    }
  -	}
  -
  -	if (endCount != null) {
  -	    // check for end tag invocations
  -	    int k = endCount.intValue();
  -
  -	    int c = Count.getCount(pageContext, Count.DO_END_TAG_COUNTER);
  -	    if (k != c) {
  -		throw new Error("end count: expecting "+k+" got "+c);
  -	    }
  -	}
  +        if ( nestedCount != null ) {
  +            // check for active nested tags.
   
  -	return SKIP_BODY;
  +            int k = nestedCount.intValue();
  +            int c = 0;
  +            Count t = ( Count ) TagSupport.findAncestorWithClass( this, tags.Count.class );
  +
  +            while ( t != null ) {
  +                c += 1;
  +                t = ( Count ) TagSupport.findAncestorWithClass( t, tags.Count.class );
  +            }
  +
  +            if ( c != k ) {
  +                throw new Error( "nested count: expecting " + k + " got " + c );
  +            }
  +        }
  +
  +        if ( startCount != null ) {
  +            // check for start tag invocations
  +            int k = startCount.intValue();
  +
  +            int c = Count.getCount( pageContext, Count.DO_START_TAG_COUNTER );
  +
  +            if ( k != c ) {
  +                throw new Error( "start count: expecting " + k + " got " + c );
  +            }
  +        }
  +
  +        if ( endCount != null ) {
  +            // check for end tag invocations
  +            int k = endCount.intValue();
  +
  +            int c = Count.getCount( pageContext, Count.DO_END_TAG_COUNTER );
  +
  +            if ( k != c ) {
  +                throw new Error( "end count: expecting " + k + " got " + c );
  +            }
  +        }
  +        return SKIP_BODY;
       }
   
   
  
  
  
  1.2       +194 -129  jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/Count.java
  
  Index: Count.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/Count.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Count.java	3 Oct 2000 23:37:29 -0000	1.1
  +++ Count.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,3 +1,69 @@
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/Count.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
  + */
  +
  +package tags;
  +
  +import javax.servlet.jsp.*;
  +import javax.servlet.jsp.tagext.*;
  +import java.util.*;
  +
   /**
    * This is a tag handler that will validate that the JSP compiler
    * is invoking the methods in the proper order
  @@ -10,13 +76,6 @@
    *   includeBody - whether the body is to be included or not ("true" is default)
    *   skipPage - whether to skip the rest of the page ("false" is default)
    */
  -
  -package tags;
  -
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  -import java.util.*;
  -
   public class Count extends TagSupport {
   
       public static String CREATED = "Created";
  @@ -34,187 +93,193 @@
       public static String DO_END_TAG_COUNTER = "Do_end_tag_counter";
   
       // setpageContext
  -    public void setPageContext(PageContext pc) {
  -	if ((state == DO_START_TAG)) {
  -	    throw new Error("Cannot setPageContext when in: "+state);
  -	}
  -
  -	state = SET_PC;
  -	if (pc == null) {
  -	    throw new Error("Cannot set a null PageContext");
  -	}
  -	super.setPageContext(pc);
  +    public void setPageContext( PageContext pc ) {
  +        if ( ( state == DO_START_TAG ) ) {
  +            throw new Error( "Cannot setPageContext when in: " + state );
  +        }
  +
  +        state = SET_PC;
  +
  +        if ( pc == null ) {
  +            throw new Error( "Cannot set a null PageContext" );
  +        }
  +
  +        super.setPageContext( pc );
       }
   
       // setParent
  -    public void setParent(Tag parent) {
  -	if ((state == DO_START_TAG) ||
  -	    (state == CREATED) ||
  -	    (state == RELEASE)) {
  -	    throw new Error("Cannot setParent when in: "+state);
  -	}
  +    public void setParent( Tag parent ) {
  +        if ( ( state == DO_START_TAG ) ||
  +                ( state == CREATED ) ||
  +                ( state == RELEASE ) ) {
  +            throw new Error( "Cannot setParent when in: " + state );
  +        }
   
  -	state = SET_PARENT;
  -	super.setParent(parent);
  +        state = SET_PARENT;
  +        super.setParent( parent );
       }
   
       // getParent
       public Tag getParent() {
  -	return super.getParent();
  +        return super.getParent();
       }
   
       //  att1
  -    public void setAtt1(String s) {
  -	if ((state == SET_PARENT) ||
  -	    (aSetter(state)) ||
  -	    (state == DO_END_TAG)) {
  -	} else {
  -	    throw new Error("Cannot setAtt1 when in: "+state);
  -	}
  +    public void setAtt1( String s ) {
  +        if ( ( state == SET_PARENT ) ||
  +                ( aSetter( state ) ) ||
  +            ( state == DO_END_TAG ) ) {}
  +        else {
  +            throw new Error( "Cannot setAtt1 when in: " + state );
  +        }
   
  -	state = SET_ATT_1;
  -	att1 = s;
  +        state = SET_ATT_1;
  +        att1 = s;
       }
  -    
  +
       public String getAtt1() {
  -	return att1;
  +        return att1;
       }
   
       //  att2
  -    public void setAtt2(String s) {
  -	if ((state == SET_PARENT) ||
  -	    (aSetter(state)) ||
  -	    (state == DO_END_TAG)) {
  -	} else {
  -	    throw new Error("Cannot setAtt1 when in: "+state);
  -	}
  +    public void setAtt2( String s ) {
  +        if ( ( state == SET_PARENT ) ||
  +                ( aSetter( state ) ) ||
  +            ( state == DO_END_TAG ) ) {}
  +        else {
  +            throw new Error( "Cannot setAtt1 when in: " + state );
  +        }
   
  -	state = SET_ATT_1;
  -	att1 = s;
  +        state = SET_ATT_1;
  +        att1 = s;
       }
   
       public String getAtt2() {
  -	return att2;
  +        return att2;
       }
   
       //  includeBody
  -    public void setIncludeBody(String s) {
  -	if ((state == SET_PARENT) ||
  -	    (aSetter(state)) ||
  -	    (state == DO_END_TAG)) {
  -	} else {
  -	    throw new Error("Cannot setIncludeBody when in: "+state);
  -	}
  +    public void setIncludeBody( String s ) {
  +        if ( ( state == SET_PARENT ) ||
  +                ( aSetter( state ) ) ||
  +            ( state == DO_END_TAG ) ) {}
  +        else {
  +            throw new Error( "Cannot setIncludeBody when in: " + state );
  +        }
   
  -	state = SET_INCLUDE_BODY;
  -	includeBody = s;
  +        state = SET_INCLUDE_BODY;
  +        includeBody = s;
       }
   
       public String getIncludeBody() {
  -	return includeBody;
  +        return includeBody;
       }
   
       //  skipPage
  -    public void setSkipPage(String s) {
  -	if ((state == SET_PARENT) ||
  -	    (aSetter(state)) ||
  -	    (state == DO_END_TAG)) {
  -	} else {
  -	    throw new Error("Cannot setSkipPage when in: "+state);
  -	}
  +    public void setSkipPage( String s ) {
  +        if ( ( state == SET_PARENT ) ||
  +                ( aSetter( state ) ) ||
  +            ( state == DO_END_TAG ) ) {}
  +        else {
  +            throw new Error( "Cannot setSkipPage when in: " + state );
  +        }
   
  -	state = SET_SKIP_PAGE;
  -	skipPage = s;
  +        state = SET_SKIP_PAGE;
  +        skipPage = s;
       }
   
       public String getSkipPage() {
  -	return skipPage;
  +        return skipPage;
       }
   
       // ================== Actions ====================
   
       // doStartTag
       public int doStartTag() {
  -	if ((aSetter(state)) ||
  -	    (state == SET_PARENT) ||
  -	    (state == DO_END_TAG)) {
  -	} else {
  -	    throw new Error("Cannot doStartTag when in: "+state);
  -	}
  -
  -	state = DO_START_TAG;
  -	addCount(pageContext, DO_START_TAG_COUNTER);
  -	if (includeBody.equals("true")) {
  -	    return EVAL_BODY_INCLUDE;
  -	} else {
  -	    return SKIP_BODY;
  -	}
  +        if ( ( aSetter( state ) ) ||
  +                ( state == SET_PARENT ) ||
  +            ( state == DO_END_TAG ) ) {}
  +        else {
  +            throw new Error( "Cannot doStartTag when in: " + state );
  +        }
  +
  +        state = DO_START_TAG;
  +        addCount( pageContext, DO_START_TAG_COUNTER );
  +
  +        if ( includeBody.equals( "true" ) ) {
  +            return EVAL_BODY_INCLUDE;
  +        } else {
  +            return SKIP_BODY;
  +        }
       }
   
       // doEndTag
       public int doEndTag() {
  -	if ((state != DO_START_TAG)) {
  -	    throw new Error("Cannot doEndTag when in: "+state);
  -	}
  -
  -	state = DO_END_TAG;
  -	addCount(pageContext, DO_END_TAG_COUNTER);
  -	if (skipPage.equals("true")) {
  -	    return SKIP_PAGE;
  -	} else {
  -	    return EVAL_PAGE;
  -	}
  +        if ( ( state != DO_START_TAG ) ) {
  +            throw new Error( "Cannot doEndTag when in: " + state );
  +        }
  +
  +        state = DO_END_TAG;
  +        addCount( pageContext, DO_END_TAG_COUNTER );
  +
  +        if ( skipPage.equals( "true" ) ) {
  +            return SKIP_PAGE;
  +        } else {
  +            return EVAL_PAGE;
  +        }
       }
   
   
       // release
       public void release() {
  -	if ((state == DO_START_TAG)) {
  -	    throw new Error("Cannot release when in: "+state);
  -	}
  +        if ( ( state == DO_START_TAG ) ) {
  +            throw new Error( "Cannot release when in: " + state );
  +        }
   
  -	state = RELEASE;
  -	super.release();
  +        state = RELEASE;
  +        super.release();
       }
   
       // ========== Public methods for counting ============
   
  -    public static void addCount(PageContext pc, String s) {
  -	synchronized (pc) {
  -	    Integer c = (Integer) pc.getAttribute(s);
  -	    if (c == null) {
  -		pc.setAttribute(s, new Integer(1),
  -				PageContext.PAGE_SCOPE);
  -	    } else {
  -		int i = c.intValue();
  -		pc.setAttribute(s, new Integer(i+1),
  -				PageContext.PAGE_SCOPE);
  -	    }
  -	}
  -    }
  -
  -    public static int getCount(PageContext pc, String s) {
  -	synchronized (pc) {
  -	    Integer c = (Integer) pc.getAttribute(s);
  -	    if (c == null) {
  -		return 0;
  -	    } else {
  -		return c.intValue();
  -	    }
  -	}
  +    public static void addCount( PageContext pc, String s ) {
  +        synchronized ( pc ) {
  +            Integer c = ( Integer ) pc.getAttribute( s );
  +
  +            if ( c == null ) {
  +                pc.setAttribute( s, new Integer( 1 ),
  +                                 PageContext.PAGE_SCOPE );
  +            } else {
  +                int i = c.intValue();
  +                pc.setAttribute( s, new Integer( i + 1 ),
  +                                 PageContext.PAGE_SCOPE );
  +            }
  +        }
  +    }
  +
  +    public static int getCount( PageContext pc, String s ) {
  +        synchronized ( pc ) {
  +            Integer c = ( Integer ) pc.getAttribute( s );
  +
  +            if ( c == null ) {
  +                return 0;
  +            } else {
  +                return c.intValue();
  +            }
  +        }
       }
   
   
       //  Auxiliary methods
  -    protected boolean aSetter(String state) {
  -	if ((state == SET_INCLUDE_BODY) ||
  -	    (state == SET_SKIP_PAGE) ||
  -	    (state == SET_ATT_1) ||
  -	    (state == SET_ATT_2)) {
  -	    return true;
  -	} else {
  -	    return false;
  -	}
  +    protected boolean aSetter( String state ) {
  +        if ( ( state == SET_INCLUDE_BODY ) ||
  +                ( state == SET_SKIP_PAGE ) ||
  +                ( state == SET_ATT_1 ) ||
  +                ( state == SET_ATT_2 ) ) {
  +            return true;
  +        } else {
  +            return false;
  +        }
       }
   
       // private data
  
  
  
  1.2       +66 -7     jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/Define.java
  
  Index: Define.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/Define.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Define.java	3 Oct 2000 23:37:29 -0000	1.1
  +++ Define.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,3 +1,69 @@
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/Define.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
  + */
  +
  +package tags;
  +
  +import javax.servlet.jsp.*;
  +import javax.servlet.jsp.tagext.*;
  +import java.io.IOException;
  +
   /**
    * Define an Integer object and do some iteration stuff
    *
  @@ -13,13 +79,6 @@
    *  afterBodyIncrement - increment after doAfterTag (invalid with life=="AT_END")
    *  iterationCount - number of iterations to do (defaults to 1)
    */
  -
  -package tags;
  -
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  -import java.io.IOException;
  -
   public class Define extends BodyTagSupport {
   
       // the scope where to define the object
  
  
  
  1.2       +58 -3     jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/DefineExtraInfo.java
  
  Index: DefineExtraInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/DefineExtraInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefineExtraInfo.java	3 Oct 2000 23:37:29 -0000	1.1
  +++ DefineExtraInfo.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,7 +1,62 @@
  -/**
  - * TagExtraInfo for the define action
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/DefineExtraInfo.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
    */
  -
   
   package tags;
   
  
  
  
  1.3       +68 -13    jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/ExampleTagBase.java
  
  Index: ExampleTagBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/ExampleTagBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExampleTagBase.java	19 Dec 2000 22:05:30 -0000	1.2
  +++ ExampleTagBase.java	28 Jan 2002 23:35:16 -0000	1.3
  @@ -1,28 +1,88 @@
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/ExampleTagBase.java,v 1.3 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.3 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
  + */
  +
   package tags;
   
   import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
   
  -public abstract class ExampleTagBase 
  +public abstract class ExampleTagBase
   
  -implements Tag {
  +    implements Tag {
   
  -    public void setParent(Tag parent) {
  +    public void setParent( Tag parent ) {
           this.parent = parent;
       }
   
  -    public void setBodyContent(BodyContent bodyOut) {
  +    public void setBodyContent( BodyContent bodyOut ) {
           this.bodyOut = bodyOut;
       }
   
  -    public void setPageContext(PageContext pageContext) {
  +    public void setPageContext( PageContext pageContext ) {
           this.pageContext = pageContext;
       }
   
       public Tag getParent() {
           return this.parent;
       }
  -    
  +
       public int doStartTag() throws JspException {
           return SKIP_BODY;
       }
  @@ -30,15 +90,10 @@
       public int doEndTag() throws JspException {
           return EVAL_PAGE;
       }
  -    
   
       // Default implementations for BodyTag methods as well
       // just in case a tag decides to implement BodyTag.
  -
  -    public void doInitBody() throws JspException {
  -    }
  -
  -
  +    public void doInitBody() throws JspException {}
   
       public int doAfterBody() throws JspException {
           return SKIP_BODY;
  @@ -49,7 +104,7 @@
           pageContext = null;
           parent = null;
       }
  -    
  +
       protected BodyContent bodyOut;
       protected PageContext pageContext;
       protected Tag parent;
  
  
  
  1.2       +60 -2     jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/FooTagExtraInfo.java
  
  Index: FooTagExtraInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/FooTagExtraInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FooTagExtraInfo.java	17 Oct 2000 21:05:56 -0000	1.1
  +++ FooTagExtraInfo.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,3 +1,63 @@
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/FooTagExtraInfo.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
  + */
  +
   package tags;
   
   import javax.servlet.jsp.tagext.*;
  @@ -13,5 +73,3 @@
               };
       }
   }
  -
  -        
  
  
  
  1.2       +143 -112  jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/LifeCycleTag.java
  
  Index: LifeCycleTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/LifeCycleTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LifeCycleTag.java	17 Oct 2000 21:05:56 -0000	1.1
  +++ LifeCycleTag.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,3 +1,63 @@
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/LifeCycleTag.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
  + */
  +
   package tags;
   
   import javax.servlet.jsp.*;
  @@ -7,164 +67,135 @@
   /**
    * LifeCycleTag class is used to tests tagext API's 
    */
  -public class LifeCycleTag  extends ExampleTagBase 
  +public class LifeCycleTag extends ExampleTagBase
       implements BodyTag {
   
  -
       boolean toBrowser = false;
  -    String TestString="";
  -    String endString=" method <br>";
  -    private String atts1,atts2,atts3,atts4,atts5,atts6;
  -    int count=0;
  -   
  - 
  -    
  -    // setting the value from jsp att1,att1 from JSP test case 
  -    public void setAtt1(String value) {
  +    String TestString = "";
  +    String endString = " method <br>";
  +    private String atts1, atts2, atts3, atts4, atts5, atts6;
  +    int count = 0;
  +
  +    // setting the value from jsp att1,att1 from JSP test case
  +    public void setAtt1( String value ) {
           atts1 = value;
       }
  -  
  +
       public String getAtt1() {
  -    	return atts1;
  -     }
  -    
  +        return atts1;
  +    }
   
  -    public void setAtt2(String value) {
  +    public void setAtt2( String value ) {
           atts2 = value;
       }
  -  
  +
       public String getAtt2() {
  -    	return atts2;
  -     }
  -     
  +        return atts2;
  +    }
   
  -    public void setAtt3(String value) {
  +    public void setAtt3( String value ) {
           atts3 = value;
       }
  -  
  +
       public String getAtt3() {
  -    	return atts3;
  -     }
  -    
  +        return atts3;
  +    }
   
  -    public void setAtt4(String value) {
  +    public void setAtt4( String value ) {
           atts4 = value;
       }
  -  
  +
       public String getAtt4() {
  -    	return atts4;
  -     }
  +        return atts4;
  +    }
   
  -    public void setAtt5(String value) {
  +    public void setAtt5( String value ) {
           atts5 = value;
       }
  -  
  +
       public String getAtt5() {
  -    	return atts5;
  -     }
  -    
  +        return atts5;
  +    }
   
  -    public void setAtt6(String value) {
  +    public void setAtt6( String value ) {
           atts6 = value;
       }
  -  
  +
       public String getAtt6() {
  -    	return atts6;
  -     }
  -     
  -     
  -     
  -     
  -     
  -     
  -
  -  
  -    public void setToBrowser(String value) {
  -        if (value == null)
  +        return atts6;
  +    }
  +
  +    public void setToBrowser( String value ) {
  +        if ( value == null )
               toBrowser = false;
  -        else if (value.equalsIgnoreCase("true"))
  +        else if ( value.equalsIgnoreCase( "true" ) )
               toBrowser = true;
           else
               toBrowser = false;
       }
   
  -// Test for setPageContext in TagSupport class.
  -		public void setPageContext(PageContext pc) {
  -if ("pageContext".equalsIgnoreCase (this.getAtt1())) {
  -	 
  -	TestString = TestString + this.getAtt1() + endString;
  -	}
  -}
  +    // Test for setPageContext in TagSupport class.
  +    public void setPageContext( PageContext pc ) {
  +        if ( "pageContext".equalsIgnoreCase ( this.getAtt1() ) ) {
   
  -	
  -// Test for doStartTag method in TagSupport class.
  +            TestString = TestString + this.getAtt1() + endString;
  +        }
  +    }
   
  +    // Test for doStartTag method in TagSupport class.
       public int doStartTag() {
  -       if ("doStartTag".equalsIgnoreCase (this.getAtt2())) { 
  -	TestString = TestString + this.getAtt2() + endString;
  - 
  - 
  -} // if condition
  -return EVAL_BODY_TAG;
  -}
  -    
  -// Test for doInitBody method in BodyTagsupport class     
  +        if ( "doStartTag".equalsIgnoreCase ( this.getAtt2() ) ) {
  +            TestString = TestString + this.getAtt2() + endString;
  +        } // if condition
  +
  +        //return EVAL_BODY_TAG;
  +        return EVAL_BODY_BUFFERED;
  +    }
  +
  +    // Test for doInitBody method in BodyTagsupport class
       public void doInitBody() throws JspException {
  -       if ("doInitBody".equalsIgnoreCase (this.getAtt3())) { 
  -		TestString = TestString + this.getAtt3() + endString;
  -		}
  -	}
  +        if ( "doInitBody".equalsIgnoreCase ( this.getAtt3() ) ) {
  +            TestString = TestString + this.getAtt3() + endString;
  +        }
  +    }
   
  -//Test for doAfterBody method in BodyTagSupport class
  -    
  +    //Test for doAfterBody method in BodyTagSupport class
       public int doAfterBody() throws JspException {
           try {
   
  -       if ("doAfterBody".equalsIgnoreCase (this.getAtt4())) { 
  -		TestString = TestString + this.getAtt4() + endString;
  -        }
  +            if ( "doAfterBody".equalsIgnoreCase ( this.getAtt4() ) ) {
  +                TestString = TestString + this.getAtt4() + endString;
  +            }
  +
               String s = bodyOut.getString();
  -            System.err.println(s);
  -            if (false)
  -            	bodyOut.println(TestString);
  +            System.err.println( s );
  +
  +            if ( false )
  +                bodyOut.println( TestString );
  +
               return SKIP_BODY;
  -        } catch (IOException ex) {
  -            throw new JspException(ex.toString());
  +        } catch ( IOException ex ) {
  +            throw new JspException( ex.toString() );
           }
       }
  -    
  -// Test for doEndTag method in BodyTagSupport class
  -    
  -    public int doEndTag() throws JspException{
  -    	
  -       if ("doEndTag".equalsIgnoreCase (this.getAtt5())) { 
  -	TestString = TestString + this.getAtt5() + endString;
  -		} 
  -       return EVAL_PAGE;	
  -    }	
  -
  -
  -// Test for release method in BodyTagSupport class
  -
  -    public void release() {
  -       if ("release".equalsIgnoreCase (this.getAtt6())) { 
  - 	TestString = TestString + this.getAtt6() + endString;
  -
  -       	} 
  -
  -    try {
  -    
  -        if (toBrowser)
  -            bodyOut.println(TestString);
  -     		bodyOut.writeOut(bodyOut.getEnclosingWriter());
  -     } catch (IOException ioe) {}
   
  -    }	
  +    // Test for doEndTag method in BodyTagSupport class
  +    public int doEndTag() throws JspException {
  +
  +        if ( "doEndTag".equalsIgnoreCase ( this.getAtt5() ) ) {
  +            TestString = TestString + this.getAtt5() + endString;
  +        }
   
  +        try {
  +            if ( toBrowser ) {
  +                bodyOut.println( TestString );
  +                bodyOut.writeOut( bodyOut.getEnclosingWriter() );
  +            }
  +        } catch ( IOException ioe ) {}
   
  +        return EVAL_PAGE;
  +    }
   
  +    // Test for release method in BodyTagSupport class
  +    public void release() {}
   }
  -
  -    
  -        
  -    
  
  
  
  1.2       +95 -49    jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/PageTag.java
  
  Index: PageTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/PageTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PageTag.java	17 Oct 2000 21:05:56 -0000	1.1
  +++ PageTag.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,5 +1,64 @@
  -package tags;
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/PageTag.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
  + */
   
  +package tags;
   
   import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
  @@ -9,88 +68,75 @@
   /**
    * PageTag class is used to tests tagext API's
    */
  -public class PageTag extends ExampleTagBase  implements BodyTag {
  +
  +public class PageTag extends ExampleTagBase implements BodyTag {
   
       boolean toBrowser = false;
  -    String TestString="";
  -    private String atts1,atts2;
  +    String TestString = "";
  +    private String atts1, atts2;
   
  -	String PageString="";
  +    String PageString = "";
   
       // setting the value from jsp att1
  -
  -
  -    public void setAtt1(String value) {
  +    public void setAtt1( String value ) {
           atts1 = value;
       }
   
       public String getAtt1() {
  -    	return atts1;
  -     }
  -
  +        return atts1;
  +    }
   
  -    public void setAtt2(String value) {
  +    public void setAtt2( String value ) {
           atts2 = value;
       }
   
       public String getAtt2() {
  -    	return atts2;
  -     }
  -
  +        return atts2;
  +    }
   
  -    public void setToBrowser(String value) {
  -        if (value == null)
  +    public void setToBrowser( String value ) {
  +        if ( value == null )
               toBrowser = false;
  -        else if (value.equalsIgnoreCase("true"))
  +        else if ( value.equalsIgnoreCase( "true" ) )
               toBrowser = true;
           else
               toBrowser = false;
       }
   
  -// Test for setPageContext in TagSupport class.
  -		public void setPageContext(PageContext pc) {
  -		pc.setAttribute("name","pageContext");
  -		PageString = (String)pc.getAttribute("name");
  -
  -
  -		}
  +    // Test for setPageContext in TagSupport class.
  +    public void setPageContext( PageContext pc ) {
  +        pc.setAttribute( "name", "pageContext" );
  +        PageString = ( String ) pc.getAttribute( "name" );
  +    }
   
       public int doStartTag() {
  -    	       if ("doStartTag".equalsIgnoreCase (this.getAtt1())) {
  -       		   		 TestString += this.getAtt1();
  -				}
  -
  -				if("pageContext".equalsIgnoreCase(this.getAtt1())){
  -					TestString=TestString+PageString;
  -				}
  -
  -        return EVAL_BODY_TAG;
  -    }
  +        if ( "doStartTag".equalsIgnoreCase ( this.getAtt1() ) ) {
  +            TestString += this.getAtt1();
  +        }
   
  +        if ( "pageContext".equalsIgnoreCase( this.getAtt1() ) ) {
  +            TestString = TestString + PageString;
  +        }
   
  -    public void doInitBody() throws JspException {
  +        //return EVAL_BODY_TAG;
  +        return EVAL_BODY_BUFFERED;
       }
   
  -
  +    public void doInitBody() throws JspException {}
   
       public int doAfterBody() throws JspException {
           try {
  +            String s = bodyOut.getString();
  +            System.err.println( s );
   
  +            if ( toBrowser )
  +                bodyOut.println( TestString );
   
  -            String s = bodyOut.getString();
  -            System.err.println(s);
  +            bodyOut.writeOut( bodyOut.getEnclosingWriter() );
   
  -            if (toBrowser)
  -            	bodyOut.println(TestString);
  -     			bodyOut.writeOut(bodyOut.getEnclosingWriter());
               return SKIP_BODY;
  -        } catch (IOException ex) {
  -            throw new JspException(ex.toString());
  +        } catch ( IOException ex ) {
  +            throw new JspException( ex.toString() );
           }
       }
  -
   }
  -
  -
  -
  -
  
  
  
  1.2       +69 -12    jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/SillyArgs.java
  
  Index: SillyArgs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/SillyArgs.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SillyArgs.java	3 Oct 2000 23:37:29 -0000	1.1
  +++ SillyArgs.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,38 +1,95 @@
  -/**
  - * This is a tag that accepts only some combinations of arguments
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/SillyArgs.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
    */
   
  -
   package tags;
   
   import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
   
  +/**
  + * This is a tag that accepts only some combinations of arguments
  + */
   public class SillyArgs extends TagSupport {
   
       // Attribute a
  -    public void setA(String s) {
  +    public void setA( String s ) {
           a = s;
       }
   
       // Attribute b
  -    public void setB(String s) {
  +    public void setB( String s ) {
           b = s;
       }
   
       // Attribute c
  -    public void setC(String s) {
  +    public void setC( String s ) {
           c = s;
       }
  -    
  -    public void setTestLibInfo(String s) {
  +
  +    public void setTestLibInfo( String s ) {
           testLibInfo = s;
       }
  -    
   
       // private
  -    private String a = null; 
  -    private String b = null; 
  -    private String c = null; 
  +    private String a = null;
  +    private String b = null;
  +    private String c = null;
       private String testLibInfo = null;
   }
  
  
  
  1.2       +115 -57   jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/SillyArgsExtraInfo.java
  
  Index: SillyArgsExtraInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/SillyArgsExtraInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SillyArgsExtraInfo.java	3 Oct 2000 23:37:29 -0000	1.1
  +++ SillyArgsExtraInfo.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,89 +1,147 @@
  -/**
  - * TagExtraInfo for an action that accepts only arguments A,B,C
  - * such that A+B==C
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/SillyArgsExtraInfo.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
    */
   
  -
   package tags;
   
   import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
   
  +/**
  + * TagExtraInfo for an action that accepts only arguments A,B,C
  + * such that A+B==C
  + */
   public class SillyArgsExtraInfo extends TagExtraInfo {
   
  -    public boolean isValid(TagData data) {
  +    public boolean isValid( TagData data ) {
           //System.out.println("isValid()");
  -	if (data == null) {
  -	    return false;
  -	}
  -	int a, b, c;
  -	String oa, ob, oc;
  -	oa = data.getAttributeString("a");
  -	ob = data.getAttributeString("b");
  -	oc = data.getAttributeString("c");
  -        
  -        //System.out.println("a: "+oa+" b: "+ob+" c: "+oc);
  +        if ( data == null ) {
  +            return false;
  +        }
  +
  +        int a, b, c;
  +        String oa, ob, oc;
  +        oa = data.getAttributeString( "a" );
  +        ob = data.getAttributeString( "b" );
  +        oc = data.getAttributeString( "c" );
   
  -	if ((oa == null) || (ob == null) || (oc == null)) {
  -	    return false;
  -	}
  -	
  -	if (Integer.parseInt(oa) +
  -	    Integer.parseInt(ob) !=
  -	    Integer.parseInt(oc)) {
  +        //System.out.println("a: "+oa+" b: "+ob+" c: "+oc);
  +        if ( ( oa == null ) || ( ob == null ) || ( oc == null ) ) {
  +            return false;
  +        }
  +
  +        if ( Integer.parseInt( oa ) +
  +                Integer.parseInt( ob ) !=
  +                Integer.parseInt( oc ) ) {
               //System.out.println("false 'cos they are not equal");
  -	    return false;
  -	}
  -	
  -	if (data.getAttribute("testLibInfo") != null) {
  -	    if (!testLibInfo()) {
  +            return false;
  +        }
  +
  +        if ( data.getAttribute( "testLibInfo" ) != null ) {
  +            if ( !testLibInfo() ) {
                   //System.out.println("false 'cos of testLibInfo");
  -		return false;
  -	    }
  -	}
  +                return false;
  +            }
  +        }
   
  -	return true;
  +        return true;
       }
   
       private boolean testLibInfo() {
  -	// Now test that TagInfo is somewhat appropriate...
  -	TagInfo ti = getTagInfo();
  +        // Now test that TagInfo is somewhat appropriate...
  +        TagInfo ti = getTagInfo();
   
  -	if (!(ti.getTagClassName()+"ExtraInfo").equals(this.getClass().getName())) {
  +        if ( !( ti.getTagClassName() + "ExtraInfo" ).equals( this.getClass().getName() ) ) {
               //System.out.println("ti.getTagClassName: "+ti.getTagClassName());
  -	    return false;
  -	}
  -	
  -	TagAttributeInfo tai[] = ti.getAttributes();
  +            return false;
  +        }
  +
  +        TagAttributeInfo tai[] = ti.getAttributes();
   
  -	if (tai.length != 3 && tai.length != 4) {
  +        if ( tai.length != 3 && tai.length != 4 ) {
               //System.out.println("tai.length = "+tai.length);
  -	    return false;	// there should be 3 attributes
  -	}
  +            return false;	// there should be 3 attributes
  +        }
   
  -	if (!has(tai, "a") || !has(tai, "b") || !has(tai, "c")) {
  +        if ( !has( tai, "a" ) || !has( tai, "b" ) || !has( tai, "c" ) ) {
               //System.out.println("has issue");
  -	    return false;
  -	}
  +            return false;
  +        }
   
  -	TagLibraryInfo tli = ti.getTagLibrary();
  -	TagInfo ti2 = tli.getTag(ti.getTagName());
  +        TagLibraryInfo tli = ti.getTagLibrary();
  +        TagInfo ti2 = tli.getTag( ti.getTagName() );
   
  -	if (!(ti2.getTagClassName()+"ExtraInfo").equals(this.getClass().getName())) {
  +        if ( !( ti2.getTagClassName() + "ExtraInfo" ).equals( this.getClass().getName() ) ) {
               //System.out.println("ti2.getTagClassName: "+ti2.getTagClassName());
  -	    return false;
  -	}
  +            return false;
  +        }
   
  -	return true;
  +        return true;
       }
   
  +    private static boolean has( TagAttributeInfo tai[], String s ) {
  +        for ( int i = 0; i < tai.length; i++ ) {
  +            if ( tai[ i ].getName().equals( s ) ) {
  +                return true;
  +            }
  +        }
   
  -    private static boolean has(TagAttributeInfo tai[], String s) {
  -	for (int i = 0; i<tai.length; i++) {
  -	    if (tai[i].getName().equals(s)) {
  -		return true;
  -	    }
  -	}
  -	return false;
  +        return false;
       }
   }
  
  
  
  1.4       +139 -201  jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/TestTag.java
  
  Index: TestTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/TestTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestTag.java	7 Dec 2000 23:22:59 -0000	1.3
  +++ TestTag.java	28 Jan 2002 23:35:16 -0000	1.4
  @@ -1,3 +1,63 @@
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/TestTag.java,v 1.4 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.4 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
  + */
  +
   package tags;
   
   import javax.servlet.jsp.*;
  @@ -7,257 +67,135 @@
   /**
    * TestTag class is used to tests tagext API's
    */
  -public class TestTag  extends ExampleTagBase
  -    implements BodyTag {
   
  +public class TestTag extends ExampleTagBase
  +    implements BodyTag {
   
       boolean toBrowser = false;
  -    String TestString="";
  -    private String atts1,atts2;
  -    int count=0;
  -    TestTagExtraInfo ftet;
  -
  +    String TestString = "";
  +    private String atts1, atts2;
  +    int count = 0;
   
       // setting the value from jsp att1,att1 from JSP test case
  -    public void setAtt1(String value) {
  +    public void setAtt1( String value ) {
           atts1 = value;
       }
   
       public String getAtt1() {
  -    	return atts1;
  -     }
  -
  +        return atts1;
  +    }
   
  -    public void setAtt2(String value) {
  +    public void setAtt2( String value ) {
           atts2 = value;
       }
   
       public String getAtt2() {
  -    	return atts2;
  -     }
  -
  +        return atts2;
  +    }
   
  -    public void setToBrowser(String value) {
  -        if (value == null)
  +    public void setToBrowser( String value ) {
  +        if ( value == null )
               toBrowser = false;
  -        else if (value.equalsIgnoreCase("true"))
  +        else if ( value.equalsIgnoreCase( "true" ) )
               toBrowser = true;
           else
               toBrowser = false;
       }
   
  -// Test for setPageContext in TagSupport class.
  -		public void setPageContext(PageContext pc) {
  +    // Test for setPageContext in TagSupport class.
  +    public void setPageContext( PageContext pc ) {
   
  -			pc.setAttribute("name","pageContext");
  -		}
  +        pc.setAttribute( "name", "pageContext" );
  +    }
   
  -// Test for doStartTag method in TagSupport class.
  +    // Test for doStartTag method in TagSupport class.
       public int doStartTag() {
  -       if ("doStartTag".equalsIgnoreCase (this.getAtt1())) {
  -           TestString +=this.getAtt1();
  -
  -// Test for methods in variableInfo class.
  -
  -// Creating a hashttable to be passed TagData constructor,
  -   java.util.Hashtable ht = new java.util.Hashtable();
  -	ht.put("a1","98.5");
  -	ht.put("a2","107.1");
  -	ht.put("a3","105.1");
  -
  -	TagData td = new TagData(ht);
  -
  -
  -    ftet = new TestTagExtraInfo();
  -    VariableInfo[] vi = ftet.getVariableInfo(td);
  -    BodyTagSupport bts = new BodyTagSupport();
  +        if ( "doStartTag".equalsIgnoreCase ( this.getAtt1() ) ) {
  +            TestString += this.getAtt1();
   
  -	if("getClassName".equals(this.getAtt2())) {
  -	TestString = TestString + vi[0].getClassName();
  -	} else if ("getDeclare".equals(this.getAtt2())) {
  -	TestString = TestString + vi[0].getDeclare();
  -	} else if ("getScope".equals(this.getAtt2())) {
  -	TestString = TestString + vi[0].getScope();
  -	} else if ("getVarName".equals(this.getAtt2())) {
  -	TestString = TestString + vi[0].getVarName();
  -	}
  +            // Test for methods in variableInfo class.
   
  +            // Creating a hashttable to be passed TagData constructor,
  +            java.util.Hashtable ht = new java.util.Hashtable();
  +            ht.put( "a1", "98.5" );
  +            ht.put( "a2", "107.1" );
  +            ht.put( "a3", "105.1" );
   
  +        } // if condition
   
  -} // if condition
  -return EVAL_BODY_TAG;
  -}
  +        return EVAL_BODY_TAG;
  +    }
   
  -// Test for doInitBody method in BodyTagsupport class
  +    // Test for doInitBody method in BodyTagsupport class
   
       public void doInitBody() throws JspException {
   
  -		TestTagExtraInfo texInfo=new TestTagExtraInfo();
  -		TagInfo tagInfo=texInfo.getInfoObj();
  -		TagLibraryInfo tlibInfo=tagInfo.getTagLibrary();
  -		TagAttributeInfo[] tagAttrInfo=tagInfo.getAttributes();
  -
  -
  -		//Checking for TagAttributeInfo methods
  -
  -		if("getName".equalsIgnoreCase(this.getAtt1()))
  -			if(tagAttrInfo[0].getName().equalsIgnoreCase("toBrowser"))
  -				TestString=TestString+"getName";
  -
  -		if("getTypeName".equalsIgnoreCase(this.getAtt1()))
  -			if(tagAttrInfo[0].getTypeName().equalsIgnoreCase("java.lang.String"))
  -				TestString=TestString+"getTypeName";
  -
  -
  -		if("isRequired".equalsIgnoreCase(this.getAtt1()))
  -			if(tagAttrInfo[0].isRequired() == false)
  -				TestString=TestString+"isRequired";
  -
  -
  -		if("getIdAttribute".trim().equalsIgnoreCase(this.getAtt1()))
  -			if(tagAttrInfo[0].getIdAttribute(tagAttrInfo).getName().equalsIgnoreCase("id") )
  -				TestString=TestString+"getIdAttribute";
  -
  -		if("canBeRequestTime".trim().equalsIgnoreCase(this.getAtt1()))
  -			if(tagAttrInfo[0].canBeRequestTime() == false)
  -				TestString=TestString+"canBeRequestTime";
  -
  -
  -		//Checking for TagLibraryInfo methods
  -
  -		String info="A simple tag library for the examples";
  -		String uri="/WEB-INF/classes/jsp/example-taglib.tld";
  -
  -		if("getInfoString".equalsIgnoreCase(this.getAtt1())){
  -
  -			if(tlibInfo.getInfoString().trim().equalsIgnoreCase(info))
  -				TestString=TestString+this.getAtt1();
  -		}
  -
  -		if("getPrefixString".equalsIgnoreCase(this.getAtt1()))
  -			if(tlibInfo.getPrefixString().equalsIgnoreCase("eg"))
  -				TestString=TestString+this.getAtt1();
  -
  -		if("getReliableURN".equalsIgnoreCase(this.getAtt1()))
  -			if(tlibInfo.getReliableURN().equalsIgnoreCase("1.0"))
  -				TestString=TestString+this.getAtt1();
  -
  +        //Test for doInitBody method.
   
  -		if("getRequiredVersion".equalsIgnoreCase(this.getAtt1()))
  -			if(tlibInfo.getRequiredVersion().equalsIgnoreCase("1.1"))
  -				TestString=TestString+this.getAtt1();
  -
  -		if("getShortName".equalsIgnoreCase(this.getAtt1()))
  -			if(tlibInfo.getShortName().equalsIgnoreCase("simple"))
  -				TestString=TestString+this.getAtt1();
  -
  -		if("getURI".equalsIgnoreCase(this.getAtt1())){
  -
  -			if(tlibInfo.getURI().equalsIgnoreCase(uri))
  -				TestString=TestString+this.getAtt1();
  -
  -		}
  -
  -		//Checking for tagInfo object by calling one of its methods.
  -
  -		if("getTag".equalsIgnoreCase(this.getAtt1())){
  -
  -			if(tlibInfo.getTag("test").getTagName().equalsIgnoreCase("test"))
  -				TestString=TestString+this.getAtt1();
  -
  -		}
  -
  -		//Checking for the no of tags defined in the tld using
  -		// the array returned.
  -
  -		if("getTags".equalsIgnoreCase(this.getAtt1())){
  -				if(tlibInfo.getTags().length == 5)
  -					TestString=TestString+this.getAtt1();
  -		}
  -
  -		//Checking for TagExtraInfo methods
  -
  -		if("getTagInfo".equalsIgnoreCase(this.getAtt1()))
  -			TestString =TestString+texInfo.getRes();
  -
  -		if("isValid".equalsIgnoreCase(this.getAtt1())){
  -			TestString =TestString+texInfo.getRes1();
  -		}
  -		if("setTagInfo".equalsIgnoreCase(this.getAtt1()))
  -			TestString =TestString+texInfo.getRes2();
  -
  -		if("getVariableInfo".equalsIgnoreCase(this.getAtt1()))
  -			TestString =TestString+texInfo.getRes3();
  -
  -      //Test for doInitBody method.
  -
  -        if ("doInitBody".equalsIgnoreCase (this.getAtt1())) {
  -       		TestString +=this.getAtt1(); }
  +        if ( "doInitBody".equalsIgnoreCase ( this.getAtt1() ) ) {
  +            TestString += this.getAtt1();
  +        }
   
  -// Test for getParent method in TagSupport
  +        // Test for getParent method in TagSupport
   
  -     	if ("getParent".equalsIgnoreCase (this.getAtt2())) {
  -       		TagSupport ts = new TagSupport();
  -       		setParent(this);
  -       		Tag tt = getParent();
  -		// FIXME this looks wrong (pierred) replaced by line below
  -		//	if(tt.toString().regionMatches(true,9,"examples.TestTag",9,7)) {
  -		if (tt == this) {
  -       			TestString = TestString + "Pass";
  -       		}
  -       		else {
  -       			TestString = TestString + "Fails";
  -       		}
  -		}
  -	}
  +        if ( "getParent".equalsIgnoreCase ( this.getAtt2() ) ) {
  +            TagSupport ts = new TagSupport();
  +            setParent( this );
  +            Tag tt = getParent();
  +            // FIXME this looks wrong (pierred) replaced by line below
  +            //	if(tt.toString().regionMatches(true,9,"examples.TestTag",9,7)) {
  +            if ( tt == this ) {
  +                TestString = TestString + "Pass";
  +            } else {
  +                TestString = TestString + "Fails";
  +            }
  +        }
  +    }
   
  -//Test for doAfterBody method in BodyTagSupport class
  +    //Test for doAfterBody method in BodyTagSupport class
   
       public int doAfterBody() throws JspException {
  -
  -
           try {
   
  -       if ("doAfterBody".equalsIgnoreCase (this.getAtt1())) {
  -            TestString += this.getAtt1();
  -        }
  +            if ( "doAfterBody".equalsIgnoreCase ( this.getAtt1() ) ) {
  +                TestString += this.getAtt1();
  +            }
  +
               String s = bodyOut.getString();
  -            System.err.println(s);
  -            if (false)
  -            	bodyOut.println(TestString);
  +            System.err.println( s );
  +
  +            if ( false )
  +                bodyOut.println( TestString );
  +
               return SKIP_BODY;
  -        } catch (IOException ex) {
  -            throw new JspException(ex.toString());
  +        } catch ( IOException ex ) {
  +            throw new JspException( ex.toString() );
           }
       }
   
  -// Test for doEndTag method in BodyTagSupport class
  -
  -    public int doEndTag() throws JspException{
  +    // Test for doEndTag method in BodyTagSupport class
   
  +    public int doEndTag() throws JspException {
  +        if ( "doEndTag".equalsIgnoreCase ( this.getAtt1() ) ) {
  +            TestString += this.getAtt1();
  +        }
   
  -       if ("doEndTag".equalsIgnoreCase (this.getAtt1())) {
  -       	TestString +=this.getAtt1();
  -		}
  -       return EVAL_PAGE;
  -    }
  +        try {
  +            if ( toBrowser )
  +                bodyOut.println( TestString );
   
  +            bodyOut.writeOut( bodyOut.getEnclosingWriter() );
  +        } catch ( IOException ioe ) {}
   
  -// Test for release method in BodyTagSupport class
  +        return EVAL_PAGE;
  +    }
   
  +    // Test for release method in BodyTagSupport class
       public void release() {
  -       if ("release".equalsIgnoreCase (this.getAtt1())) {
  -       		TestString +=this.getAtt1();
  -       	}
  -        try {
  -            if (toBrowser)
  -            bodyOut.println(TestString);
  -     	    bodyOut.writeOut(bodyOut.getEnclosingWriter());
  -	    toBrowser = false;
  -	    //TestString="";
  -            atts1="";
  -            atts2="";
  -            count=0;
  -     	} catch (IOException ioe) {}
  +        atts1 = "";
  +        atts2 = "";
  +        TestString = "";
  +        count = 0;
  +        toBrowser = false;
       }
   }
  
  
  
  1.2       +102 -45   jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/TestTagExtraInfo.java
  
  Index: TestTagExtraInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/TestTagExtraInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestTagExtraInfo.java	17 Oct 2000 21:05:56 -0000	1.1
  +++ TestTagExtraInfo.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,67 +1,124 @@
  - /*
  - * This is a hack on a hack.  We are trying to create a new TestTagExtraInfo that
  - * will pass the tests  - epll.  May 21st, 2000
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/TestTagExtraInfo.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
  + *
    */
   
   package tags;
   
   import javax.servlet.jsp.tagext.*;
   
  +/*
  +* This is a hack on a hack.  We are trying to create a new TestTagExtraInfo that
  +* will pass the tests  - epll.  May 21st, 2000-2001
  +*/
   public class TestTagExtraInfo extends TagExtraInfo {
   
  -	static String res1="";
  -	static String res2="";
  -	static String res3="";
  -	static String res="";
  -	static TagInfo tgInfo;
  +    static String res1 = "";
  +    static String res2 = "";
  +    static String res3 = "";
  +    static String res = "";
  +    static TagInfo tgInfo;
   
   
  -	public TestTagExtraInfo(){}
  +    public TestTagExtraInfo() {}
   
  -	public boolean isValid(TagData tagData){
  -		res1="isValid";
  -		String att=tagData.getAttributeString("att1");
  -		String id=tagData.getId();
  +    public boolean isValid( TagData tagData ) {
  +        res1 = "isValid";
  +        String att = tagData.getAttributeString( "att1" );
  +        String id = tagData.getId();
   
  -		// Add the following patch - epll.
  +        // Add the following patch - epll.
   
  -		res = "getTagInfo";
  -		res2 = "setTagInfo";
  -		this.tgInfo = this.getTagInfo();
  +        res = "getTagInfo";
  +        res2 = "setTagInfo";
  +        this.tgInfo = this.getTagInfo();
   
  -		// up to here is the new patch
  -		return true;
  -	}
  -
  -
  -	public VariableInfo[] getVariableInfo(TagData data) {
  -		res3="getVariableInfo";
  -         return new VariableInfo[] {
  -                new VariableInfo("member",
  -                                 "String",
  -                                 true,
  -                                 VariableInfo.NESTED)
  -            };
  +        // up to here is the new patch
  +        return true;
       }
   
  +    public VariableInfo[] getVariableInfo( TagData data ) {
  +        res3 = "getVariableInfo";
  +        return new VariableInfo[] {
  +                   new VariableInfo( "member",
  +                                     "String",
  +                                     true,
  +                                     VariableInfo.NESTED )
  +               };
  +    }
   
  -    public String getRes(){
  -		return res;
  -	}
  +    public String getRes() {
  +        return res;
  +    }
   
  -	public String getRes1(){
  -			return res1;
  -	}
  +    public String getRes1() {
  +        return res1;
  +    }
   
  -	public String getRes2(){
  -			return res2;
  -	}
  +    public String getRes2() {
  +        return res2;
  +    }
   
  -	public String getRes3(){
  -			return res3;
  -	}
  +    public String getRes3() {
  +        return res3;
  +    }
   
  -	public TagInfo getInfoObj(){
  -		return this.tgInfo;
  -	}
  +    public TagInfo getInfoObj() {
  +        return this.tgInfo;
  +    }
   }
  
  
  
  1.2       +91 -31    jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/Verbatim.java
  
  Index: Verbatim.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/Verbatim.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Verbatim.java	3 Oct 2000 23:37:29 -0000	1.1
  +++ Verbatim.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,8 +1,61 @@
  -/**
  - * Return the content of the body using one of several different
  - * mechanisms.
  +/*
  + * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/Verbatim.java,v 1.2 2002/01/28 23:35:16 rlubke Exp $ 
  + * $Revision: 1.2 $
  + * $Date: 2002/01/28 23:35:16 $
  + *
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 1999-2002 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/>.
    *
  - * Uses one attribute: "how" which may be "reader", "string" and "writeout"
    */
   
   package tags;
  @@ -11,50 +64,57 @@
   import javax.servlet.jsp.tagext.*;
   import java.io.*;
   
  +/**
  + * Return the content of the body using one of several different
  + * mechanisms.
  + *
  + * Uses one attribute: "how" which may be "reader", "string" and "writeout"
  + */
   public class Verbatim extends BodyTagSupport {
   
       // ================ Attributes ==================
   
  -    public void setHow(String s) {
  -	how = s;
  +    public void setHow( String s ) {
  +        how = s;
       }
   
       public String getHow() {
  -	return how;
  +        return how;
       }
   
       // ================== Actions ====================
   
       public int doEndTag() {
  -	BodyContent bd = getBodyContent();
  -	JspWriter w = getPreviousOut();
  +        BodyContent bd = getBodyContent();
  +        JspWriter w = getPreviousOut();
   
  -	try {
  -	    if (how.equals("reader")) {
  -		Reader r = bd.getReader();
  -		int b = r.read();
  -		while (b != -1) {
  -		    w.write(b);
  -		    b = r.read();
  -		}
  -		r.close();
  -	    } else if (how.equals("string")) {
  -		w.print(bd.getString());
  -	    } else if (how.equals("writeout")) {
  -		bd.writeOut(w);
  -	    } else {
  -		throw new Error("Inconsistent state!");
  -	    }
  -	} catch (IOException ex) {
  -	    throw new Error("caught IO excepiton");
  -	}
  +        try {
  +            if ( how.equals( "reader" ) ) {
  +                Reader r = bd.getReader();
  +                int b = r.read();
  +
  +                while ( b != -1 ) {
  +                    w.write( b );
  +                    b = r.read();
  +                }
  +
  +                r.close();
  +            } else if ( how.equals( "string" ) ) {
  +                w.print( bd.getString() );
  +            } else if ( how.equals( "writeout" ) ) {
  +                bd.writeOut( w );
  +            } else {
  +                throw new Error( "Inconsistent state!" );
  +            }
  +        } catch ( IOException ex ) {
  +            throw new Error( "caught IO excepiton" );
  +        }
   
  -	bd.clearBody();
  +        bd.clearBody();
   
  -	return EVAL_PAGE;
  +        return EVAL_PAGE;
       }
   
       // private data
  -
       protected String how = null;
   }
  
  
  
  1.1                  jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/SimpleIteratorTag.java
  
  Index: SimpleIteratorTag.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/SimpleIteratorTag.java,v 1.1 2002/01/28 23:35:16 rlubke Exp $ 
   * $Revision: 1.1 $
   * $Date: 2002/01/28 23:35:16 $
   *
   * ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2002 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/>.
   *
   */
  
  package tags;
  
  import javax.servlet.*;
  import javax.servlet.jsp.tagext.*;
  import javax.servlet.jsp.*;
  import java.io.IOException ;
  
  public class SimpleIteratorTag extends TagSupport {
      //This tag prints "JSP is cool" Iteratively depending on the
      //iteration attribute
  
      protected int number_of_iterations ;
      protected boolean callsetId = false;
      protected String tag_id ;
  
      public void setIteration( String num_iteration ) {
          try {
              number_of_iterations = Integer.parseInt( num_iteration );
          } catch ( NumberFormatException numex ) {
              number_of_iterations = 0;
          }
      }
  
      public void setSetget( String setget ) {
          if ( setget.equals( "true" ) )
              callsetId = true;
          else
              callsetId = false ;
      }
  
      public void setTagid( String id ) {
          if ( id == null )
              tag_id = "null" ;
          else
              tag_id = id;
      }
  
      public int doStartTag() {
          //Evaluate the body
          return Tag.EVAL_BODY_INCLUDE ;
      }
  
      public int doAfterBody() {
          try {
              if ( number_of_iterations > 0 ) {
                  pageContext.getOut().println( "JSP is cool" );
                  number_of_iterations -- ;
                  return IterationTag.EVAL_BODY_AGAIN ;
              }
  
              if ( callsetId )   //call the setId method
              {
                  setId( tag_id );
                  pageContext.getOut().println( "My Tag Id is:" + getId() );
              }
  
          } catch ( IOException ioe ) { }
          return Tag.SKIP_BODY ;
      }
  
      public int doEndTag() {
          try {
              pageContext.getOut().println( "End of tag Reached" );
          } catch ( IOException ioe ) { }
          return Tag.EVAL_PAGE ;
      }
  }
  
  
  
  1.2       +72 -23    jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/misc/PersistenceTag.java
  
  Index: PersistenceTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/misc/PersistenceTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PersistenceTag.java	18 Nov 2000 00:49:05 -0000	1.1
  +++ PersistenceTag.java	28 Jan 2002 23:35:16 -0000	1.2
  @@ -1,6 +1,59 @@
  -/**
  -This tag serves as a tag with instance variables. It is called from a jsp to test that the instance variables are persistent i.e if one tag contains another tag of same type the attributes for the first tag don't get overwritten with the second tag values.
  - */
  +/*
  + * @(#)PersistenceTag.java	1.4 10/04/01
  + *
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000-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/>.
  +*
  +*/
   
   package tags.misc;
   
  @@ -8,34 +61,30 @@
   import javax.servlet.jsp.tagext.*;
   import java.io.IOException;
   
  +/**
  +This tag serves as a tag with instance variables. It is called from a jsp to test that the instance variables are persistent i.e if one tag contains another tag of same type the attributes for the first tag don't get overwritten with the second tag values.
  + */
   public class PersistenceTag extends TagSupport {
   
  -protected String tag_id ;
  +    protected String tag_id ;
  +
  +    public void setTagid( String tag_id ) {
  +        this.tag_id = tag_id;
  +    }
   
  -    public void setTagid(String tag_id)
  -	{
  -	this.tag_id =tag_id;
  -	}
  -    
       public int doStartTag() {
  -       try
  -        {
  -         pageContext.getOut().println("doStartTag from tag " + tag_id);
  -        }catch(IOException ioe)
  -         {  }
  +        try {
  +            pageContext.getOut().println( "doStartTag from tag " + tag_id );
  +        } catch ( IOException ioe ) { }
   
  -	return EVAL_BODY_INCLUDE ;
  +        return EVAL_BODY_INCLUDE ;
       }
   
       public int doEndTag() {
  -       try
  -        {
  -         pageContext.getOut().println("doEndTag from tag " + tag_id);
  -        }catch(IOException ioe)
  -         {  }
  +        try {
  +            pageContext.getOut().println( "doEndTag from tag " + tag_id );
  +        } catch ( IOException ioe ) { }
   
  -	return EVAL_PAGE ;
  +        return EVAL_PAGE ;
       }
  -
  -
   }
  
  
  
  1.3       +80 -31    jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/misc/ReqTimeAttributesTag.java
  
  Index: ReqTimeAttributesTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/WEB-INF/classes/tags/misc/ReqTimeAttributesTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ReqTimeAttributesTag.java	23 Nov 2000 22:48:39 -0000	1.2
  +++ ReqTimeAttributesTag.java	28 Jan 2002 23:35:16 -0000	1.3
  @@ -1,6 +1,59 @@
  -/**
  -This tag is used to tests the order of evaluation in tag attributes. The attribtes are request time expressions . Section 2.13.1 of jsp 1.2 PF1
  - */
  +/*
  +* @(#)ReqTimeAttributesTag.java	1.4 10/04/01
  +*
  +* The Apache Software License, Version 1.1
  +*
  +* Copyright (c) 2000-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/>.
  +*
  +*/
   
   package tags.misc;
   
  @@ -8,42 +61,38 @@
   import javax.servlet.jsp.tagext.*;
   import java.io.IOException;
   
  +/**
  +This tag is used to tests the order of evaluation in tag attributes. The attribtes are request time expressions . Section 2.13.1 of jsp 1.2 PF1
  + */
   public class ReqTimeAttributesTag extends TagSupport {
   
  -protected int attr1=0 ;
  -protected int attr2=0;
  -protected int attr3=0;
  -
  -    public void setAttr1(int attr)
  -	{
  -	attr1=attr;
  -	}
  -    public void setAttr2(int attr)
  -	{
  -	attr2=attr;
  -	}
  -    
  -    public void setAttr3(int attr)
  -	{
  -	attr3=attr;
  -	}
  +    protected int attr1 = 0 ;
  +    protected int attr2 = 0;
  +    protected int attr3 = 0;
   
  +    public void setAttr1( int attr ) {
  +        attr1 = attr;
  +    }
  +
  +    public void setAttr2( int attr ) {
  +        attr2 = attr;
  +    }
  +
  +    public void setAttr3( int attr ) {
  +        attr3 = attr;
  +    }
   
       public int doStartTag() {
  -       try
  -        {
  -         pageContext.getOut().println("Attribute1: " + attr1);
  -         pageContext.getOut().println("Attribute2: " + attr2);
  -         pageContext.getOut().println("Attribute3: " + attr3);
  -        }catch(IOException ioe)
  -         {  }
  +        try {
  +            pageContext.getOut().println( "Attribute1: " + attr1 );
  +            pageContext.getOut().println( "Attribute2: " + attr2 );
  +            pageContext.getOut().println( "Attribute3: " + attr3 );
  +        } catch ( IOException ioe ) { }
   
  -	return EVAL_BODY_INCLUDE ;
  +        return EVAL_BODY_INCLUDE ;
       }
   
       public int doEndTag() {
  -	return EVAL_PAGE ;
  +        return EVAL_PAGE ;
       }
  -
  -
   }
  
  
  

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


Mime
View raw message