Author: markt
Date: Mon Oct 13 14:32:49 2014
New Revision: 1631417
URL: http://svn.apache.org/r1631417
Log:
Fix Java 8 Javadoc errors in org.apache.jasper
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Mon Oct 13
14:32:49 2014
@@ -330,14 +330,14 @@ public class AntCompiler extends Compile
/**
- * Thread <-> PrintStream associations.
+ * Thread <-> PrintStream associations.
*/
protected static final ThreadLocal<PrintStream> streams =
new ThreadLocal<>();
/**
- * Thread <-> ByteArrayOutputStream associations.
+ * Thread <-> ByteArrayOutputStream associations.
*/
protected static final ThreadLocal<ByteArrayOutputStream> data =
new ThreadLocal<>();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Mon Oct
13 14:32:49 2014
@@ -47,7 +47,7 @@ import org.apache.juli.logging.LogFactor
/**
* Class for tracking JSP compile time file dependencies when the
- * &060;%@include file="..."%&062; directive is used.
+ * >%@include file="..."%< directive is used.
*
* A background thread periodically checks the files a JSP page
* is dependent upon. If a dependent file changes the JSP page
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Mon Oct 13
14:32:49 2014
@@ -910,9 +910,9 @@ public class JspUtil {
}
/**
- * Handles taking input from TLDs 'java.lang.Object' ->
- * 'java.lang.Object.class' 'int' -> 'int.class' 'void' -> 'Void.TYPE'
- * 'int[]' -> 'int[].class'
+ * Handles taking input from TLDs 'java.lang.Object' ->
+ * 'java.lang.Object.class' 'int' -> 'int.class' 'void' ->
'Void.TYPE'
+ * 'int[]' -> 'int[].class'
*
* @param type
*/
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
(original)
+++
tomcat/trunk/java/org/apache/jasper/compiler/tagplugin/TagPluginContext.java
Mon Oct 13 14:32:49 2014
@@ -112,7 +112,7 @@ public interface TagPluginContext {
/**
* Associate the attribute with a value in the current tagplugin context.
* The plugin attributes can be used for communication among tags that
- * must work together as a group. See <c:when> for an example.
+ * must work together as a group. See <c:when> for an example.
*/
void setPluginAttribute(String attr, Object value);
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java Mon Oct 13
14:32:49 2014
@@ -62,7 +62,7 @@ public class JspWriterImpl extends JspWr
* @param response A Servlet Response
* @param sz Output-buffer size, a positive integer
*
- * @exception IllegalArgumentException If sz is <= 0
+ * @exception IllegalArgumentException If sz is <= 0
*/
public JspWriterImpl(ServletResponse response, int sz,
boolean autoFlush) {
Modified: tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Mon Oct 13
14:32:49 2014
@@ -599,7 +599,8 @@ public class PageContextImpl extends Pag
}
/**
- * Returns the exception associated with this page context, if any. <p/>
+ * Returns the exception associated with this page context, if any.
+ * <p>
* Added wrapping for Throwables to avoid ClassCastException: see Bugzilla
* 31171 for details.
*
Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Mon Oct 13
14:32:49 2014
@@ -170,11 +170,11 @@ public class Util {
* Performs the following substring replacements
* (to facilitate output to XML/HTML pages):
*
- * & -> &
- * < -> <
- * > -> >
- * " -> "
- * ' -> '
+ * & -> &amp;
+ * < -> &lt;
+ * > -> &gt;
+ * " -> &#034;
+ * ' -> &#039;
*
* See also OutSupport.writeEscapedXml().
*
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java?rev=1631417&r1=1631416&r2=1631417&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java Mon Oct 13
14:32:49 2014
@@ -33,8 +33,8 @@ import java.util.Hashtable;
* encoding names used in XML instance documents <strong>must</strong>
* be the IANA encoding names specified or one of the aliases for those names
* which IANA defines.
- * <p>
* <TABLE BORDER="0" WIDTH="100%">
+ * <caption>Mapping of IANA encoding names and Java encoding names</caption>
* <TR>
* <TD WIDTH="33%">
* <P ALIGN="CENTER"><B>Common Name</B>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
