Author: markt
Date: Mon Oct 13 14:15:11 2014
New Revision: 1631404
URL: http://svn.apache.org/r1631404
Log:
Fix more of the Java 8 Javadoc errors in the org.apace.catalina package
Modified:
tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java Mon Oct 13
14:15:11 2014
@@ -252,7 +252,7 @@ public class MemoryUser extends Abstract
*
* <p><strong>IMPLEMENTATION NOTE</strong> - For backwards compatibility,
* the reader that processes this entry will accept either
- * <code>username</code> or </code>name</code> for the username
+ * <code>username</code> or <code>name</code> for the username
* property.</p>
*/
public String toXml() {
Modified: tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Mon Oct
13 14:15:11 2014
@@ -112,7 +112,7 @@ public final class ExtensionValidator {
* file in the /META-INF/ directory of the application and all
* MANIFEST.MF files in each JAR file located in the WEB-INF/lib
* directory and creates an <code>ArrayList</code> of
- * <code>ManifestResorce<code> objects. These objects are then passed
+ * <code>ManifestResorce</code> objects. These objects are then passed
* to the validateManifestResources method for validation.
*
* @param resources The resources configured for this Web Application
Modified: tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java Mon Oct 13
14:15:11 2014
@@ -32,6 +32,7 @@ import java.util.Map;
* methods such as <code>TXDocument#printWithFormat</code> and
<code>DTD#printExternal</code>.
* <P>
* <TABLE BORDER="0" WIDTH="100%">
+ * <caption>MIME charset name to Java encoding name mapping</caption>
* <TR>
* <TD WIDTH="33%">
* <P ALIGN="CENTER"><B>Common Name</B>
Modified: tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Mon Oct 13
14:15:11 2014
@@ -90,7 +90,7 @@ public final class RequestUtil {
* <strong>IMPLEMENTATION NOTE</strong>: URL decoding is performed
* individually on the parsed name and value elements, rather than on
* the entire query string ahead of time, to properly deal with the case
- * where the name or value includes an encoded "=" or "&" character
+ * where the name or value includes an encoded "=" or "&" character
* that would otherwise be interpreted as a delimiter.
*
* @param map Map that accumulates the resulting parameters
@@ -169,7 +169,7 @@ public final class RequestUtil {
* <strong>IMPLEMENTATION NOTE</strong>: URL decoding is performed
* individually on the parsed name and value elements, rather than on
* the entire query string ahead of time, to properly deal with the case
- * where the name or value includes an encoded "=" or "&" character
+ * where the name or value includes an encoded "=" or "&" character
* that would otherwise be interpreted as a delimiter.
*
* NOTE: byte array data is modified by this method. Caller beware.
Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Mon
Oct 13 14:15:11 2014
@@ -41,6 +41,7 @@ import org.apache.tomcat.util.ExceptionU
* AccessLogValve.
* To use, copy into the server/classes directory of the Tomcat installation
* and configure in server.xml as:
+ * </p>
* <pre>
* <Valve className="org.apache.catalina.valves.JDBCAccessLogValve"
* driverName="<i>your_jdbc_driver</i>"
@@ -48,7 +49,6 @@ import org.apache.tomcat.util.ExceptionU
* pattern="combined" resolveHosts="false"
* />
* </pre>
- * </p>
* <p>
* Many parameters can be configured, such as the database connection (with
* <code>driverName</code> and <code>connectionURL</code>),
Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Mon Oct 13
14:15:11 2014
@@ -47,6 +47,7 @@ import org.apache.juli.logging.LogFactor
* </p>
* <p>
* If the incoming <code>request.getRemoteAddr()</code> matches the valve's
list of internal proxies :
+ * </p>
* <ul>
* <li>Loop on the comma delimited list of IPs and hostnames passed by the
preceding load balancer or proxy in the given request's Http
* header named <code>$remoteIpHeader</code> (default value
<code>x-forwarded-for</code>). Values are processed in right-to-left order.</li>
@@ -62,10 +63,8 @@ import org.apache.juli.logging.LogFactor
* <code>request.scheme = https</code> and <code>request.serverPort =
443</code>. Note that 443 can be overwritten with the
* <code>$httpsServerPort</code> configuration parameter.</li>
* </ul>
- * </p>
- * <p>
- * <strong>Configuration parameters:</strong>
* <table border="1">
+ * <caption>Configuration parameters</caption>
* <tr>
* <th>RemoteIpValve property</th>
* <th>Description</th>
@@ -96,7 +95,6 @@ import org.apache.juli.logging.LogFactor
* <br>
* By default, 10/8, 192.168/16, 169.254/16, 127/8 and 172.16/12 are
allowed.</td>
* </tr>
- * </tr>
* <tr>
* <td>proxiesHeader</td>
* <td>Name of the http header created by this valve to hold the list of
proxies that have been processed in the incoming
@@ -144,7 +142,6 @@ import org.apache.juli.logging.LogFactor
* <td>443</td>
* </tr>
* </table>
- * </p>
* <p>
* <p>
* This Valve may be attached to any Container, depending on the granularity
of the filtering you wish to perform.
@@ -157,24 +154,23 @@ import org.apache.juli.logging.LogFactor
* <code>RemoteIpValve</code> uses regular expression to configure
<code>internalProxies</code> and <code>trustedProxies</code> in the same
* fashion as {@link RequestFilterValve} does.
* </p>
- * <hr/>
+ * <hr>
* <p>
* <strong>Sample with internal proxies</strong>
* </p>
* <p>
* RemoteIpValve configuration:
* </p>
- * <code><pre>
+ * <code>
* <Valve
* className="org.apache.catalina.valves.RemoteIpValve"
* internalProxies="192\.168\.0\.10|192\.168\.0\.11"
* remoteIpHeader="x-forwarded-for"
* proxiesHeader="x-forwarded-by"
* protocolHeader="x-forwarded-proto"
- * /></pre></code>
- * <p>
- * Request values:
+ * /></code>
* <table border="1">
+ * <caption>Request Values</caption>
* <tr>
* <th>property</th>
* <th>Value Before RemoteIpValve</th>
@@ -216,27 +212,27 @@ import org.apache.juli.logging.LogFactor
* <td>443</td>
* </tr>
* </table>
+ * <p>
* Note : <code>x-forwarded-by</code> header is null because only internal
proxies as been traversed by the request.
* <code>x-forwarded-by</code> is null because all the proxies are trusted or
internal.
* </p>
- * <hr/>
+ * <hr>
* <p>
* <strong>Sample with trusted proxies</strong>
* </p>
* <p>
* RemoteIpValve configuration:
* </p>
- * <code><pre>
+ * <code>
* <Valve
* className="org.apache.catalina.valves.RemoteIpValve"
* internalProxies="192\.168\.0\.10|192\.168\.0\.11"
* remoteIpHeader="x-forwarded-for"
* proxiesHeader="x-forwarded-by"
* trustedProxies="proxy1|proxy2"
- * /></pre></code>
- * <p>
- * Request values:
+ * /></code>
* <table border="1">
+ * <caption>Request Values</caption>
* <tr>
* <th>property</th>
* <th>Value Before RemoteIpValve</th>
@@ -258,27 +254,27 @@ import org.apache.juli.logging.LogFactor
* <td>proxy1, proxy2</td>
* </tr>
* </table>
+ * <p>
* Note : <code>proxy1</code> and <code>proxy2</code> are both trusted proxies
that come in <code>x-forwarded-for</code> header, they both
* are migrated in <code>x-forwarded-by</code> header.
<code>x-forwarded-by</code> is null because all the proxies are trusted or
internal.
* </p>
- * <hr/>
+ * <hr>
* <p>
* <strong>Sample with internal and trusted proxies</strong>
* </p>
* <p>
* RemoteIpValve configuration:
* </p>
- * <code><pre>
+ * <code>
* <Valve
* className="org.apache.catalina.valves.RemoteIpValve"
* internalProxies="192\.168\.0\.10|192\.168\.0\.11"
* remoteIpHeader="x-forwarded-for"
* proxiesHeader="x-forwarded-by"
* trustedProxies="proxy1|proxy2"
- * /></pre></code>
- * <p>
- * Request values:
+ * /></code>
* <table border="1">
+ * <caption>Request Values</caption>
* <tr>
* <th>property</th>
* <th>Value Before RemoteIpValve</th>
@@ -300,28 +296,28 @@ import org.apache.juli.logging.LogFactor
* <td>proxy1, proxy2</td>
* </tr>
* </table>
+ * <p>
* Note : <code>proxy1</code> and <code>proxy2</code> are both trusted proxies
that come in <code>x-forwarded-for</code> header, they both
* are migrated in <code>x-forwarded-by</code> header. As
<code>192.168.0.10</code> is an internal proxy, it does not appear in
* <code>x-forwarded-by</code>. <code>x-forwarded-by</code> is null because
all the proxies are trusted or internal.
* </p>
- * <hr/>
+ * <hr>
* <p>
* <strong>Sample with an untrusted proxy</strong>
* </p>
* <p>
* RemoteIpValve configuration:
* </p>
- * <code><pre>
+ * <code>
* <Valve
* className="org.apache.catalina.valves.RemoteIpValve"
* internalProxies="192\.168\.0\.10|192\.168\.0\.11"
* remoteIpHeader="x-forwarded-for"
* proxiesHeader="x-forwarded-by"
* trustedProxies="proxy1|proxy2"
- * /></pre></code>
- * <p>
- * Request values:
+ * /></code>
* <table border="1">
+ * <caption>Request Values</caption>
* <tr>
* <th>property</th>
* <th>Value Before RemoteIpValve</th>
@@ -343,6 +339,7 @@ import org.apache.juli.logging.LogFactor
* <td>proxy1</td>
* </tr>
* </table>
+ * <p>
* Note : <code>x-forwarded-by</code> holds the trusted proxy
<code>proxy1</code>. <code>x-forwarded-by</code> holds
* <code>140.211.11.130</code> because <code>untrusted-proxy</code> is not
trusted and thus, we can not trust that
* <code>untrusted-proxy</code> is the actual remote ip.
<code>request.remoteAddr</code> is <code>untrusted-proxy</code> that is an IP
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java?rev=1631404&r1=1631403&r2=1631404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java Mon
Oct 13 14:15:11 2014
@@ -45,9 +45,9 @@ public class RewriteCond {
public static class LexicalCondition extends Condition {
/**
- * -1: <
+ * -1: <
* 0: =
- * 1: >
+ * 1: >
*/
public int type = 0;
public String condition;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
