This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e3a4cdf Clarify @since tags. Add missing @since tags.
e3a4cdf is described below
commit e3a4cdfcd516ddeea4e1aedefa381a65cba34488
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 12 08:02:30 2021 +0100
Clarify @since tags. Add missing @since tags.
---
java/javax/servlet/FilterChain.java | 2 --
java/javax/servlet/ServletContext.java | 2 +-
java/javax/servlet/ServletContextAttributeEvent.java | 2 +-
java/javax/servlet/ServletContextAttributeListener.java | 2 +-
java/javax/servlet/ServletContextEvent.java | 2 +-
java/javax/servlet/ServletContextListener.java | 2 +-
java/javax/servlet/ServletResponse.java | 6 +++---
java/javax/servlet/ServletResponseWrapper.java | 6 +++---
java/javax/servlet/http/HttpServletMapping.java | 2 +-
java/javax/servlet/http/HttpServletRequestWrapper.java | 2 +-
java/javax/servlet/http/HttpServletResponseWrapper.java | 2 +-
java/javax/servlet/http/HttpSession.java | 2 +-
java/javax/servlet/http/HttpSessionActivationListener.java | 2 +-
java/javax/servlet/http/HttpSessionAttributeListener.java | 2 +-
java/javax/servlet/http/HttpSessionBindingEvent.java | 2 +-
java/javax/servlet/http/HttpSessionEvent.java | 2 +-
java/javax/servlet/http/HttpSessionListener.java | 2 +-
java/javax/servlet/http/MappingMatch.java | 2 +-
java/javax/servlet/jsp/ErrorData.java | 2 +-
java/javax/servlet/jsp/JspApplicationContext.java | 2 +-
java/javax/servlet/jsp/JspContext.java | 8 ++++----
java/javax/servlet/jsp/JspFactory.java | 2 +-
java/javax/servlet/jsp/JspTagException.java | 4 ++--
java/javax/servlet/jsp/PageContext.java | 4 ++--
java/javax/servlet/jsp/SkipPageException.java | 2 +-
java/javax/servlet/jsp/el/ELException.java | 2 +-
java/javax/servlet/jsp/el/ELParseException.java | 2 +-
java/javax/servlet/jsp/el/Expression.java | 2 +-
java/javax/servlet/jsp/el/ExpressionEvaluator.java | 2 +-
java/javax/servlet/jsp/el/FunctionMapper.java | 2 +-
java/javax/servlet/jsp/el/ImplicitObjectELResolver.java | 2 +-
java/javax/servlet/jsp/el/ScopedAttributeELResolver.java | 6 +++---
java/javax/servlet/jsp/el/VariableResolver.java | 2 +-
java/javax/servlet/jsp/tagext/DynamicAttributes.java | 2 +-
java/javax/servlet/jsp/tagext/FunctionInfo.java | 2 +-
java/javax/servlet/jsp/tagext/JspFragment.java | 2 +-
java/javax/servlet/jsp/tagext/JspTag.java | 2 +-
java/javax/servlet/jsp/tagext/SimpleTag.java | 2 +-
java/javax/servlet/jsp/tagext/SimpleTagSupport.java | 2 +-
java/javax/servlet/jsp/tagext/TagAdapter.java | 2 +-
java/javax/servlet/jsp/tagext/TagAttributeInfo.java | 4 ++--
java/javax/servlet/jsp/tagext/TagExtraInfo.java | 2 +-
java/javax/servlet/jsp/tagext/TagFileInfo.java | 2 +-
java/javax/servlet/jsp/tagext/TagInfo.java | 8 ++++----
java/javax/servlet/jsp/tagext/TagLibraryInfo.java | 14 +++++++-------
java/javax/websocket/server/ServerContainer.java | 3 +--
46 files changed, 66 insertions(+), 69 deletions(-)
diff --git a/java/javax/servlet/FilterChain.java
b/java/javax/servlet/FilterChain.java
index fca19c3..09fe64d 100644
--- a/java/javax/servlet/FilterChain.java
+++ b/java/javax/servlet/FilterChain.java
@@ -44,8 +44,6 @@ public interface FilterChain {
* @throws IOException if an I/O error occurs during the processing of the
* request
* @throws ServletException if the processing fails for any other reason
-
- * @since 2.3
*/
public void doFilter(ServletRequest request, ServletResponse response)
throws IOException, ServletException;
diff --git a/java/javax/servlet/ServletContext.java
b/java/javax/servlet/ServletContext.java
index 9e5bfe1..590dce1 100644
--- a/java/javax/servlet/ServletContext.java
+++ b/java/javax/servlet/ServletContext.java
@@ -761,7 +761,7 @@ public interface ServletContext {
* {@link ServletContextListener} defined in a TLD would not be able to
* use this method.
* @throws ServletException TODO
- * @since Servlet 3.
+ * @since Servlet 3.0
*/
public <T extends Filter> T createFilter(Class<T> c) throws
ServletException;
diff --git a/java/javax/servlet/ServletContextAttributeEvent.java
b/java/javax/servlet/ServletContextAttributeEvent.java
index 03be444..888aaf2 100644
--- a/java/javax/servlet/ServletContextAttributeEvent.java
+++ b/java/javax/servlet/ServletContextAttributeEvent.java
@@ -21,7 +21,7 @@ package javax.servlet;
* the servlet context of a web application.
*
* @see ServletContextAttributeListener
- * @since v 2.3
+ * @since Servlet 2.3
*/
public class ServletContextAttributeEvent extends ServletContextEvent {
private static final long serialVersionUID = 1L;
diff --git a/java/javax/servlet/ServletContextAttributeListener.java
b/java/javax/servlet/ServletContextAttributeListener.java
index 61ef615..1dec202 100644
--- a/java/javax/servlet/ServletContextAttributeListener.java
+++ b/java/javax/servlet/ServletContextAttributeListener.java
@@ -25,7 +25,7 @@ import java.util.EventListener;
* deployment descriptor for the web application.
*
* @see ServletContextAttributeEvent
- * @since v 2.3
+ * @since Servlet 2.3
*/
public interface ServletContextAttributeListener extends EventListener {
diff --git a/java/javax/servlet/ServletContextEvent.java
b/java/javax/servlet/ServletContextEvent.java
index 92a9120..fc16312 100644
--- a/java/javax/servlet/ServletContextEvent.java
+++ b/java/javax/servlet/ServletContextEvent.java
@@ -21,7 +21,7 @@ package javax.servlet;
* context of a web application.
*
* @see ServletContextListener
- * @since v 2.3
+ * @since Servlet 2.3
*/
public class ServletContextEvent extends java.util.EventObject {
diff --git a/java/javax/servlet/ServletContextListener.java
b/java/javax/servlet/ServletContextListener.java
index 7f926b4..5569c7a 100644
--- a/java/javax/servlet/ServletContextListener.java
+++ b/java/javax/servlet/ServletContextListener.java
@@ -25,7 +25,7 @@ import java.util.EventListener;
* deployment descriptor for the web application.
*
* @see ServletContextEvent
- * @since v 2.3
+ * @since Servlet 2.3
*/
public interface ServletContextListener extends EventListener {
diff --git a/java/javax/servlet/ServletResponse.java
b/java/javax/servlet/ServletResponse.java
index a3948aa..6427c51 100644
--- a/java/javax/servlet/ServletResponse.java
+++ b/java/javax/servlet/ServletResponse.java
@@ -95,7 +95,7 @@ public interface ServletResponse {
*
* @return a <code>String</code> specifying the content type, for example,
* <code>text/html; charset=UTF-8</code>, or null
- * @since 2.4
+ * @since Servlet 2.4
*/
public String getContentType();
@@ -174,7 +174,7 @@ public interface ServletResponse {
* Character Sets
* (http://www.iana.org/assignments/character-sets)
* @see #setContentType #setLocale
- * @since 2.4
+ * @since Servlet 2.4
*/
public void setCharacterEncoding(String charset);
@@ -288,7 +288,7 @@ public interface ServletResponse {
* @see #getBufferSize
* @see #isCommitted
* @see #reset
- * @since 2.3
+ * @since Servlet 2.3
*/
public void resetBuffer();
diff --git a/java/javax/servlet/ServletResponseWrapper.java
b/java/javax/servlet/ServletResponseWrapper.java
index 0d3fb1e..4c48298 100644
--- a/java/javax/servlet/ServletResponseWrapper.java
+++ b/java/javax/servlet/ServletResponseWrapper.java
@@ -27,7 +27,7 @@ import java.util.ResourceBundle;
* This class implements the Wrapper or Decorator pattern. Methods default to
* calling through to the wrapped response object.
*
- * @since v 2.3
+ * @since Servlet 2.3
* @see javax.servlet.ServletResponse
*/
public class ServletResponseWrapper implements ServletResponse {
@@ -80,7 +80,7 @@ public class ServletResponseWrapper implements
ServletResponse {
* The default behavior of this method is to call
* setCharacterEncoding(String charset) on the wrapped response object.
*
- * @since 2.4
+ * @since Servlet 2.4
*/
@Override
public void setCharacterEncoding(String charset) {
@@ -147,7 +147,7 @@ public class ServletResponseWrapper implements
ServletResponse {
* The default behavior of this method is to return getContentType() on the
* wrapped response object.
*
- * @since 2.4
+ * @since Servlet 2.4
*/
@Override
public String getContentType() {
diff --git a/java/javax/servlet/http/HttpServletMapping.java
b/java/javax/servlet/http/HttpServletMapping.java
index 3d8bd92..0cd78c3 100644
--- a/java/javax/servlet/http/HttpServletMapping.java
+++ b/java/javax/servlet/http/HttpServletMapping.java
@@ -22,7 +22,7 @@ import javax.servlet.annotation.WebServlet;
* Represents how the request from which this object was obtained was mapped to
* the associated servlet.
*
- * @since 4.0
+ * @since Servlet 4.0
*/
public interface HttpServletMapping {
diff --git a/java/javax/servlet/http/HttpServletRequestWrapper.java
b/java/javax/servlet/http/HttpServletRequestWrapper.java
index 085e9a5..5c446b8 100644
--- a/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -31,7 +31,7 @@ import javax.servlet.ServletRequestWrapper;
* calling through to the wrapped request object.
*
* @see javax.servlet.http.HttpServletRequest
- * @since v 2.3
+ * @since Servlet 2.3
*/
public class HttpServletRequestWrapper extends ServletRequestWrapper implements
HttpServletRequest {
diff --git a/java/javax/servlet/http/HttpServletResponseWrapper.java
b/java/javax/servlet/http/HttpServletResponseWrapper.java
index 7d312d9..e356119 100644
--- a/java/javax/servlet/http/HttpServletResponseWrapper.java
+++ b/java/javax/servlet/http/HttpServletResponseWrapper.java
@@ -29,7 +29,7 @@ import javax.servlet.ServletResponseWrapper;
* Servlet. This class implements the Wrapper or Decorator pattern. Methods
* default to calling through to the wrapped response object.
*
- * @since v 2.3
+ * @since Servlet 2.3
* @see javax.servlet.http.HttpServletResponse
*/
public class HttpServletResponseWrapper extends ServletResponseWrapper
diff --git a/java/javax/servlet/http/HttpSession.java
b/java/javax/servlet/http/HttpSession.java
index 8501d2e..415c2d2 100644
--- a/java/javax/servlet/http/HttpSession.java
+++ b/java/javax/servlet/http/HttpSession.java
@@ -107,7 +107,7 @@ public interface HttpSession {
* Returns the ServletContext to which this session belongs.
*
* @return The ServletContext object for the web application
- * @since 2.3
+ * @since Servlet 2.3
*/
public ServletContext getServletContext();
diff --git a/java/javax/servlet/http/HttpSessionActivationListener.java
b/java/javax/servlet/http/HttpSessionActivationListener.java
index 1c13b4c..d10c8a2 100644
--- a/java/javax/servlet/http/HttpSessionActivationListener.java
+++ b/java/javax/servlet/http/HttpSessionActivationListener.java
@@ -25,7 +25,7 @@ import java.util.EventListener;
* to notify all attributes bound to sessions implementing
* HttpSessionActivationListener.
*
- * @since 2.3
+ * @since Servlet 2.3
*/
public interface HttpSessionActivationListener extends EventListener {
diff --git a/java/javax/servlet/http/HttpSessionAttributeListener.java
b/java/javax/servlet/http/HttpSessionAttributeListener.java
index 4f2f456..ae63e61 100644
--- a/java/javax/servlet/http/HttpSessionAttributeListener.java
+++ b/java/javax/servlet/http/HttpSessionAttributeListener.java
@@ -22,7 +22,7 @@ import java.util.EventListener;
* This listener interface can be implemented in order to get notifications of
* changes to the attribute lists of sessions within this web application.
*
- * @since v 2.3
+ * @since Servlet 2.3
*/
public interface HttpSessionAttributeListener extends EventListener {
diff --git a/java/javax/servlet/http/HttpSessionBindingEvent.java
b/java/javax/servlet/http/HttpSessionBindingEvent.java
index 0d11054..43cfc80 100644
--- a/java/javax/servlet/http/HttpSessionBindingEvent.java
+++ b/java/javax/servlet/http/HttpSessionBindingEvent.java
@@ -114,7 +114,7 @@ public class HttpSessionBindingEvent extends
HttpSessionEvent {
* value of the removed attribute. If the attribute was replaced,
* this is the old value of the attribute.
*
- * @since 2.3
+ * @since Servlet 2.3
*/
public Object getValue() {
return this.value;
diff --git a/java/javax/servlet/http/HttpSessionEvent.java
b/java/javax/servlet/http/HttpSessionEvent.java
index 3a6ffcf..ce5921c 100644
--- a/java/javax/servlet/http/HttpSessionEvent.java
+++ b/java/javax/servlet/http/HttpSessionEvent.java
@@ -20,7 +20,7 @@ package javax.servlet.http;
* This is the class representing event notifications for changes to sessions
* within a web application.
*
- * @since v 2.3
+ * @since Servlet 2.3
*/
public class HttpSessionEvent extends java.util.EventObject {
private static final long serialVersionUID = 1L;
diff --git a/java/javax/servlet/http/HttpSessionListener.java
b/java/javax/servlet/http/HttpSessionListener.java
index 7941f37..27bba56 100644
--- a/java/javax/servlet/http/HttpSessionListener.java
+++ b/java/javax/servlet/http/HttpSessionListener.java
@@ -25,7 +25,7 @@ import java.util.EventListener;
* web application.
*
* @see HttpSessionEvent
- * @since v 2.3
+ * @since Servlet 2.3
*/
public interface HttpSessionListener extends EventListener {
diff --git a/java/javax/servlet/http/MappingMatch.java
b/java/javax/servlet/http/MappingMatch.java
index 9144da3..f145ce0 100644
--- a/java/javax/servlet/http/MappingMatch.java
+++ b/java/javax/servlet/http/MappingMatch.java
@@ -19,7 +19,7 @@ package javax.servlet.http;
/**
* Represents the ways that a request can be mapped to a servlet
*
- * @since 4.0
+ * @since Servlet 4.0
*/
public enum MappingMatch {
diff --git a/java/javax/servlet/jsp/ErrorData.java
b/java/javax/servlet/jsp/ErrorData.java
index 45615fc..cc625c6 100644
--- a/java/javax/servlet/jsp/ErrorData.java
+++ b/java/javax/servlet/jsp/ErrorData.java
@@ -23,7 +23,7 @@ package javax.servlet.jsp;
* isErrorPage attribute of the page directive to "true".
*
* @see PageContext#getErrorData
- * @since 2.0
+ * @since JSP 2.0
*/
public final class ErrorData {
diff --git a/java/javax/servlet/jsp/JspApplicationContext.java
b/java/javax/servlet/jsp/JspApplicationContext.java
index 3b4a2be..3e704bf 100644
--- a/java/javax/servlet/jsp/JspApplicationContext.java
+++ b/java/javax/servlet/jsp/JspApplicationContext.java
@@ -25,7 +25,7 @@ import javax.el.ExpressionFactory;
* Stores <i>application</i>-scoped information for the JSP container.
* </p>
*
- * @since 2.1
+ * @since JSP 2.1
*/
public interface JspApplicationContext {
diff --git a/java/javax/servlet/jsp/JspContext.java
b/java/javax/servlet/jsp/JspContext.java
index 20b5f8b..ccdfd78 100644
--- a/java/javax/servlet/jsp/JspContext.java
+++ b/java/javax/servlet/jsp/JspContext.java
@@ -64,7 +64,7 @@ import javax.el.ELContext;
* Expression Language evaluator:
* <code>getExpressionEvaluator()</code>, <code>getVariableResolver()</code>
*
- * @since 2.0
+ * @since JSP 2.0
*/
public abstract class JspContext {
@@ -220,7 +220,7 @@ public abstract class JspContext {
* ExpressionEvaluator that can parse EL expressions.
*
* @return A valid instance of an ExpressionEvaluator.
- * @since 2.0
+ * @since JSP 2.0
* @deprecated As of JSP 2.1, replaced by
* JspApplicationContext.getExpressionFactory()
*/
@@ -241,7 +241,7 @@ public abstract class JspContext {
* as the context object.
*
* @return A valid instance of a VariableResolver.
- * @since 2.0
+ * @since JSP 2.0
* @deprecated As of JSP 2.1,
* replaced by javax.el.ELContext.getELResolver()
* which can be obtained by
@@ -268,7 +268,7 @@ public abstract class JspContext {
* @param writer The Writer for the returned JspWriter to send
* output to.
* @return a new JspWriter that writes to the given Writer.
- * @since 2.0
+ * @since JSP 2.0
*/
public JspWriter pushBody( java.io.Writer writer ) {
return null; // XXX to implement
diff --git a/java/javax/servlet/jsp/JspFactory.java
b/java/javax/servlet/jsp/JspFactory.java
index 6ebf094..590dae7 100644
--- a/java/javax/servlet/jsp/JspFactory.java
+++ b/java/javax/servlet/jsp/JspFactory.java
@@ -150,7 +150,7 @@ public abstract class JspFactory {
*
* @param context the current web application's <code>ServletContext</code>
* @return <code>JspApplicationContext</code> instance
- * @since 2.1
+ * @since JSP 2.1
*/
public abstract JspApplicationContext getJspApplicationContext(
ServletContext context);
diff --git a/java/javax/servlet/jsp/JspTagException.java
b/java/javax/servlet/jsp/JspTagException.java
index ce554b6..ef18bdc 100644
--- a/java/javax/servlet/jsp/JspTagException.java
+++ b/java/javax/servlet/jsp/JspTagException.java
@@ -56,7 +56,7 @@ public class JspTagException extends JspException {
* the <code>Throwable</code> exception that interfered with the
* JSP Tag's normal operation, making this JSP Tag exception
* necessary
- * @since 2.0
+ * @since JSP 2.0
*/
public JspTagException(String message, Throwable rootCause) {
super(message, rootCause);
@@ -77,7 +77,7 @@ public class JspTagException extends JspException {
* the <code>Throwable</code> exception that interfered with the
* JSP Tag's normal operation, making the JSP Tag exception
* necessary
- * @since 2.0
+ * @since JSP 2.0
*/
public JspTagException(Throwable rootCause) {
super(rootCause);
diff --git a/java/javax/servlet/jsp/PageContext.java
b/java/javax/servlet/jsp/PageContext.java
index 6c8284e..4a75129 100644
--- a/java/javax/servlet/jsp/PageContext.java
+++ b/java/javax/servlet/jsp/PageContext.java
@@ -405,7 +405,7 @@ public abstract class PageContext
* @throws ServletException if the page that was forwarded to throws
* a ServletException
* @throws IOException if an I/O error occurred while forwarding
- * @since 2.0
+ * @since JSP 2.0
*/
public abstract void include(String relativeUrlPath, boolean flush)
throws ServletException, IOException;
@@ -508,7 +508,7 @@ public abstract class PageContext
* if the isErrorPage attribute of the page directive is not set
* to "true"), the information is meaningless.
*
- * @since 2.0
+ * @since JSP 2.0
*/
public ErrorData getErrorData() {
int status = 0;
diff --git a/java/javax/servlet/jsp/SkipPageException.java
b/java/javax/servlet/jsp/SkipPageException.java
index 2098c9b..5d6488b 100644
--- a/java/javax/servlet/jsp/SkipPageException.java
+++ b/java/javax/servlet/jsp/SkipPageException.java
@@ -30,7 +30,7 @@ package javax.servlet.jsp;
* @see javax.servlet.jsp.tagext.SimpleTag#doTag
* @see javax.servlet.jsp.tagext.JspFragment#invoke
* @see javax.servlet.jsp.tagext.Tag#doEndTag
- * @since 2.0
+ * @since JSP 2.0
*/
public class SkipPageException extends JspException {
diff --git a/java/javax/servlet/jsp/el/ELException.java
b/java/javax/servlet/jsp/el/ELException.java
index 9d3a0da..cbff7c5 100644
--- a/java/javax/servlet/jsp/el/ELException.java
+++ b/java/javax/servlet/jsp/el/ELException.java
@@ -20,7 +20,7 @@ package javax.servlet.jsp.el;
* Represents any of the exception conditions that arise during the operation
* evaluation of the evaluator.
*
- * @since 2.0
+ * @since JSP 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.ELException
*/
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
diff --git a/java/javax/servlet/jsp/el/ELParseException.java
b/java/javax/servlet/jsp/el/ELParseException.java
index 18a017b..a40e4e8 100644
--- a/java/javax/servlet/jsp/el/ELParseException.java
+++ b/java/javax/servlet/jsp/el/ELParseException.java
@@ -20,7 +20,7 @@ package javax.servlet.jsp.el;
/**
* Represents a parsing error encountered while parsing an EL expression.
*
- * @since 2.0
+ * @since JSP 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.ELException
*/
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
diff --git a/java/javax/servlet/jsp/el/Expression.java
b/java/javax/servlet/jsp/el/Expression.java
index 206818c..cf65f5f 100644
--- a/java/javax/servlet/jsp/el/Expression.java
+++ b/java/javax/servlet/jsp/el/Expression.java
@@ -27,7 +27,7 @@ package javax.servlet.jsp.el;
* A client invoking the evaluate() method should be ready for the case
* where ELParseException exceptions are raised. </p>
*
- * @since 2.0
+ * @since JSP 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.ValueExpression
*/
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
diff --git a/java/javax/servlet/jsp/el/ExpressionEvaluator.java
b/java/javax/servlet/jsp/el/ExpressionEvaluator.java
index 4e32ff0..54c1cb6 100644
--- a/java/javax/servlet/jsp/el/ExpressionEvaluator.java
+++ b/java/javax/servlet/jsp/el/ExpressionEvaluator.java
@@ -50,7 +50,7 @@ package javax.servlet.jsp.el;
* <li><code>${my:reverse('hello')}</code></li>
* </ul>
*
- * @since 2.0
+ * @since JSP 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.ExpressionFactory
*/
@SuppressWarnings("dep-ann")
diff --git a/java/javax/servlet/jsp/el/FunctionMapper.java
b/java/javax/servlet/jsp/el/FunctionMapper.java
index 47908b2..af4f37a 100644
--- a/java/javax/servlet/jsp/el/FunctionMapper.java
+++ b/java/javax/servlet/jsp/el/FunctionMapper.java
@@ -22,7 +22,7 @@ package javax.servlet.jsp.el;
* <p>Classes implementing this interface may, for instance, consult tag
library
* information to resolve the map. </p>
*
- * @since 2.0
+ * @since JSP 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.FunctionMapper
*/
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index 027b254..d131133 100644
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -41,7 +41,7 @@ import javax.servlet.jsp.PageContext;
/**
* Provides resolution in EL for the implicit variables of a JSP page.
*
- * @since 2.1
+ * @since JSP 2.1
*/
public class ImplicitObjectELResolver extends ELResolver {
diff --git a/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
b/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
index 5316475..b5481ad 100644
--- a/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
+++ b/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
@@ -31,9 +31,9 @@ import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.PageContext;
/**
-*
-* @since 2.1
-*/
+ *
+ * @since JSP 2.1
+ */
public class ScopedAttributeELResolver extends ELResolver {
// Indicates if a performance short-cut is available
diff --git a/java/javax/servlet/jsp/el/VariableResolver.java
b/java/javax/servlet/jsp/el/VariableResolver.java
index 011e27f..885fb56 100644
--- a/java/javax/servlet/jsp/el/VariableResolver.java
+++ b/java/javax/servlet/jsp/el/VariableResolver.java
@@ -29,7 +29,7 @@ package javax.servlet.jsp.el;
* happen
* </p>
*
- * @since 2.0
+ * @since JSP 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.ELResolver
*/
@SuppressWarnings("dep-ann")
diff --git a/java/javax/servlet/jsp/tagext/DynamicAttributes.java
b/java/javax/servlet/jsp/tagext/DynamicAttributes.java
index 4ddefad..45ec758 100644
--- a/java/javax/servlet/jsp/tagext/DynamicAttributes.java
+++ b/java/javax/servlet/jsp/tagext/DynamicAttributes.java
@@ -29,7 +29,7 @@ import javax.servlet.jsp.JspException;
* value of the attribute. It is the responsibility of the tag to
* remember the names and values of the dynamic attributes.
*
- * @since 2.0
+ * @since JSP 2.0
*/
public interface DynamicAttributes {
diff --git a/java/javax/servlet/jsp/tagext/FunctionInfo.java
b/java/javax/servlet/jsp/tagext/FunctionInfo.java
index 18db045..12dbcd5 100644
--- a/java/javax/servlet/jsp/tagext/FunctionInfo.java
+++ b/java/javax/servlet/jsp/tagext/FunctionInfo.java
@@ -21,7 +21,7 @@ package javax.servlet.jsp.tagext;
* This class is instantiated from the Tag Library Descriptor file (TLD)
* and is available only at translation time.
*
- * @since 2.0
+ * @since JSP 2.0
*/
public class FunctionInfo {
diff --git a/java/javax/servlet/jsp/tagext/JspFragment.java
b/java/javax/servlet/jsp/tagext/JspFragment.java
index c5e4acd..9faf8d0 100644
--- a/java/javax/servlet/jsp/tagext/JspFragment.java
+++ b/java/javax/servlet/jsp/tagext/JspFragment.java
@@ -50,7 +50,7 @@ import javax.servlet.jsp.JspException;
* JspFragment. Upon construction, a discriminator can be passed to
* select which fragment that instance will execute.
*
- * @since 2.0
+ * @since JSP 2.0
*/
public abstract class JspFragment {
diff --git a/java/javax/servlet/jsp/tagext/JspTag.java
b/java/javax/servlet/jsp/tagext/JspTag.java
index 2be75fd..de0c004 100644
--- a/java/javax/servlet/jsp/tagext/JspTag.java
+++ b/java/javax/servlet/jsp/tagext/JspTag.java
@@ -20,7 +20,7 @@ package javax.servlet.jsp.tagext;
* Serves as a base class for Tag and SimpleTag.
* This is mostly for organizational and type-safety purposes.
*
- * @since 2.0
+ * @since JSP 2.0
*/
public interface JspTag {
// No methods even through there are some common methods
diff --git a/java/javax/servlet/jsp/tagext/SimpleTag.java
b/java/javax/servlet/jsp/tagext/SimpleTag.java
index 48a5ac7..9bb5fe9 100644
--- a/java/javax/servlet/jsp/tagext/SimpleTag.java
+++ b/java/javax/servlet/jsp/tagext/SimpleTag.java
@@ -68,7 +68,7 @@ import javax.servlet.jsp.JspContext;
* </ol>
*
* @see SimpleTagSupport
- * @since 2.0
+ * @since JSP 2.0
*/
public interface SimpleTag extends JspTag {
diff --git a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
index 7c6a84c..39d5863 100644
--- a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
+++ b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
@@ -30,7 +30,7 @@ import javax.servlet.jsp.JspException;
* convenience methods including getter methods for the properties in
* SimpleTag.
*
- * @since 2.0
+ * @since JSP 2.0
*/
public class SimpleTagSupport implements SimpleTag {
/** Reference to the enclosing tag. */
diff --git a/java/javax/servlet/jsp/tagext/TagAdapter.java
b/java/javax/servlet/jsp/tagext/TagAdapter.java
index aedc16d..736cfab 100644
--- a/java/javax/servlet/jsp/tagext/TagAdapter.java
+++ b/java/javax/servlet/jsp/tagext/TagAdapter.java
@@ -30,7 +30,7 @@ import javax.servlet.jsp.PageContext;
* setParent() instead. A classic Tag Handler can call getAdaptee() to retrieve
* the encapsulated SimpleTag instance.
*
- * @since 2.0
+ * @since JSP 2.0
*/
public class TagAdapter implements Tag {
/** The simple tag that's being adapted. */
diff --git a/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
b/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
index a54c019..55545c2 100644
--- a/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
@@ -68,7 +68,7 @@ public class TagAttributeInfo {
* @param fragment
* Whether this attribute is of type JspFragment
*
- * @since 2.0
+ * @since JSP 2.0
*/
public TagAttributeInfo(String name, boolean required, String type,
boolean reqTime, boolean fragment) {
@@ -181,7 +181,7 @@ public class TagAttributeInfo {
*
* @return if the attribute is of type JspFragment
*
- * @since 2.0
+ * @since JSP 2.0
*/
public boolean isFragment() {
return fragment;
diff --git a/java/javax/servlet/jsp/tagext/TagExtraInfo.java
b/java/javax/servlet/jsp/tagext/TagExtraInfo.java
index a1165b7..0448243 100644
--- a/java/javax/servlet/jsp/tagext/TagExtraInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagExtraInfo.java
@@ -103,7 +103,7 @@ public abstract class TagExtraInfo {
* @param data The TagData instance.
* @return A null object, or zero length array if no errors, an
* array of ValidationMessages otherwise.
- * @since 2.0
+ * @since JSP 2.0
*/
public ValidationMessage[] validate( TagData data ) {
ValidationMessage[] result = null;
diff --git a/java/javax/servlet/jsp/tagext/TagFileInfo.java
b/java/javax/servlet/jsp/tagext/TagFileInfo.java
index 8703675..549fa29 100644
--- a/java/javax/servlet/jsp/tagext/TagFileInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagFileInfo.java
@@ -21,7 +21,7 @@ package javax.servlet.jsp.tagext;
* This class is instantiated from the Tag Library Descriptor file (TLD)
* and is available only at translation time.
*
- * @since 2.0
+ * @since JSP 2.0
*/
public class TagFileInfo {
diff --git a/java/javax/servlet/jsp/tagext/TagInfo.java
b/java/javax/servlet/jsp/tagext/TagInfo.java
index 1b3fd5b..112c9a6 100644
--- a/java/javax/servlet/jsp/tagext/TagInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagInfo.java
@@ -48,7 +48,7 @@ public class TagInfo {
/**
* Static constant for getBodyContent() when it is scriptless.
*
- * @since 2.0
+ * @since JSP 2.0
*/
public static final String BODY_CONTENT_SCRIPTLESS = "scriptless";
@@ -180,7 +180,7 @@ public class TagInfo {
* @param tvi An array of a TagVariableInfo (or null)
* @param dynamicAttributes True if supports dynamic attributes
*
- * @since 2.0
+ * @since JSP 2.0
*/
public TagInfo(String tagName,
String tagClassName,
@@ -275,7 +275,7 @@ public class TagInfo {
* @param data The translation-time TagData instance.
* @return A null object, or zero length array if no errors, an
* array of ValidationMessages otherwise.
- * @since 2.0
+ * @since JSP 2.0
*/
public ValidationMessage[] validate( TagData data ) {
TagExtraInfo tei = getTagExtraInfo();
@@ -426,7 +426,7 @@ public class TagInfo {
* Get dynamicAttributes associated with this TagInfo.
*
* @return True if tag handler supports dynamic attributes
- * @since 2.0
+ * @since JSP 2.0
*/
public boolean hasDynamicAttributes() {
return dynamicAttributes;
diff --git a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
index c1a148a..ef62637 100644
--- a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
@@ -119,7 +119,7 @@ public abstract class TagLibraryInfo {
* @return the TagFileInfo objects corresponding to the tag files defined
by
* this tag library, or a zero length array if this tag library
* defines no tags files
- * @since 2.0
+ * @since JSP 2.0
*/
public TagFileInfo[] getTagFiles() {
return tagFiles;
@@ -157,7 +157,7 @@ public abstract class TagLibraryInfo {
* The short name (no prefix) of the tag
* @return the TagFileInfo for the specified Tag file, or null if no Tag
* file is found
- * @since 2.0
+ * @since JSP 2.0
*/
public TagFileInfo getTagFile(String shortname) {
TagFileInfo tagFiles[] = getTagFiles();
@@ -179,7 +179,7 @@ public abstract class TagLibraryInfo {
*
* @return the functions defined in this tag library, or a zero length
array
* if the tag library defines no functions.
- * @since 2.0
+ * @since JSP 2.0
*/
public FunctionInfo[] getFunctions() {
return functions;
@@ -193,7 +193,7 @@ public abstract class TagLibraryInfo {
* The name (no prefix) of the function
* @return the FunctionInfo for the function with the given name, or null
if
* no such function exists
- * @since 2.0
+ * @since JSP 2.0
*/
public FunctionInfo getFunction(String name) {
@@ -221,7 +221,7 @@ public abstract class TagLibraryInfo {
* tag libraries (including this TagLibraryInfo) imported by taglib
* directives in the translation unit that references this
* TagLibraryInfo.
- * @since 2.1
+ * @since JSP 2.1
*/
public abstract javax.servlet.jsp.tagext.TagLibraryInfo[]
getTagLibraryInfos();
@@ -246,14 +246,14 @@ public abstract class TagLibraryInfo {
/**
* An array describing the tag files that are defined in this tag library.
*
- * @since 2.0
+ * @since JSP 2.0
*/
protected TagFileInfo[] tagFiles;
/**
* An array describing the functions that are defined in this tag library.
*
- * @since 2.0
+ * @since JSP 2.0
*/
protected FunctionInfo[] functions;
diff --git a/java/javax/websocket/server/ServerContainer.java
b/java/javax/websocket/server/ServerContainer.java
index 3243a07..05bd158 100644
--- a/java/javax/websocket/server/ServerContainer.java
+++ b/java/javax/websocket/server/ServerContainer.java
@@ -25,6 +25,5 @@ import javax.websocket.WebSocketContainer;
public interface ServerContainer extends WebSocketContainer {
public abstract void addEndpoint(Class<?> clazz) throws
DeploymentException;
- public abstract void addEndpoint(ServerEndpointConfig sec)
- throws DeploymentException;
+ public abstract void addEndpoint(ServerEndpointConfig sec) throws
DeploymentException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
