--- old/src/share/classes/javax/sql/PooledConnection.java 2014-04-08 09:48:47.826052871 -0700 +++ new/src/share/classes/javax/sql/PooledConnection.java 2014-04-08 09:48:47.633051596 -0700 @@ -83,7 +83,6 @@ * ConnectionPool method addStatementEventListener. * Thus, when an application closes its PreparedStatement, * the underlying prepared statement is recycled rather than being closed. - *

* * @since 1.4 */ @@ -154,10 +153,10 @@ * wish to be notified when PreparedStatements created by the * connection are closed or are detected to be invalid may use this method * to register a StatementEventListener with this PooledConnection object. - *

+ * * @param listener an component which implements the StatementEventListener * interface that is to be registered with this PooledConnection object - *

+ * * @since 1.6 */ public void addStatementEventListener(StatementEventListener listener); @@ -166,11 +165,11 @@ * Removes the specified StatementEventListener from the list of * components that will be notified when the driver detects that a * PreparedStatement has been closed or is invalid. - *

+ * * @param listener the component which implements the * StatementEventListener interface that was previously * registered with this PooledConnection object - *

+ * * @since 1.6 */ public void removeStatementEventListener(StatementEventListener listener); --- old/src/share/classes/javax/sql/StatementEvent.java 2014-04-08 09:48:48.369056456 -0700 +++ new/src/share/classes/javax/sql/StatementEvent.java 2014-04-08 09:48:48.195055307 -0700 @@ -37,7 +37,7 @@ * registered with a PooledConnection. This occurs when the driver determines that a * PreparedStatement that is associated with the PooledConnection has been closed or the driver determines * is invalid. - *

