This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 17a24bf Fix various Javadoc warnings/errors with Java 9 by aligning
with 8.5.x
17a24bf is described below
commit 17a24bf9b1b3f5fc45e75c1f2727a5f198fc2621
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Sep 7 23:23:06 2019 +0100
Fix various Javadoc warnings/errors with Java 9 by aligning with 8.5.x
---
.../catalina/tribes/group/AbsoluteOrder.java | 7 +-
.../apache/catalina/valves/JDBCAccessLogValve.java | 31 +-
java/org/apache/catalina/valves/RemoteIpValve.java | 1 -
java/org/apache/coyote/AsyncStateMachine.java | 6 +-
java/org/apache/el/MethodExpressionImpl.java | 12 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 24 +-
.../apache/jasper/compiler/TldLocationsCache.java | 6 +-
java/org/apache/jasper/xmlparser/EncodingMap.java | 510 ++++++++++-----------
8 files changed, 295 insertions(+), 302 deletions(-)
diff --git a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
index 9dfb66b..d26c0e0 100644
--- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
+++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
@@ -31,15 +31,14 @@ import org.apache.catalina.tribes.Member;
* Ordering members can serve as a basis for electing a leader or
coordinating efforts.<br>
* This is stinky simple, it works on the basis of the <code>Member</code>
interface
* and orders members in the following format:
- *
- * <ol>
+ * </p>
+ * <ol>
* <li>IP comparison - byte by byte, lower byte higher rank</li>
* <li>IPv4 addresses rank higher than IPv6, ie the lesser number of
bytes, the higher rank</li>
* <li>Port comparison - lower port, higher rank</li>
* <li>UniqueId comparison- byte by byte, lower byte higher rank</li>
- * </ol>
+ * </ol>
*
- * </p>
*
* @author Filip Hanik
* @version 1.0
diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 1860fc5..58554c1 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -41,6 +41,7 @@ import org.apache.tomcat.util.ExceptionUtils;
* 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.ExceptionUtils;
* 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>),
@@ -166,7 +166,7 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
* Use long contentLength as you have more 4 GB output.
* @since 6.0.15
*/
- boolean useLongContentLength = false ;
+ boolean useLongContentLength = false;
/**
* The connection username to use when trying to connect to the database.
@@ -243,8 +243,7 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
}
/**
- * Return the username to use to connect to the database.
- *
+ * @return the username to use to connect to the database.
*/
public String getConnectionName() {
return connectionName;
@@ -268,9 +267,8 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
this.driverName = driverName;
}
- /**
- * Return the password to use to connect to the database.
- *
+ /**
+ * @return the password to use to connect to the database.
*/
public String getConnectionPassword() {
return connectionPassword;
@@ -367,11 +365,11 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
}
- /**
- * Sets the name of the field containing the HTTP response status code.
- *
- * @param statusField The name of the HTTP response status code field.
- */
+ /**
+ * Sets the name of the field containing the HTTP response status code.
+ *
+ * @param statusField The name of the HTTP response status code field.
+ */
public void setStatusField(String statusField) {
this.statusField = statusField;
}
@@ -431,10 +429,11 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
}
/**
- * get useLongContentLength
+ * @return <code>true</code> if content length should be considered a long
+ * rather than an int, defaults to <code>false</code>
*/
- public boolean getUseLongContentLength() {
- return this.useLongContentLength ;
+ public boolean getUseLongContentLength() {
+ return this.useLongContentLength;
}
/**
@@ -576,7 +575,7 @@ public final class JDBCAccessLogValve extends ValveBase
implements AccessLog {
if (driver == null) {
try {
Class<?> clazz = Class.forName(driverName);
- driver = (Driver) clazz.newInstance();
+ driver = (Driver) clazz.getConstructor().newInstance();
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
throw new SQLException(e.getMessage(), e);
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java
b/java/org/apache/catalina/valves/RemoteIpValve.java
index 2ef9b99..fe54768 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -99,7 +99,6 @@ import org.apache.tomcat.util.http.parser.Host;
* <br>
* By default, 10/8, 192.168/16, 169.254/16, 127/8 and ::1 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
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index 6de31bd..51a756d 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -76,7 +76,7 @@ import org.apache.tomcat.util.security.PrivilegedSetTccl;
*
* |-----------------»------|
|--«--------MUST_ERROR---------------«------------------------|
* | \|/\|/
|
- * | |----------«-----E R R O
R<-------------------------«-------------------------------| |
+ * | |----------«-----E R R O
R--«-----------------------«-------------------------------| |
* | | complete() /|\/|\\ \--«---------------------------------«-----|
| ^
* | | | | \ |
| |
* | | |-----»-------| | \-----------»----------| |
| |
@@ -84,7 +84,7 @@ import org.apache.tomcat.util.security.PrivilegedSetTccl;
* | | | | \|/ ^
| |
* | | | | |--|timeout() | |
| |
* | | | post() | | \|/ | post() |
| |
- * | | | |---------- | -->DISPATCHED<---------- |
--------------COMPLETING<-----| | |
+ * | | | |---------- | --»DISPATCHED«---------- |
--------------COMPLETING«-----| | |
* | | | | | /|\/|\ | | | /|\
/|\ | | |
* | | | | |---»- | ---| | |startAsync() | timeout()|--|
| | | |
* | | ^ ^ | | | | |
| | ^ |
@@ -123,7 +123,7 @@ import org.apache.tomcat.util.security.PrivilegedSetTccl;
* | |-------«----------------------------------«------| |
* | complete() |
* | |
- * |<--------«-------------------«-------------------------------«--|
+ * |«--------«-------------------«-------------------------------«--|
* error()
* </pre>
*/
diff --git a/java/org/apache/el/MethodExpressionImpl.java
b/java/org/apache/el/MethodExpressionImpl.java
index bd9f570..ef954d6 100644
--- a/java/org/apache/el/MethodExpressionImpl.java
+++ b/java/org/apache/el/MethodExpressionImpl.java
@@ -41,7 +41,7 @@ import org.apache.el.util.ReflectionUtil;
* An <code>Expression</code> that refers to a method on an object.
*
* <p>
- * <code>The {@link javax.el.ExpressionFactory#createMethodExpression} method
+ * The {@link javax.el.ExpressionFactory#createMethodExpression} method
* can be used to parse an expression string and return a concrete instance
* of <code>MethodExpression</code> that encapsulates the parsed expression.
* The {@link FunctionMapper} is used at parse time, not evaluation time,
@@ -88,20 +88,10 @@ public final class MethodExpressionImpl extends
MethodExpression implements
private Class<?>[] paramTypes;
- /**
- *
- */
public MethodExpressionImpl() {
super();
}
- /**
- * @param expr
- * @param node
- * @param fnMapper
- * @param expectedType
- * @param paramTypes
- */
public MethodExpressionImpl(String expr, Node node,
FunctionMapper fnMapper, VariableMapper varMapper,
Class<?> expectedType, Class<?>[] paramTypes) {
diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java
b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index e6f000d..792f398 100644
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -50,7 +50,7 @@ import org.apache.juli.logging.LogFactory;
/**
* 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
@@ -62,18 +62,20 @@ import org.apache.juli.logging.LogFactory;
*/
public final class JspRuntimeContext {
- // Logger
+ /**
+ * Logger
+ */
private final Log log = LogFactory.getLog(JspRuntimeContext.class); //
must not be static
- /*
+ /**
* Counts how many times the webapp's JSPs have been reloaded.
*/
- private AtomicInteger jspReloadCount = new AtomicInteger(0);
+ private final AtomicInteger jspReloadCount = new AtomicInteger(0);
- /*
+ /**
* Counts how many times JSPs have been unloaded in this webapp.
*/
- private AtomicInteger jspUnloadCount = new AtomicInteger(0);
+ private final AtomicInteger jspUnloadCount = new AtomicInteger(0);
/**
* Preload classes required at runtime by a JSP servlet so that
@@ -111,6 +113,7 @@ public final class JspRuntimeContext {
* Loads in any previously generated dependencies from file.
*
* @param context ServletContext for web application
+ * @param options The main Jasper options
*/
public JspRuntimeContext(ServletContext context, Options options) {
@@ -451,14 +454,14 @@ public final class JspRuntimeContext {
}
/**
- * The classpath that is passed off to the Java compiler.
+ * @return the classpath that is passed off to the Java compiler.
*/
public String getClassPath() {
return classpath;
}
/**
- * Last time the update background task has run
+ * @return Last time the update background task has run
*/
public long getLastJspQueueUpdate() {
return lastJspQueueUpdate;
@@ -469,6 +472,7 @@ public final class JspRuntimeContext {
/**
* Method used to initialize classpath for compiles.
+ * @return the compilation classpath
*/
private String initClassPath() {
@@ -504,7 +508,9 @@ public final class JspRuntimeContext {
return path;
}
- // Helper class to allow initSecurity() to return two items
+ /**
+ * Helper class to allow initSecurity() to return two items
+ */
private static class SecurityHolder{
private final CodeSource cs;
private final PermissionCollection pc;
diff --git a/java/org/apache/jasper/compiler/TldLocationsCache.java
b/java/org/apache/jasper/compiler/TldLocationsCache.java
index 938e711..cc1b4e4 100644
--- a/java/org/apache/jasper/compiler/TldLocationsCache.java
+++ b/java/org/apache/jasper/compiler/TldLocationsCache.java
@@ -48,12 +48,12 @@ import org.apache.tomcat.util.scan.JarFactory;
* for the web application.
*
* Tag Libraries can be defined globally in one of two ways:
- * 1. Via <taglib> elements in web.xml:
+ * 1. Via <taglib> elements in web.xml:
* the uri and location of the tag-library are specified in
- * the <taglib> element.
+ * the <taglib> element.
* 2. Via packaged jar files that contain .tld files
* within the META-INF directory, or some subdirectory
- * of it. The taglib is 'global' if it has the <uri>
+ * of it. The taglib is 'global' if it has the <uri>
* element defined.
*
* A mapping between the taglib URI and its associated TaglibraryInfoImpl
diff --git a/java/org/apache/jasper/xmlparser/EncodingMap.java
b/java/org/apache/jasper/xmlparser/EncodingMap.java
index 8e1feab..aa18354 100644
--- a/java/org/apache/jasper/xmlparser/EncodingMap.java
+++ b/java/org/apache/jasper/xmlparser/EncodingMap.java
@@ -33,440 +33,440 @@ 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%">
+ * <TABLE>
+ * <caption>Mapping of IANA encoding names and Java encoding names</caption>
* <TR>
- * <TD WIDTH="33%">
- * <P ALIGN="CENTER"><B>Common Name</B>
+ * <TD>
+ * <P><B>Common Name</B>
* </TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER"><B>Use this name in XML files</B>
+ * <TD>
+ * <P><B>Use this name in XML files</B>
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER"><B>Name Type</B>
+ * <TD>
+ * <P><B>Name Type</B>
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER"><B>Xerces converts to this Java Encoder Name</B>
+ * <TD>
+ * <P><B>Xerces converts to this Java Encoder Name</B>
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">8 bit Unicode</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">UTF-8
+ * <TD>8 bit Unicode</TD>
+ * <TD>
+ * <P>UTF-8
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">UTF8
+ * <TD>
+ * <P>UTF8
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 1</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-1
+ * <TD>ISO Latin 1</TD>
+ * <TD>
+ * <P>ISO-8859-1
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-1
+ * <TD>
+ * <P>ISO-8859-1
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 2</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-2
+ * <TD>ISO Latin 2</TD>
+ * <TD>
+ * <P>ISO-8859-2
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-2
+ * <TD>
+ * <P>ISO-8859-2
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 3</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-3
+ * <TD>ISO Latin 3</TD>
+ * <TD>
+ * <P>ISO-8859-3
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-3
+ * <TD>
+ * <P>ISO-8859-3
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 4</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-4
+ * <TD>ISO Latin 4</TD>
+ * <TD>
+ * <P>ISO-8859-4
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-4
+ * <TD>
+ * <P>ISO-8859-4
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin Cyrillic</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-5
+ * <TD>ISO Latin Cyrillic</TD>
+ * <TD>
+ * <P>ISO-8859-5
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-5
+ * <TD>
+ * <P>ISO-8859-5
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin Arabic</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-6
+ * <TD>ISO Latin Arabic</TD>
+ * <TD>
+ * <P>ISO-8859-6
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-6
+ * <TD>
+ * <P>ISO-8859-6
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin Greek</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-7
+ * <TD>ISO Latin Greek</TD>
+ * <TD>
+ * <P>ISO-8859-7
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-7
+ * <TD>
+ * <P>ISO-8859-7
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin Hebrew</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-8
+ * <TD>ISO Latin Hebrew</TD>
+ * <TD>
+ * <P>ISO-8859-8
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-8
+ * <TD>
+ * <P>ISO-8859-8
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 5</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-9
+ * <TD>ISO Latin 5</TD>
+ * <TD>
+ * <P>ISO-8859-9
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-9
+ * <TD>
+ * <P>ISO-8859-9
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: US</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-us
+ * <TD>EBCDIC: US</TD>
+ * <TD>
+ * <P>ebcdic-cp-us
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp037
+ * <TD>
+ * <P>cp037
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Canada</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-ca
+ * <TD>EBCDIC: Canada</TD>
+ * <TD>
+ * <P>ebcdic-cp-ca
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp037
+ * <TD>
+ * <P>cp037
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Netherlands</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-nl
+ * <TD>EBCDIC: Netherlands</TD>
+ * <TD>
+ * <P>ebcdic-cp-nl
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp037
+ * <TD>
+ * <P>cp037
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Denmark</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-dk
+ * <TD>EBCDIC: Denmark</TD>
+ * <TD>
+ * <P>ebcdic-cp-dk
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp277
+ * <TD>
+ * <P>cp277
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Norway</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-no
+ * <TD>EBCDIC: Norway</TD>
+ * <TD>
+ * <P>ebcdic-cp-no
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp277
+ * <TD>
+ * <P>cp277
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Finland</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-fi
+ * <TD>EBCDIC: Finland</TD>
+ * <TD>
+ * <P>ebcdic-cp-fi
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp278
+ * <TD>
+ * <P>cp278
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Sweden</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-se
+ * <TD>EBCDIC: Sweden</TD>
+ * <TD>
+ * <P>ebcdic-cp-se
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp278
+ * <TD>
+ * <P>cp278
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Italy</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-it
+ * <TD>EBCDIC: Italy</TD>
+ * <TD>
+ * <P>ebcdic-cp-it
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp280
+ * <TD>
+ * <P>cp280
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Spain, Latin America</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-es
+ * <TD>EBCDIC: Spain, Latin America</TD>
+ * <TD>
+ * <P>ebcdic-cp-es
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp284
+ * <TD>
+ * <P>cp284
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Great Britain</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-gb
+ * <TD>EBCDIC: Great Britain</TD>
+ * <TD>
+ * <P>ebcdic-cp-gb
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp285
+ * <TD>
+ * <P>cp285
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: France</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-fr
+ * <TD>EBCDIC: France</TD>
+ * <TD>
+ * <P>ebcdic-cp-fr
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp297
+ * <TD>
+ * <P>cp297
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Arabic</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-ar1
+ * <TD>EBCDIC: Arabic</TD>
+ * <TD>
+ * <P>ebcdic-cp-ar1
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp420
+ * <TD>
+ * <P>cp420
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Hebrew</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-he
+ * <TD>EBCDIC: Hebrew</TD>
+ * <TD>
+ * <P>ebcdic-cp-he
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp424
+ * <TD>
+ * <P>cp424
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Switzerland</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-ch
+ * <TD>EBCDIC: Switzerland</TD>
+ * <TD>
+ * <P>ebcdic-cp-ch
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp500
+ * <TD>
+ * <P>cp500
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Roece</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-roece
+ * <TD>EBCDIC: Roece</TD>
+ * <TD>
+ * <P>ebcdic-cp-roece
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp870
+ * <TD>
+ * <P>cp870
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Yugoslavia</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-yu
+ * <TD>EBCDIC: Yugoslavia</TD>
+ * <TD>
+ * <P>ebcdic-cp-yu
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp870
+ * <TD>
+ * <P>cp870
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Iceland</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-is
+ * <TD>EBCDIC: Iceland</TD>
+ * <TD>
+ * <P>ebcdic-cp-is
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp871
+ * <TD>
+ * <P>cp871
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Urdu</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-ar2
+ * <TD>EBCDIC: Urdu</TD>
+ * <TD>
+ * <P>ebcdic-cp-ar2
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD>
+ * <P>IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp918
+ * <TD>
+ * <P>cp918
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Chinese for PRC, mixed 1/2 byte</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">gb2312
+ * <TD>Chinese for PRC, mixed 1/2 byte</TD>
+ * <TD>
+ * <P>gb2312
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">GB2312
+ * <TD>
+ * <P>GB2312
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Extended Unix Code, packed for Japanese</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">euc-jp
+ * <TD>Extended Unix Code, packed for Japanese</TD>
+ * <TD>
+ * <P>euc-jp
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">eucjis
+ * <TD>
+ * <P>eucjis
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Japanese: iso-2022-jp</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">iso-2020-jp
+ * <TD>Japanese: iso-2022-jp</TD>
+ * <TD>
+ * <P>iso-2020-jp
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">JIS
+ * <TD>
+ * <P>JIS
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Japanese: Shift JIS</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">Shift_JIS
+ * <TD>Japanese: Shift JIS</TD>
+ * <TD>
+ * <P>Shift_JIS
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">SJIS
+ * <TD>
+ * <P>SJIS
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Chinese: Big5</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">Big5
+ * <TD>Chinese: Big5</TD>
+ * <TD>
+ * <P>Big5
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">Big5
+ * <TD>
+ * <P>Big5
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Extended Unix Code, packed for Korean</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">euc-kr
+ * <TD>Extended Unix Code, packed for Korean</TD>
+ * <TD>
+ * <P>euc-kr
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">iso2022kr
+ * <TD>
+ * <P>iso2022kr
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Cyrillic</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">koi8-r
+ * <TD>Cyrillic</TD>
+ * <TD>
+ * <P>koi8-r
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD>
+ * <P>MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">koi8-r
+ * <TD>
+ * <P>koi8-r
* </TD>
* </TR>
* </TABLE>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
