8180256: Fix HTML 5 issues in java.sql and java.sql.rowset modules
Reviewed-by: lancea
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html Thu May 11 18:10:40 2017 +0000
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/package.html Thu May 11 18:04:24 2017 -0700
@@ -1,11 +1,11 @@
-<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
+<!doctype html>
+<html lang="en">
<head>
<meta http-equiv="Content-Type"
content="text/html; charset=iso-8859-1">
<!--
-Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
-->
<title>javax.sql.rowset Package</title>
</head>
- <body bgcolor="#ffffff">
+ <body>
<!-- Description clause -->
Standard interfaces and base classes for JDBC <code>RowSet</code>
@@ -48,7 +48,7 @@
<li><a href="#reldocs">5.0 Related Documentation</a>
</ul>
-<h3><a name="pkgspec">1.0 Package Specification</a></h3>
+<h3><a id="pkgspec">1.0 Package Specification</a></h3>
This package specifies five standard JDBC <code>RowSet</code> interfaces.
All five extend the
<a href="../RowSet.html">RowSet</a> interface described in the JDBC 3.0
@@ -63,7 +63,7 @@
should pay particular attention to the assertions detailed in specification
interfaces.
-<h3><a name="stdrowset">2.0 Standard RowSet Definitions</a></h3>
+<h3><a id="stdrowset">2.0 Standard RowSet Definitions</a></h3>
<ul>
<li><a href="JdbcRowSet.html"><b><code>JdbcRowSet</code></b></a> - A wrapper around
a <code>ResultSet</code> object that makes it possible to use the result set as a
@@ -136,7 +136,7 @@
<code>RowSet</code> instances without the need to touch the originating data source.
</ul>
-<h3><a name="impl">3.0 Implementer's Guide</a></h3>
+<h3><a id="impl">3.0 Implementer's Guide</a></h3>
Compliant implementations of JDBC <code>RowSet</code> Implementations
<b>must</b> follow the assertions described in this specification. In accordance
with the terms of the <a href="http://www.jcp.org">Java Community Process</a>, a
@@ -173,47 +173,40 @@
The following table illustrates the features that the <code>BaseRowSet</code>
abstract class provides.
<blockquote>
- <table cellpadding="2" cellspacing="2" border="1" width="75%">
+ <table class="striped" style="vertical-align:top; width:75%">
+ <caption>Features in <code>BaseRowSet</code></caption>
+ <thead>
+ <tr>
+ <th>Feature</th>
+ <th>Details</th>
+ </tr>
+ </thead>
<tbody>
<tr>
- <td valign="top"><b>Feature</b><br>
- </td>
- <td valign="top"><b>Details</b><br>
- </td>
- </tr>
- <tr>
- <td valign="top">Properties<br>
- </td>
- <td valign="top">Provides standard JavaBeans property manipulation
+ <td>Properties</td>
+ <td>Provides standard JavaBeans property manipulation
mechanisms to allow applications to get and set <code>RowSet</code> command and
property values. Refer to the documentation of the <code>javax.sql.RowSet</code>
interface (available in the JDBC 3.0 specification) for more details on
-the standard <code>RowSet</code> properties.<br>
- </td>
+the standard <code>RowSet</code> properties.</td>
</tr>
<tr>
- <td valign="top">Event notification<br>
- </td>
- <td valign="top">Provides standard JavaBeans event notifications
+ <td>Event notification</td>
+ <td>Provides standard JavaBeans event notifications
to registered event listeners. Refer to the documentation of <code>javax.sql.RowSetEvent</code>
interface (available in the JDBC 3.0 specification) for
more details on how to register and handle standard RowSet events generated
-by compliant implementations.<br>
- </td>
+by compliant implementations.</td>
</tr>
<tr>
- <td valign="top">Setters for a RowSet object's command<br>
- </td>
- <td valign="top">Provides a complete set of setter methods
- for setting RowSet command parameters.<br>
- </td>
+ <td>Setters for a RowSet object's command</td>
+ <td>Provides a complete set of setter methods
+ for setting RowSet command parameters.</td>
</tr>
<tr>
- <td valign="top">Streams<br>
- </td>
- <td valign="top">Provides fields for storing of stream instances
- in addition to providing a set of constants for stream type designation.<br>
- </td>
+ <td>Streams</td>
+ <td>Provides fields for storing of stream instances
+ in addition to providing a set of constants for stream type designation.</td>
</tr>
</tbody>
</table>
@@ -289,13 +282,13 @@
</li>
</ul>
-<h3><a name="relspec">4.0 Related Specifications</a></h3>
+<h3><a id="relspec">4.0 Related Specifications</a></h3>
<ul>
<li><a href="https://jcp.org/en/jsr/detail?id=221">JDBC 4.2 Specification</a>
<li><a href="http://www.w3.org/XML/Schema">XML Schema</a>
</ul>
-<h3><a name="reldocs">5.0 Related Documentation</a></h3>
+<h3><a id="reldocs">5.0 Related Documentation</a></h3>
<ul>
<li><a href="http://docs.oracle.com/javase/tutorial/jdbc/basics/rowset.html">
JDBC RowSet Tutorial</a>
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html Thu May 11 18:10:40 2017 +0000
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html Thu May 11 18:04:24 2017 -0700
@@ -1,5 +1,5 @@
-<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
+<!doctype html>
+<html lang="en">
<head>
<meta http-equiv="Content-Type"
@@ -8,7 +8,7 @@
<meta name="GENERATOR"
content="Mozilla/4.79 [en] (Windows NT 5.0; U) [Netscape]">
<!--
-Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
<title>javax.sql.rowset.spi</title>
</head>
- <body bgcolor="#ffffff">
+ <body>
The standard classes and interfaces that a third party vendor has to
use in its implementation of a synchronization provider. These classes and
@@ -57,7 +57,7 @@
<li><a href="#reldocs">6.0 Related Documentation</a>
</ul>
-<h3><a name="pkgspec">1.0 Package Specification</a></h3>
+<h3><a id="pkgspec">1.0 Package Specification</a></h3>
<P>
The following classes and interfaces make up the <code>javax.sql.rowset.spi</code>
package:
@@ -202,7 +202,7 @@
registering the fully qualified class name with Oracle Corporation at
<code>jdbc@sun.com</code>. This process is discussed in further detail below.
-<h3><a name="arch">2.0 Service Provider Interface Architecture</a></h3>
+<h3><a id="arch">2.0 Service Provider Interface Architecture</a></h3>
<b>2.1 Overview</b>
<p>
The Service Provider Interface provides a pluggable mechanism by which
@@ -267,7 +267,7 @@
These policies are explored in more detail in the <a href="SyncFactory.html">
<code>SyncFactory</code></a> class.
-<h3><a name="impl">3.0 SyncProvider Implementer's Guide</a></h3>
+<h3><a id="impl">3.0 SyncProvider Implementer's Guide</a></h3>
<b>3.1 Requirements</b>
<p>
@@ -442,7 +442,7 @@
</pre>
-<h3><a name="resolving">4.0 Resolving Synchronization Conflicts</a></h3>
+<h3><a id="resolving">4.0 Resolving Synchronization Conflicts</a></h3>
The interface <code>SyncResolver</code> provides a way for an application to
decide manually what to do when a conflict occurs. When the <code>CachedRowSet</code>
@@ -487,13 +487,13 @@
<P>
The comment for the <code>SyncResolver</code> interface has more detail.
-<h3><a name="relspec">5.0 Related Specifications</a></h3>
+<h3><a id="relspec">5.0 Related Specifications</a></h3>
<ul>
<li><a href="http://docs.oracle.com/javase/jndi/tutorial/index.html">JNDI</a>
<li><a href="{@docRoot}/../technotes/guides/logging/index.html">Java Logging
APIs</a>
</ul>
-<h3><a name="reldocs">6.0 Related Documentation</a></h3>
+<h3><a id="reldocs">6.0 Related Documentation</a></h3>
<ul>
<li><a href="{@docRoot}/../technotes/tools/index.html#basic">System
properties</a>
--- a/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java Thu May 11 18:10:40 2017 +0000
+++ b/jdk/src/java.sql/share/classes/java/sql/SQLPermission.java Thu May 11 18:04:24 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,13 +58,17 @@
* and a discussion of the risks of granting code the permission.
*
*
- * <table border=1 cellpadding=5 summary="permission target name, what the permission allows, and associated risks">
+ * <table class="striped">
+ * <caption style="display:none">permission target name, what the permission allows, and associated risks</caption>
+ * <thead>
* <tr>
* <th>Permission Target Name</th>
* <th>What the Permission Allows</th>
* <th>Risks of Allowing this Permission</th>
* </tr>
+ * </thead>
*
+ * <tbody>
* <tr>
* <td>setLog</td>
* <td>Setting of the logging stream</td>
@@ -103,6 +107,7 @@
* <td>Permits an application to remove a JDBC driver from the list of
* registered Drivers and release its resources.</td>
* </tr>
+ * </tbody>
* </table>
*
* @since 1.3
--- a/jdk/src/java.sql/share/classes/java/sql/Statement.java Thu May 11 18:10:40 2017 +0000
+++ b/jdk/src/java.sql/share/classes/java/sql/Statement.java Thu May 11 18:04:24 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -686,7 +686,7 @@
* more results
* @exception SQLException if a database access error occurs,
* this method is called on a closed <code>Statement</code> or the argument
- * supplied is not one of the following:
+ * supplied is not one of the following:
* <code>Statement.CLOSE_CURRENT_RESULT</code>,
* <code>Statement.KEEP_CURRENT_RESULT</code> or
* <code>Statement.CLOSE_ALL_RESULTS</code>
@@ -1379,16 +1379,20 @@
* single quote within the string will be replaced by two single quotes.
*
* <blockquote>
- * <table border = 1 cellspacing=0 cellpadding=5 >
+ * <table class="striped" >
* <caption>Examples of the conversion:</caption>
+ * <thead>
* <tr><th>Value</th><th>Result</th></tr>
- * <tr> <td align='center'>Hello</td> <td align='center'>'Hello'</td> </tr>
- * <tr> <td align='center'>G'Day</td> <td align='center'>'G''Day'</td> </tr>
- * <tr> <td align='center'>'G''Day'</td>
- * <td align='center'>'''G''''Day'''</td> </tr>
- * <tr> <td align='center'>I'''M</td> <td align='center'>'I''''''M'</td>
+ * </thead>
+ * <tbody style="text-align:center">
+ * <tr> <td>Hello</td> <td>'Hello'</td> </tr>
+ * <tr> <td>G'Day</td> <td>'G''Day'</td> </tr>
+ * <tr> <td>'G''Day'</td>
+ * <td>'''G''''Day'''</td> </tr>
+ * <tr> <td>I'''M</td> <td>'I''''''M'</td>
* </tr>
*
+ * </tbody>
* </table>
* </blockquote>
* @implNote
@@ -1446,52 +1450,56 @@
* <li>The length of {@code identifier} is less than 1 or greater than 128 characters
* </ul>
* <blockquote>
- * <table border = 1 cellspacing=0 cellpadding=5 >
+ * <table class="striped" >
* <caption>Examples of the conversion:</caption>
+ * <thead>
* <tr>
* <th>identifier</th>
* <th>alwaysQuote</th>
* <th>Result</th></tr>
+ * </thead>
+ * <tbody>
* <tr>
- * <td align='center'>Hello</td>
- * <td align='center'>false</td>
- * <td align='center'>Hello</td>
+ * <td>Hello</td>
+ * <td>false</td>
+ * <td>Hello</td>
* </tr>
* <tr>
- * <td align='center'>Hello</td>
- * <td align='center'>true</td>
- * <td align='center'>"Hello"</td>
+ * <td>Hello</td>
+ * <td>true</td>
+ * <td>"Hello"</td>
* </tr>
* <tr>
- * <td align='center'>G'Day</td>
- * <td align='center'>false</td>
- * <td align='center'>"G'Day"</td>
+ * <td>G'Day</td>
+ * <td>false</td>
+ * <td>"G'Day"</td>
* </tr>
* <tr>
- * <td align='center'>"Bruce Wayne"</td>
- * <td align='center'>false</td>
- * <td align='center'>"Bruce Wayne"</td>
+ * <td>"Bruce Wayne"</td>
+ * <td>false</td>
+ * <td>"Bruce Wayne"</td>
* </tr>
* <tr>
- * <td align='center'>"Bruce Wayne"</td>
- * <td align='center'>true</td>
- * <td align='center'>"Bruce Wayne"</td>
+ * <td>"Bruce Wayne"</td>
+ * <td>true</td>
+ * <td>"Bruce Wayne"</td>
* </tr>
* <tr>
- * <td align='center'>GoodDay$</td>
- * <td align='center'>false</td>
- * <td align='center'>"GoodDay$"</td>
+ * <td>GoodDay$</td>
+ * <td>false</td>
+ * <td>"GoodDay$"</td>
* </tr>
* <tr>
- * <td align='center'>Hello"World</td>
- * <td align='center'>false</td>
- * <td align='center'>SQLException</td>
+ * <td>Hello"World</td>
+ * <td>false</td>
+ * <td>SQLException</td>
* </tr>
* <tr>
- * <td align='center'>"Hello"World"</td>
- * <td align='center'>false</td>
- * <td align='center'>SQLException</td>
+ * <td>"Hello"World"</td>
+ * <td>false</td>
+ * <td>SQLException</td>
* </tr>
+ * </tbody>
* </table>
* </blockquote>
* @implNote
@@ -1542,36 +1550,40 @@
* </ul>
*
* <blockquote>
- * <table border = 1 cellspacing=0 cellpadding=5 >
+ * <table class="striped" >
* <caption>Examples of the conversion:</caption>
+ * <thead>
* <tr>
* <th>identifier</th>
* <th>Simple Identifier</th>
+ * </thead>
*
+ * <tbody>
* <tr>
- * <td align='center'>Hello</td>
- * <td align='center'>true</td>
+ * <td>Hello</td>
+ * <td>true</td>
* </tr>
* <tr>
- * <td align='center'>G'Day</td>
- * <td align='center'>false</td>
+ * <td>G'Day</td>
+ * <td>false</td>
* </tr>
* <tr>
- * <td align='center'>"Bruce Wayne"</td>
- * <td align='center'>false</td>
+ * <td>"Bruce Wayne"</td>
+ * <td>false</td>
* </tr>
* <tr>
- * <td align='center'>GoodDay$</td>
- * <td align='center'>false</td>
+ * <td>GoodDay$</td>
+ * <td>false</td>
* </tr>
* <tr>
- * <td align='center'>Hello"World</td>
- * <td align='center'>false</td>
+ * <td>Hello"World</td>
+ * <td>false</td>
* </tr>
* <tr>
- * <td align='center'>"Hello"World"</td>
- * <td align='center'>false</td>
+ * <td>"Hello"World"</td>
+ * <td>false</td>
* </tr>
+ * </tbody>
* </table>
* </blockquote>
* @implNote JDBC driver implementations may need to provide their own
@@ -1597,19 +1609,23 @@
* by two single quotes.
*
* <blockquote>
- * <table border = 1 cellspacing=0 cellpadding=5 >
+ * <table class="striped">
* <caption>Examples of the conversion:</caption>
+ * <thead>
* <tr>
* <th>Value</th>
* <th>Result</th>
* </tr>
- * <tr> <td align='center'>Hello</td> <td align='center'>N'Hello'</td> </tr>
- * <tr> <td align='center'>G'Day</td> <td align='center'>N'G''Day'</td> </tr>
- * <tr> <td align='center'>'G''Day'</td>
- * <td align='center'>N'''G''''Day'''</td> </tr>
- * <tr> <td align='center'>I'''M</td> <td align='center'>N'I''''''M'</td>
- * <tr> <td align='center'>N'Hello'</td> <td align='center'>N'N''Hello'''</td> </tr>
+ * </thead>
+ * <tbody>
+ * <tr> <td>Hello</td> <td>N'Hello'</td> </tr>
+ * <tr> <td>G'Day</td> <td>N'G''Day'</td> </tr>
+ * <tr> <td>'G''Day'</td>
+ * <td>N'''G''''Day'''</td> </tr>
+ * <tr> <td>I'''M</td> <td>N'I''''''M'</td>
+ * <tr> <td>N'Hello'</td> <td>N'N''Hello'''</td> </tr>
*
+ * </tbody>
* </table>
* </blockquote>
* @implNote