Author: jboynes
Date: Sat Nov 13 16:52:19 2010
New Revision: 1034805
URL: http://svn.apache.org/viewvc?rev=1034805&view=rev
Log:
apply patch from Sebb for #50266 to fix javadoc and imports
Modified:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java
Modified:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
(original)
+++
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java
Sat Nov 13 16:52:19 2010
@@ -1,12 +1,8 @@
package org.apache.taglibs.standard.tag.compat.core;
import java.util.Collections;
-import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
-import javax.servlet.jsp.JspApplicationContext;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspFactory;
-
import org.apache.taglibs.standard.tag.common.core.ForEachSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
Modified:
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
(original)
+++
tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java
Sat Nov 13 16:52:19 2010
@@ -1,11 +1,7 @@
package org.apache.taglibs.standard.tag.compat.core;
-import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
-import javax.servlet.jsp.JspApplicationContext;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspFactory;
-
import org.apache.taglibs.standard.tag.common.core.ForTokensSupport;
import org.apache.taglibs.standard.util.ExpressionUtil;
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
Sat Nov 13 16:52:19 2010
@@ -161,7 +161,7 @@ public abstract class BundleSupport exte
* <tt>javax.servlet.jsp.jstl.fmt.fallbackLocale</tt> configuration
* setting) and the available locales, for the given base name.
*
- * @param pageContext Page in which the resource bundle with the
+ * @param pc Page in which the resource bundle with the
* given base name is requested
* @param basename Resource bundle base name
*
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
Sat Nov 13 16:52:19 2010
@@ -50,7 +50,7 @@ public class ResultImpl implements Resul
* Build a <code>Result</code> object from a <code>ResultSet</code> object.
*
* @param rs an open <tt>ResultSet</tt>, positioned before the first row
- * @exception if a database error occurs
+ * @exception SQLException if a database error occurs
*/
public ResultImpl(ResultSet rs) throws SQLException {
this(rs, -1, -1);
@@ -60,8 +60,8 @@ public class ResultImpl implements Resul
* Build a <code>Result</code> object from a <code>ResultSet</code> object.
*
* @param rs an open <tt>ResultSet</tt>, positioned before the first row
- * @param maxRows, query maximum rows limit
- * @exception if a database error occurs
+ * @param maxRows query maximum rows limit
+ * @exception SQLException if a database error occurs
*/
public ResultImpl(ResultSet rs, int maxRows) throws SQLException {
// Matching API in ResultSupport - apologies for the bad
@@ -75,9 +75,9 @@ public class ResultImpl implements Resul
*
* @param rs an open <tt>ResultSet</tt>, positioned before the first
* row
- * @param startRow, beginning row to be cached
- * @param maxRows, query maximum rows limit
- * @exception if a database error occurs
+ * @param startRow beginning row to be cached
+ * @param maxRows query maximum rows limit
+ * @exception SQLException if a database error occurs
*/
public ResultImpl(ResultSet rs, int startRow, int maxRows)
throws SQLException
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
Sat Nov 13 16:52:19 2010
@@ -225,7 +225,7 @@ public class JSTLXPathAPI extends XPathA
*
* @param contextNode The node to start searching from.
* @param str A valid XPath string.
- * @param namespaceNode The node from which prefixes in the XPath will
be resolved to namespaces.
+ * @param xpathSupport The node from which prefixes in the XPath will be
resolved to namespaces.
* @param prefixResolver Will be called if the parser encounters
namespace
* prefixes, to resolve the prefixes to URLs.
* @return An XObject, which can be used to obtain a string, number,
nodelist, etc, should never be null.
Modified:
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
(original)
+++
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
Sat Nov 13 16:52:19 2010
@@ -20,7 +20,6 @@ package org.apache.taglibs.standard.tag.
import javax.servlet.jsp.JspException;
import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
-import org.apache.taglibs.standard.tag.common.core.NullAttributeException;
import org.apache.taglibs.standard.tag.common.core.OutSupport;
/**
Modified:
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
(original)
+++
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java
Sat Nov 13 16:52:19 2010
@@ -19,7 +19,6 @@ package javax.servlet.jsp.jstl.fmt;
import java.util.Enumeration;
import java.util.Locale;
-import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.Vector;
Modified:
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
Sat Nov 13 16:52:19 2010
@@ -17,18 +17,10 @@
package javax.servlet.jsp.jstl.fmt;
-import java.util.Enumeration;
-import java.util.Locale;
import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.Vector;
-
-import javax.servlet.ServletResponse;
-
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.core.Config;
import javax.servlet.jsp.jstl.fmt.LocalizationContext;
/**
Modified:
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
(original)
+++
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/core/Test37466.java
Sat Nov 13 16:52:19 2010
@@ -18,7 +18,6 @@
package org.apache.taglibs.standard.tag.el.core;
import java.net.*;
-import javax.servlet.jsp.*;
import javax.servlet.http.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
Modified:
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java?rev=1034805&r1=1034804&r2=1034805&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java
(original)
+++
tomcat/taglibs/standard/trunk/standard-test/src/test/java/org/apache/taglibs/standard/tag/el/xml/Test35216.java
Sat Nov 13 16:52:19 2010
@@ -17,7 +17,6 @@
package org.apache.taglibs.standard.tag.el.xml;
-import javax.servlet.jsp.*;
import org.apache.cactus.*;
import org.apache.taglibs.standard.testutil.TestUtil;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