+ * * @since 1.6 */ public class StatementEvent extends EventObject { @@ -50,11 +50,11 @@ * Constructs a StatementEvent with the specified PooledConnection and * PreparedStatement. The SQLException contained in the event defaults to * null. - *

+ * * @param con The PooledConnection that the closed or invalid * PreparedStatementis associated with. * @param statement The PreparedStatement that is being closed or is invalid - *

+ * * @throws IllegalArgumentException if con is null. * * @since 1.6 @@ -71,7 +71,7 @@ /** * Constructs a StatementEvent with the specified PooledConnection, * PreparedStatement and SQLException - *

+ * * @param con The PooledConnection that the closed or invalid PreparedStatement * is associated with. * @param statement The PreparedStatement that is being closed or is invalid @@ -79,7 +79,7 @@ * the application * * @throws IllegalArgumentException if con is null. - *

+ * * @since 1.6 */ public StatementEvent(PooledConnection con, @@ -94,9 +94,9 @@ /** * Returns the PreparedStatement that is being closed or is invalid - *

+ * * @return The PreparedStatement that is being closed or is invalid - *

+ * * @since 1.6 */ public PreparedStatement getStatement() { @@ -106,9 +106,9 @@ /** * Returns the SQLException the driver is about to throw - *

+ * * @return The SQLException the driver is about to throw - *

+ * * @since 1.6 */ public SQLException getSQLException() { --- old/src/share/classes/javax/sql/StatementEventListener.java 2014-04-08 09:48:48.873059784 -0700 +++ new/src/share/classes/javax/sql/StatementEventListener.java 2014-04-08 09:48:48.714058733 -0700 @@ -52,7 +52,7 @@ *

* Methods which allow a component to register a StatementEventListener with a * PooledConnection have been added to the PooledConnection interface. - *

+ * * @since 1.6 */ public interface StatementEventListener extends java.util.EventListener{ @@ -72,13 +72,13 @@ * PreparedStatement is invalid. The driver calls this method * just before it throws the SQLException, * contained in the given event, to the application. - *

- * @param event an event object describing the source of the event, - * the statement that is invalid and the exception the - * driver is about to throw. The source of the event is - * the PooledConnection which the invalid PreparedStatement - * is associated with. - *

+ * + * @param event an event object describing the source of the event, + * the statement that is invalid and the exception the + * driver is about to throw. The source of the event is + * the PooledConnection which the invalid PreparedStatement + * is associated with. + * * @since 1.6 */ void statementErrorOccurred(StatementEvent event); --- old/src/share/classes/javax/sql/package.html 2014-04-08 09:48:49.395063230 -0700 +++ new/src/share/classes/javax/sql/package.html 2014-04-08 09:48:49.229062134 -0700 @@ -37,9 +37,9 @@ This package supplements the java.sql package and, as of the version 1.4 release, is included in the Java Platform, Standard Edition -(Java SETM). +(Java SETM). It remains an essential part of the Java Platform, Enterprise Edition -(Java EETM). +(Java EETM).

The javax.sql package provides for the following:

    @@ -145,7 +145,6 @@ PreparedStatement is closed or there is an error, the connection pool manager (being a listener) gets a notification that includes a StatementEvent object. -

    Distributed Transactions

    @@ -203,14 +202,12 @@ it rows, or moves its cursor, it also notifies each listener that is registered with it. The listener reacts by carrying out its implementation of the notification method called on it. -

  1. RowSetEvent
    As part of its internal notification process, a RowSet object creates an instance of RowSetEvent and passes it to the listener. The listener can use this RowSetEvent object to find out which rowset had the event. -

  2. Metadata
  3. The Reader/Writer Facility
    A RowSet object that implements the RowSetInternal @@ -248,7 +244,7 @@ (2) the connection that was passed to it, if any. A rowset uses the RowSetInternal methods behind the scenes to get access to this information. An application does not normally invoke these methods directly. -

    +

  4. RowSetReader
    A disconnected RowSet object that has implemented the RowSetInternal interface can call on its reader (the @@ -269,7 +265,6 @@ back to the underlying data source. Implementations may vary widely, but generally, a writer will do the following: -

    - *

    * * *

    2.0 Setting Properties

    @@ -981,7 +980,7 @@ * the specified concurrency. The default concurrency for any RowSet * object (connected or disconnected) is ResultSet.CONCUR_UPDATABLE, * but this method may be called at any time to change the concurrency. - *

    + * * @param concurrency one of the following constants: * ResultSet.CONCUR_READ_ONLY or * ResultSet.CONCUR_UPDATABLE @@ -1419,7 +1418,6 @@ * form a subset of the actual rows returned by the original query. This is * an implementation variance determined by the specific SyncProvider * object employed by the disconnected RowSet object. - *

    * * @param rows the number of rows to fetch; 0 to let the * driver decide what the best fetch size is; must not be less @@ -1466,7 +1464,7 @@ *

    * An application can call the method setConcurrency at any time * to change a RowSet object's concurrency. - *

    + * * @return the concurrency type for this RowSet * object, which must be one of the following: * ResultSet.CONCUR_READ_ONLY or @@ -1737,7 +1735,7 @@ *

    * NOTE: JdbcRowSet does not require the populate method * as it is undefined in this class. - *

    + * * @param parameterIndex the ordinal number of the placeholder parameter * in this RowSet object's command that is to be set. * The first parameter is 1, the second is 2, and so on; must be @@ -1867,7 +1865,7 @@ *

    * NOTE: JdbcRowSet does not require the populate method * as it is undefined in this class. - * S + * * @param parameterIndex the ordinal number of the placeholder parameter * in this RowSet object's command that is to be set. * The first parameter is 1, the second is 2, and so on; must be @@ -1933,7 +1931,7 @@ *

    * NOTE: JdbcRowSet does not require the populate method * as it is undefined in this class. - *

    + * * @param parameterIndex the ordinal number of the placeholder parameter * in this RowSet object's command that is to be set. * The first parameter is 1, the second is 2, and so on; must be @@ -3579,7 +3577,7 @@ * @exception SQLException if a database access error occurs or * this method is called on a closed CallableStatement * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method - * @since 1.6 + * @since 1.6 */ public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException{ @@ -3651,7 +3649,7 @@ * Reader reads the data till end-of-file is reached. The * driver does the necessary conversion from Java character format to * the national character set in the database. - + * *

    Note: This stream object can either be a standard * Java stream object or your own subclass that implements the * standard interface. --- old/src/share/classes/javax/sql/rowset/CachedRowSet.java 2014-04-08 09:48:50.484070419 -0700 +++ new/src/share/classes/javax/sql/rowset/CachedRowSet.java 2014-04-08 09:48:50.325069370 -0700 @@ -998,7 +998,6 @@ * available within the internal RowSet tabular structure by * virtue of a key already set either on the RowSet object * itself or on the underlying SQL data. - *

    * * @return a Collection object that contains the values in * each row in this CachedRowSet object --- old/src/share/classes/javax/sql/rowset/JdbcRowSet.java 2014-04-08 09:48:51.008073881 -0700 +++ new/src/share/classes/javax/sql/rowset/JdbcRowSet.java 2014-04-08 09:48:50.849072831 -0700 @@ -116,7 +116,6 @@ * CachedRowSet™ * reference implementation to account for the different * requirements of connected and disconnected RowSet objects. - *

    * * @author Jonathan Bruce */ --- old/src/share/classes/javax/sql/rowset/package.html 2014-04-08 09:48:51.530077327 -0700 +++ new/src/share/classes/javax/sql/rowset/package.html 2014-04-08 09:48:51.366076243 -0700 @@ -76,7 +76,7 @@ technology-enabled driver ("JDBC driver"). In addition, a JdbcRowSet object provides a fully updatable and scrollable tabular data structure as defined in the JDBC 3.0 specification. -

    +

  5. CachedRowSet - A CachedRowSet object is a JavaBeans™ @@ -92,7 +92,7 @@ Further details on this mechanism are discussed in the javax.sql.rowset.spi package specification. -

    +

  6. WebRowSet - A WebRowSet object is an extension of CachedRowSet that can read and write a RowSet object in a well formed XML format. @@ -108,7 +108,7 @@ Schema is defined and published at http://java.sun.com/xml/ns/jdbc/webrowset.xsd. -

    +

  7. FilteredRowSet - A FilteredRowSet object provides filtering functionality in a programmatic and extensible way. There are many instances when a RowSet object @@ -124,7 +124,7 @@ considered as bi-directional. No standard filters are defined; however, sufficient mechanics are specified to permit any required filter to be implemented. -

    +

  8. JoinRowSet - The JoinRowSet interface describes a mechanism by which relationships can be established between two or more standard RowSet implementations. Any number of RowSet @@ -146,7 +146,7 @@ should also consult the Implementer's Guide in the javax.sql.rowset.spi package for guidelines on SyncProvider implementations. -

    +

    -
  9. 3.0 SyncProvider Implementer's Guide

    -
    -

    4.0 Resolving Synchronization Conflicts

    +

    4.0 Resolving Synchronization Conflicts

    The interface SyncResolver provides a way for an application to decide manually what to do when a conflict occurs. When the CachedRowSet @@ -491,13 +487,13 @@

    The comment for the SyncResolver interface has more detail. -

    5.0 Related Specifications

    +

    5.0 Related Specifications

    -

    6.0 Related Documentation

    +

    6.0 Related Documentation