Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java (working copy) @@ -47,6 +47,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); @@ -67,6 +68,7 @@ //********************************************************************* // Tag logic + @Override public int doStartTag() { caught = false; return EVAL_BODY_INCLUDE; Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java (working copy) @@ -46,6 +46,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); @@ -87,6 +88,7 @@ // Tag logic // always include body + @Override public int doStartTag() throws JspException { subtagGateClosed = false; // when we start, no children have run return EVAL_BODY_INCLUDE; Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java (working copy) @@ -254,14 +254,17 @@ // (We inherit semantics and Javadoc from LoopTagSupport.) + @Override protected boolean hasNext() throws JspTagException { return items.hasNext(); } + @Override protected Object next() throws JspTagException { return items.next(); } + @Override protected void prepare() throws JspTagException { // produce the right sort of ForEachIterator if (rawItems != null) { @@ -290,6 +293,7 @@ // Tag logic and lifecycle management // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); items = null; Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java (working copy) @@ -69,6 +69,7 @@ * We inherit semantics and Javadoc from LoopTagSupport. */ + @Override protected void prepare() throws JspTagException { if (items instanceof ValueExpression) { deferredExpression = (ValueExpression) items; @@ -84,10 +85,12 @@ } } + @Override protected boolean hasNext() throws JspTagException { return st.hasMoreElements(); } + @Override protected Object next() throws JspTagException { if (deferredExpression!=null) { st.nextElement(); @@ -108,6 +111,7 @@ // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); items = delims = null; @@ -118,6 +122,7 @@ * Get the delimiter for string tokens. Used only for constructing * the deferred expression for it. */ + @Override protected String getDelims() { return delims; } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java (working copy) @@ -118,6 +118,7 @@ // Tag logic // determines what kind of import and variable exposure to perform + @Override public int doStartTag() throws JspException { // Sanity check if (context != null @@ -151,6 +152,7 @@ } // manages connections as necessary (creating or destroying) + @Override public int doEndTag() throws JspException { try { // If we didn't expose a Reader earlier... @@ -189,6 +191,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); super.release(); @@ -386,6 +389,7 @@ super(request); } + @Override public String getMethod() { return "GET"; } @@ -428,7 +432,8 @@ /** A ServletOutputStream we convey, tied to this Writer. */ private ServletOutputStream sos = new ServletOutputStream() { - public void write(int b) throws IOException { + @Override + public void write(int b) throws IOException { bos.write(b); } }; @@ -451,7 +456,8 @@ } /** Returns a Writer designed to buffer the output. */ - public PrintWriter getWriter() { + @Override + public PrintWriter getWriter() { if (isStreamUsed) throw new IllegalStateException( Resources.getMessage("IMPORT_ILLEGAL_STREAM")); @@ -460,7 +466,8 @@ } /** Returns a ServletOutputStream designed to buffer the output. */ - public ServletOutputStream getOutputStream() { + @Override + public ServletOutputStream getOutputStream() { if (isWriterUsed) throw new IllegalStateException( Resources.getMessage("IMPORT_ILLEGAL_WRITER")); @@ -469,16 +476,19 @@ } /** Has no effect. */ - public void setContentType(String x) { + @Override + public void setContentType(String x) { // ignore } /** Has no effect. */ - public void setLocale(Locale x) { + @Override + public void setLocale(Locale x) { // ignore } - public void setStatus(int status) { + @Override + public void setStatus(int status) { this.status = status; } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java (working copy) @@ -32,6 +32,7 @@ */ // Don't let the condition stop us... :-) + @Override protected boolean condition() { return true; } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java (working copy) @@ -59,6 +59,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { output = null; super.release(); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java (working copy) @@ -68,6 +68,7 @@ // Tag logic // simply send our name and value to our appropriate ancestor + @Override public int doEndTag() throws JspException { Tag t = findAncestorWithClass(this, ParamParent.class); if (t == null) @@ -101,6 +102,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java (working copy) @@ -86,6 +86,7 @@ // Tag logic // resets any parameters that might be sent + @Override public int doStartTag() throws JspException { params = new ParamSupport.ParamManager(); return EVAL_BODY_BUFFERED; @@ -93,6 +94,7 @@ // gets the right value, encodes it, and prints or stores it + @Override public int doEndTag() throws JspException { String result; // the eventual result @@ -117,6 +119,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java (working copy) @@ -58,6 +58,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); @@ -68,6 +69,7 @@ // Tag logic // removes the variable (from a specific scope, if specified) + @Override public int doEndTag() throws JspException { if (!scopeSpecified) pageContext.removeAttribute(var); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java (working copy) @@ -68,6 +68,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { var = null; scope = null; @@ -78,6 +79,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { // decide what to do with the result Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java (working copy) @@ -90,6 +90,7 @@ // Tag logic // resets any parameters that might be sent + @Override public int doStartTag() throws JspException { params = new ParamSupport.ParamManager(); return EVAL_BODY_BUFFERED; @@ -97,6 +98,7 @@ // gets the right value, encodes it, and prints or stores it + @Override public int doEndTag() throws JspException { String result; // the eventual result @@ -126,6 +128,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java (working copy) @@ -49,6 +49,7 @@ * ChooseTag wants it to do so. The condition will not even be * evaluated if ChooseTag instructs us not to run. */ + @Override public int doStartTag() throws JspException { Tag parent; Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java (working copy) @@ -92,11 +92,13 @@ //********************************************************************* // Tag logic + @Override public int doStartTag() throws JspException { locCtxt = getLocalizationContext(pageContext, basename); return EVAL_BODY_BUFFERED; } + @Override public int doEndTag() throws JspException { if (bodyContent != null) { try { @@ -110,6 +112,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java (working copy) @@ -114,6 +114,7 @@ /* * Formats the given date and time. */ + @Override public int doEndTag() throws JspException { String formatted = null; @@ -176,6 +177,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java (working copy) @@ -122,6 +122,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { String formatted = null; Object input = null; @@ -212,6 +213,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java (working copy) @@ -113,11 +113,13 @@ //********************************************************************* // Tag logic + @Override public int doStartTag() throws JspException { params.clear(); return EVAL_BODY_BUFFERED; } + @Override public int doEndTag() throws JspException { String key = null; @@ -211,6 +213,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java (working copy) @@ -60,6 +60,7 @@ // Tag logic // Supply our value to our parent tag + @Override public int doEndTag() throws JspException { Tag t = findAncestorWithClass(this, MessageSupport.class); if (t == null) { @@ -89,6 +90,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java (working copy) @@ -103,6 +103,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { String input = null; @@ -197,6 +198,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java (working copy) @@ -100,6 +100,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { String input = null; @@ -174,6 +175,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java (working copy) @@ -75,6 +75,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { charEncoding = value; if ((charEncoding == null) @@ -105,6 +106,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java (working copy) @@ -77,6 +77,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { LocalizationContext locCtxt = BundleSupport.getLocalizationContext(pageContext, basename); @@ -92,6 +93,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java (working copy) @@ -90,6 +90,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { Locale locale = null; @@ -112,6 +113,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java (working copy) @@ -79,6 +79,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { TimeZone timeZone = null; @@ -104,6 +105,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java (working copy) @@ -73,6 +73,7 @@ //********************************************************************* // Tag logic + @Override public int doStartTag() throws JspException { if (value == null) { @@ -90,6 +91,7 @@ return EVAL_BODY_BUFFERED; } + @Override public int doEndTag() throws JspException { try { pageContext.getOut().print(bodyContent.getString()); @@ -101,6 +103,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java (working copy) @@ -65,6 +65,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { SQLExecutionTag parent = (SQLExecutionTag) findAncestorWithClass(this, SQLExecutionTag.class); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java (working copy) @@ -37,6 +37,7 @@ //********************************************************************* // Tag logic + @Override public int doEndTag() throws JspException { SQLExecutionTag parent = (SQLExecutionTag) findAncestorWithClass(this, SQLExecutionTag.class); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java (working copy) @@ -138,6 +138,7 @@ * Prepares for execution by setting the initial state, such as * getting the Connection */ + @Override public int doStartTag() throws JspException { if (!maxRowsSpecified) { @@ -181,6 +182,7 @@ * element, or is retrieved from a JSP scope attribute * named javax.servlet.jstl.sql.dataSource. */ + @Override public int doEndTag() throws JspException { /* * Use the SQL statement specified by the sql attribute, if any, Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java (working copy) @@ -85,6 +85,7 @@ //********************************************************************* // Tag logic + @Override public int doStartTag() throws JspException { DataSource ds; @@ -124,6 +125,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java (working copy) @@ -87,6 +87,7 @@ * getting the Connection and preparing it for * the transaction. */ + @Override public int doStartTag() throws JspException { if ((rawDataSource == null) && dataSourceSpecified) { @@ -121,6 +122,7 @@ /** * Commits the transaction. */ + @Override public int doEndTag() throws JspException { try { conn.commit(); @@ -168,6 +170,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { dataSourceSpecified = false; rawDataSource = null; Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java (working copy) @@ -110,6 +110,7 @@ * Prepares for execution by setting the initial state, such as * getting the Connection */ + @Override public int doStartTag() throws JspException { try { @@ -134,6 +135,7 @@ * element, or is retrieved from a JSP scope attribute * named javax.servlet.jsp.jstl.sql.dataSource. */ + @Override public int doEndTag() throws JspException { /* * Use the SQL statement specified by the sql attribute, if any, Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java (working copy) @@ -63,6 +63,7 @@ // Tag logic // applies XPath expression from 'select' and prints the result + @Override public int doStartTag() throws JspException { try { XPathUtil xu = new XPathUtil(pageContext); @@ -75,6 +76,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java (working copy) @@ -45,16 +45,19 @@ // (We inherit semantics and Javadoc from LoopTagSupport.) + @Override protected void prepare() throws JspTagException { nodesIndex = 0; XPathUtil xu = new XPathUtil(pageContext); nodes = xu.selectNodes(XPathUtil.getContext(this), select); } + @Override protected boolean hasNext() throws JspTagException { return (nodesIndex < nodes.size()); } + @Override protected Object next() throws JspTagException { Object o = nodes.get(nodesIndex++); if (!(o instanceof org.w3c.dom.Node)) @@ -69,6 +72,7 @@ // Tag logic and lifecycle management // Releases any resources we may have (or inherit) + @Override public void release() { init(); super.release(); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java (working copy) @@ -38,6 +38,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); @@ -47,6 +48,7 @@ //********************************************************************* // Supplied conditional logic + @Override protected boolean condition() throws JspTagException { XPathUtil xu = new XPathUtil(pageContext); return (xu.booleanValueOf(XPathUtil.getContext(this), select)); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java (working copy) @@ -58,6 +58,7 @@ // Tag logic // simply send our name and value to our parent tag + @Override public int doEndTag() throws JspException { Tag t = findAncestorWithClass(this, TransformSupport.class); if (t == null) @@ -77,6 +78,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java (working copy) @@ -103,6 +103,7 @@ // Tag logic // parse 'source' or body, storing result in 'var' + @Override public int doEndTag() throws JspException { try { @@ -163,6 +164,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { init(); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java (working copy) @@ -64,6 +64,7 @@ // Tag logic // applies XPath expression from 'select' and stores the result in 'var' + @Override public int doStartTag() throws JspException { // process the query XPathUtil xu = new XPathUtil(pageContext); @@ -85,6 +86,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java (working copy) @@ -113,12 +113,14 @@ //********************************************************************* // Tag logic + @Override public int doStartTag() throws JspException { // set up transformer in the start tag so that nested tags can set parameters directly t = getTransformer(xslt, xsltSystemId); return EVAL_BODY_BUFFERED; } + @Override public int doEndTag() throws JspException { Source source = xmlSpecified ? getSourceFromXmlAttribute() : getDocumentFromBodyContent(); @@ -148,6 +150,7 @@ // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); @@ -339,12 +342,15 @@ this.w = w; } + @Override public void close() { } + @Override public void flush() { } + @Override public void write(char[] cbuf, int off, int len) throws IOException { w.write(cbuf, off, len); } Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java (working copy) @@ -39,6 +39,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); @@ -48,6 +49,7 @@ //********************************************************************* // Supplied conditional logic + @Override protected boolean condition() throws JspTagException { XPathUtil xu = new XPathUtil(pageContext); return (xu.booleanValueOf(XPathUtil.getContext(this), select)); Index: impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java (working copy) @@ -218,6 +218,7 @@ * (from xalan: which must be passed in order to lazy evaluate variables.) * @param qname The qualified name of the variable. */ + @Override public XObject getVariableOrParam( XPathContext xctxt, org.apache.xml.utils.QName qname) @@ -867,10 +868,12 @@ return (Node)nodeVector.elementAt( index ); } + @Override public Object elementAt ( int index ) { return nodeVector.elementAt( index ); } + @Override public Object get ( int index ) { return nodeVector.get( index ); } @@ -879,6 +882,7 @@ return nodeVector.size( ); } + @Override public int size ( ) { //System.out.println("JSTL node list size => " + nodeVector.size() ); return nodeVector.size( ); Index: impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java (working copy) @@ -40,6 +40,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); @@ -49,6 +50,7 @@ //********************************************************************* // Supplied conditional logic + @Override protected boolean condition() { return test; } Index: impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java (working copy) @@ -37,6 +37,7 @@ } // Releases any resources we may have (or inherit) + @Override public void release() { super.release(); init(); @@ -46,6 +47,7 @@ //********************************************************************* // Supplied conditional logic + @Override protected boolean condition() { return test; } Index: impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java (working copy) @@ -44,10 +44,12 @@ /** * Setter method for the Transaction Isolation level. */ + @Override public void setIsolation(String isolation) { this.isolationRT = isolation; } + @Override public int doStartTag() throws JspException { if (isolationRT != null) super.setIsolation(isolationRT); Index: impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java (working copy) @@ -33,6 +33,7 @@ public class DeclareTEI extends TagExtraInfo { // purposely inherit JavaDoc and semantics from TagExtraInfo + @Override public VariableInfo[] getVariableInfo(TagData data) { // construct the relevant VariableInfo object VariableInfo id = new VariableInfo( Index: impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java (working copy) @@ -37,6 +37,7 @@ * * - If 'items' is not specified, 'begin' and 'end' must be */ + @Override public boolean isValid(TagData us) { if (!Util.isSpecified(us, ITEMS)) if (!Util.isSpecified(us, BEGIN) || !(Util.isSpecified(us, END))) Index: impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java (working copy) @@ -31,6 +31,7 @@ final private static String VAR = "var"; final private static String VAR_READER = "varReader"; + @Override public boolean isValid(TagData us) { // don't allow both VAR and VAR_READER, together if (Util.isSpecified(us, VAR) && Util.isSpecified(us, VAR_READER)) Index: impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java (working copy) @@ -33,6 +33,7 @@ final private static String SCOPE = "scope"; final private static String SCOPE_DOM = "scopeDom"; + @Override public boolean isValid(TagData us) { // must have no more than one of VAR and VAR_DOM ... if (Util.isSpecified(us, VAR) && Util.isSpecified(us, VAR_DOM)) Index: impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java (working copy) @@ -32,6 +32,7 @@ final private static String RESULT = "result"; final private static String VAR = "var"; + @Override public boolean isValid(TagData us) { // require XSLT if (!Util.isSpecified(us, XSLT)) Index: impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java (working copy) @@ -111,6 +111,7 @@ config = null; } + @Override public void release() { super.release(); init(); Index: impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java (working copy) @@ -92,6 +92,7 @@ //********************************************************************* // set its type and delegate validation to super-class + @Override public ValidationMessage[] validate( String prefix, String uri, PageData page) { return super.validate( TYPE_CORE, prefix, uri, page ); @@ -101,6 +102,7 @@ //********************************************************************* // Contract fulfillment + @Override protected DefaultHandler getHandler() { return new Handler(); } @@ -123,7 +125,8 @@ private boolean bodyIllegal = false; // process under the existing context (state), then modify it - public void startElement( + @Override + public void startElement( String ns, String ln, String qn, Attributes a) { // substitute our own parsed 'ln' if it's not provided @@ -254,7 +257,8 @@ depth++; } - public void characters(char[] ch, int start, int length) { + @Override + public void characters(char[] ch, int start, int length) { bodyNecessary = false; // body is no longer necessary! @@ -284,7 +288,8 @@ } } - public void endElement(String ns, String ln, String qn) { + @Override + public void endElement(String ns, String ln, String qn) { // consistently, we ignore JSP_TEXT if (isJspTag(ns, ln, TEXT)) Index: impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java (working copy) @@ -92,6 +92,7 @@ //********************************************************************* // set its type and delegate validation to super-class + @Override public ValidationMessage[] validate( String prefix, String uri, PageData page) { return super.validate( TYPE_FMT, prefix, uri, page ); @@ -101,6 +102,7 @@ //********************************************************************* // Contract fulfillment + @Override protected DefaultHandler getHandler() { return new Handler(); } @@ -120,7 +122,8 @@ private boolean bodyIllegal = false; // process under the existing context (state), then modify it - public void startElement( + @Override + public void startElement( String ns, String ln, String qn, Attributes a) { // substitute our own parsed 'ln' if it's not provided @@ -217,7 +220,8 @@ depth++; } - public void characters(char[] ch, int start, int length) { + @Override + public void characters(char[] ch, int start, int length) { bodyNecessary = false; // body is no longer necessary! @@ -232,7 +236,8 @@ lastElementName)); } - public void endElement(String ns, String ln, String qn) { + @Override + public void endElement(String ns, String ln, String qn) { // consistently, we ignore JSP_TEXT if (qn.equals(JSP_TEXT)) Index: impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java (working copy) @@ -54,6 +54,7 @@ //********************************************************************* // set its type and delegate validation to super-class + @Override public ValidationMessage[] validate( String prefix, String uri, PageData page) { return super.validate( TYPE_SQL, prefix, uri, page ); @@ -63,6 +64,7 @@ //********************************************************************* // Contract fulfillment + @Override protected DefaultHandler getHandler() { return new Handler(); } @@ -84,7 +86,8 @@ private boolean bodyIllegal = false; // process under the existing context (state), then modify it - public void startElement( + @Override + public void startElement( String ns, String ln, String qn, Attributes a) { // substitute our own parsed 'ln' if it's not provided @@ -185,7 +188,8 @@ depth++; } - public void characters(char[] ch, int start, int length) { + @Override + public void characters(char[] ch, int start, int length) { bodyNecessary = false; // body is no longer necessary! @@ -199,7 +203,8 @@ fail(Resources.getMessage("TLV_ILLEGAL_BODY", lastElementName)); } - public void endElement(String ns, String ln, String qn) { + @Override + public void endElement(String ns, String ln, String qn) { // consistently, we ignore JSP_TEXT if (qn.equals(JSP_TEXT)) Index: impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java =================================================================== --- impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java (revision 1028423) +++ impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java (working copy) @@ -87,6 +87,7 @@ //********************************************************************* // set its type and delegate validation to super-class + @Override public ValidationMessage[] validate( String prefix, String uri, PageData page) { return super.validate( TYPE_XML, prefix, uri, page ); @@ -96,6 +97,7 @@ //********************************************************************* // Contract fulfillment + @Override protected DefaultHandler getHandler() { return new Handler(); } @@ -118,7 +120,8 @@ private Stack transformWithSource = new Stack(); // process under the existing context (state), then modify it - public void startElement( + @Override + public void startElement( String ns, String ln, String qn, Attributes a) { // substitute our own parsed 'ln' if it's not provided @@ -232,7 +235,8 @@ depth++; } - public void characters(char[] ch, int start, int length) { + @Override + public void characters(char[] ch, int start, int length) { bodyNecessary = false; // body is no longer necessary! @@ -262,7 +266,8 @@ } } - public void endElement(String ns, String ln, String qn) { + @Override + public void endElement(String ns, String ln, String qn) { // consistently, we ignore JSP_TEXT if (qn.equals(JSP_TEXT)) Index: impl/src/test/java/org/apache/taglibs/standard/VersionTest.java =================================================================== --- impl/src/test/java/org/apache/taglibs/standard/VersionTest.java (revision 1028423) +++ impl/src/test/java/org/apache/taglibs/standard/VersionTest.java (working copy) @@ -27,11 +27,13 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); version = new Version(); } + @Override protected void tearDown() throws Exception { version = null; super.tearDown(); Index: spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java =================================================================== --- spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java (revision 1028423) +++ spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java (working copy) @@ -79,6 +79,7 @@ /** * Includes its body if condition() evaluates to true. */ + @Override public int doStartTag() throws JspException { // execute our condition() method once per invocation @@ -97,6 +98,7 @@ /** * Releases any resources this ConditionalTagSupport may have (or inherit). */ + @Override public void release() { super.release(); init(); Index: spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java =================================================================== --- spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java (revision 1028423) +++ spec/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java (working copy) @@ -53,6 +53,7 @@ this.i = i; } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -61,34 +62,42 @@ return i.equals(that.i) && orig.equals(that.orig); } + @Override public Class getExpectedType() { return orig.getExpectedType(); } + @Override public String getExpressionString() { return orig.getExpressionString(); } + @Override public Class getType(ELContext elContext) { return elContext.getELResolver().getType(elContext, orig.getValue(elContext), i); } + @Override public Object getValue(ELContext elContext) { return elContext.getELResolver().getValue(elContext, orig.getValue(elContext), i); } + @Override public int hashCode() { return orig.hashCode()+i; } + @Override public boolean isLiteralText() { return false; } + @Override public boolean isReadOnly(ELContext elContext) { return elContext.getELResolver().isReadOnly(elContext, orig.getValue(elContext), i); } + @Override public void setValue(ELContext elContext, Object arg1) { elContext.getELResolver().setValue(elContext, orig.getValue(elContext), i, arg1); } Index: spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java =================================================================== --- spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java (revision 1028423) +++ spec/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java (working copy) @@ -39,6 +39,7 @@ this.i = i; } + @Override public boolean equals(Object obj) { if (this == obj) return true; if (obj == null || getClass() != obj.getClass()) return false; @@ -47,34 +48,42 @@ return i == that.i && iteratedExpression.equals(that.iteratedExpression); } + @Override public Class getExpectedType() { return iteratedExpression.getValueExpression().getExpectedType(); } + @Override public String getExpressionString() { return iteratedExpression.getValueExpression().getExpressionString(); } + @Override public Class getType(ELContext elContext) { return iteratedExpression.getValueExpression().getType(elContext); } + @Override public Object getValue(ELContext elContext) { return iteratedExpression.getItem(elContext, i); } + @Override public int hashCode() { return iteratedExpression.hashCode()+i; } + @Override public boolean isLiteralText() { return false; } + @Override public boolean isReadOnly(ELContext elContext) { return true; } + @Override public void setValue(ELContext elContext, Object arg1) { } Index: spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java =================================================================== --- spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java (revision 1028423) +++ spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java (working copy) @@ -209,6 +209,7 @@ /** * Releases any resources this LoopTagSupport may have (or inherit). */ + @Override public void release() { super.release(); init(); @@ -217,6 +218,7 @@ /** * Begins iterating by processing the first item. */ + @Override public int doStartTag() throws JspException { if (end != -1 && begin > end) { // JSTL 1.1. We simply do not execute the loop. @@ -257,6 +259,7 @@ * Continues the iteration when appropriate -- that is, if we (a) have * more items and (b) don't run over our 'end' (given our 'step'). */ + @Override public int doAfterBody() throws JspException { // re-sync the index, given our prior behind-the-scenes 'step' Index: spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java =================================================================== --- spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java (revision 1028423) +++ spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java (working copy) @@ -84,6 +84,7 @@ permittedTaglibs = null; } + @Override public void release() { super.release(); init(); @@ -93,6 +94,7 @@ //********************************************************************* // Validation entry point + @Override public synchronized ValidationMessage[] validate( String prefix, String uri, PageData page) { try { @@ -164,6 +166,7 @@ private class PermittedTaglibsHandler extends DefaultHandler { // if the element is , check its "xmlns:" attributes + @Override public void startElement( String ns, String ln, String qn, Attributes a) { Index: spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java =================================================================== --- spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java (revision 1028423) +++ spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java (working copy) @@ -77,7 +77,8 @@ * @param initParms a mapping from the names of the initialization parameters * to their values, as specified in the TLD. */ - public void setInitParameters (Map initParms) { + @Override +public void setInitParameters (Map initParms) { super.setInitParameters(initParms); String declarationsParm = (String) initParms.get("allowDeclarations"); String scriptletsParm = (String) initParms.get("allowScriptlets"); @@ -101,7 +102,8 @@ * @return null, if the page is valid; otherwise, a ValidationMessage[] * containing one or more messages indicating why the page is not valid. */ - public ValidationMessage[] validate + @Override +public ValidationMessage[] validate (String prefix, String uri, PageData page) { InputStream in = null; SAXParser parser; @@ -150,6 +152,7 @@ * which attributes actually support request-time attribute values * and checking only those is far more trouble than it's worth.) */ + @Override public void startElement (String namespaceUri, String localName, String qualifiedName, Attributes atts) { Index: standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java =================================================================== --- standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java (revision 1028423) +++ standard-test/src/test/java/org/apache/taglibs/standard/functions/TestEndsWith.java (working copy) @@ -28,10 +28,12 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } Index: standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java =================================================================== --- standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java (revision 1028423) +++ standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test34109.java (working copy) @@ -27,10 +27,12 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } Index: standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java =================================================================== --- standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java (revision 1028423) +++ standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java (working copy) @@ -29,10 +29,12 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } Index: standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java =================================================================== --- standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java (revision 1028423) +++ standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/TestSetTag.java (working copy) @@ -29,10 +29,12 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } Index: standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java =================================================================== --- standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java (revision 1028423) +++ standard-test/src/test/java/org/apache/taglibs/standard/tag/el/fmt/TestDateTag.java (working copy) @@ -27,10 +27,12 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } Index: standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java =================================================================== --- standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java (revision 1028423) +++ standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test33054.java (working copy) @@ -28,6 +28,7 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); @@ -47,6 +48,7 @@ conn.close(); } + @Override protected void tearDown() throws Exception { super.tearDown(); Connection conn = DriverManager.getConnection("jdbc:derby:cactustest"); Index: standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java =================================================================== --- standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java (revision 1028423) +++ standard-test/src/test/java/org/apache/taglibs/standard/tag/el/sql/Test43831.java (working copy) @@ -28,6 +28,7 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); @@ -47,6 +48,7 @@ conn.close(); } + @Override protected void tearDown() throws Exception { super.tearDown(); Connection conn = DriverManager.getConnection("jdbc:derby:cactustest"); Index: standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java =================================================================== --- standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java (revision 1028423) +++ standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test30068.java (working copy) @@ -27,10 +27,12 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } Index: standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java =================================================================== --- standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java (revision 1028423) +++ standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java (working copy) @@ -27,10 +27,12 @@ super(name); } + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); }