Author: markt
Date: Mon Oct 13 11:33:23 2014
New Revision: 1631350
URL: http://svn.apache.org/r1631350
Log:
Fix Java8 Javadoc errors in the javax.servlet.jsp package
Modified:
tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java
tomcat/trunk/java/javax/servlet/jsp/JspContext.java
tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java
tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
Modified: tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspApplicationContext.java Mon Oct 13
11:33:23 2014
@@ -51,6 +51,7 @@ public interface JspApplicationContext {
* </p>
* <p>
* JSP has a default set of ELResolvers to chain for all EL evaluation:
+ * </p>
* <ul>
* <li><code>ImplicitObjectELResolver</code></li>
* <li><code>ELResolver</code> instances registered with this method</li>
@@ -60,7 +61,6 @@ public interface JspApplicationContext {
* <li><code>BeanELResolver</code></li>
* <li><code>ScopedAttributeELResolver</code></li>
* </ul>
- * </p>
*
* @param resolver
* an additional resolver
Modified: tomcat/trunk/java/javax/servlet/jsp/JspContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspContext.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspContext.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspContext.java Mon Oct 13 11:33:23 2014
@@ -252,13 +252,13 @@ public abstract class JspContext {
* page scope attribute namespace of the JspContext.
* <p>The returned JspWriter must implement all methods and
* behave as though it were unbuffered. More specifically:
+ * </p>
* <ul>
* <li>clear() must throw an IOException</li>
* <li>clearBuffer() does nothing</li>
* <li>getBufferSize() always returns 0</li>
* <li>getRemaining() always returns 0</li>
* </ul>
- * </p>
*
* @param writer The Writer for the returned JspWriter to send
* output to.
Modified: tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Mon Oct 13
11:33:23 2014
@@ -44,12 +44,12 @@ package javax.servlet.jsp.el;
* </p>
* <p>
* The following are examples of syntactically legal EL expressions:
+ * </p>
* <ul>
* <li><code>${person.lastName}</code></li>
* <li><code>${8 * 8}</code></li>
* <li><code>${my:reverse('hello')}</code></li>
* </ul>
- * </p>
*
* @since 2.0
* @deprecated As of JSP 2.1, replaced by javax.el.ExpressionFactory
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java Mon Oct 13 11:33:23
2014
@@ -70,7 +70,7 @@ import javax.servlet.jsp.JspException;
* TryCatchFinally interface; see that interface for details.
* <p>
* <IMG src="doc-files/BodyTagProtocol.gif"
- * alt="Lifecycle Details Transition Diagram for BodyTag"/>
+ * alt="Lifecycle Details Transition Diagram for BodyTag">
* <p>
* <B>Empty and Non-Empty Action</B>
* <p>
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java Mon Oct 13
11:33:23 2014
@@ -51,7 +51,7 @@ import javax.servlet.jsp.JspException;
*
* <p>
* <IMG src="doc-files/IterationTagProtocol.gif"
- * alt="Lifecycle Details Transition Diagram for IterationTag"/>
+ * alt="Lifecycle Details Transition Diagram for IterationTag">
*
* <p><B>Empty and Non-Empty Action</B>
* <p> If the TagLibraryDescriptor file indicates that the action must
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java Mon Oct 13 11:33:23 2014
@@ -48,7 +48,7 @@ import javax.servlet.jsp.PageContext;
* <p><B>Lifecycle</B></p>
*
* <p>Lifecycle details are described by the transition diagram below,
- * with the following comments:
+ * with the following comments:</p>
* <ul>
* <li> [1] This transition is intended to be for releasing long-term data.
* no guarantees are assumed on whether any properties have been retained
@@ -63,10 +63,10 @@ import javax.servlet.jsp.PageContext;
* as request-time attribute values.
* <li> Check the TryCatchFinally interface for additional details related
* to exception handling and resource management.
- * </ul></p>
+ * </ul>
*
* <IMG src="doc-files/TagProtocol.gif"
- * alt="Lifecycle Details Transition Diagram for Tag"/>
+ * alt="Lifecycle Details Transition Diagram for Tag">
*
* <p>Once all invocations on the tag handler
* are completed, the release method is invoked on it. Once a release
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java Mon Oct 13 11:33:23
2014
@@ -95,8 +95,8 @@ public class TagData implements Cloneabl
* The value of the attribute.
* If a static value is specified for an attribute that accepts a
* request-time attribute expression then that static value is returned,
- * even if the value is provided in the body of a <jsp:attribute> action.
- * The distinguished object REQUEST_TIME_VALUE is only returned if
+ * even if the value is provided in the body of a <jsp:attribute>
+ * action. The distinguished object REQUEST_TIME_VALUE is only returned if
* the value is specified as a request-time attribute expression
* or via the <jsp:attribute> action with a body that contains
* dynamic content (scriptlets, scripting expressions, EL expressions,
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java?rev=1631350&r1=1631349&r2=1631350&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java Mon Oct 13
11:33:23 2014
@@ -66,7 +66,7 @@ package javax.servlet.jsp.tagext;
* Scope is best described through a picture:
* <p>
* <IMG src="doc-files/VariableInfo-1.gif"
- * alt="NESTED, AT_BEGIN and AT_END Variable Scopes"/>
+ * alt="NESTED, AT_BEGIN and AT_END Variable Scopes">
* <p>
* The JSP 2.0 specification defines the interpretation of 3 values:
* <ul>
@@ -81,7 +81,7 @@ package javax.servlet.jsp.tagext;
* thus where synchronization is needed as illustrated by the table below.
* <b>Note:</b> the synchronization of the variable(s) will occur
<em>after</em>
* the respective method has been called. <blockquote>
- * <table cellpadding="2" cellspacing="2" border="0" width="55%" *
bgcolor="#999999" summary="Variable Synchronization Points">
+ * <table cellpadding="2" cellspacing="2" border="0" width="55%"
bgcolor="#999999" summary="Variable Synchronization Points">
* <tbody>
* <tr align="center">
* <td valign="top" colspan="6" bgcolor="#999999"><u><b>Variable
Synchronization
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
