8249205: Remove unnecessary trademark symbols

Reviewed-by: darcy, lancea, bpb, prr, jjg, cjplummer, iris, dfuchs, weijun, joehw, wetmore, bchristi

src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java

@@ -37,7 +37,7 @@ import javax.sql.rowset.serial.*;
 /**
  * An abstract class providing a <code>RowSet</code> object with its basic functionality.
  * The basic functions include having properties and sending event notifications,
- * which all JavaBeans&trade; components must implement.
+ * which all JavaBeans components must implement.
  *
  * <h2>1.0 Overview</h2>
  * The <code>BaseRowSet</code> class provides the core functionality
@@ -92,7 +92,7 @@ import javax.sql.rowset.serial.*;
  * NOTE:  In order to use a <code>DataSource</code> object for making a
  * connection, the <code>DataSource</code> object must have been registered
  * with a naming service that uses the Java Naming and Directory
- * Interface&trade; (JNDI) API.  This registration
+ * Interface (JNDI) API.  This registration
  * is usually done by a person acting in the capacity of a system administrator.
  *
  * <h2>3.0 Setting the Command and Its Parameters</h2>
@@ -105,7 +105,7 @@ import javax.sql.rowset.serial.*;
  * to <code>null</code> if required.
  * <P>
  * The following code fragment illustrates how the
- * <code>CachedRowSet</code>&trade;
+ * <code>CachedRowSet</code>
  * object <code>crs</code> might have its command property set.  Note that if a
  * tool is used to set properties, this is the code that the tool would use.
  * <PRE>{@code

src/java.sql.rowset/share/classes/javax/sql/rowset/CachedRowSet.java

@@ -46,7 +46,7 @@ import javax.sql.rowset.spi.*;
  * A <code>CachedRowSet</code> object is a container for rows of data
  * that caches its rows in memory, which makes it possible to operate without always being
  * connected to its data source. Further, it is a
- * JavaBeans&trade; component and is scrollable,
+ * JavaBeans component and is scrollable,
  * updatable, and serializable. A <code>CachedRowSet</code> object typically
  * contains rows from a result set, but it can also contain rows from any file
  * with a tabular format, such as a spread sheet.  The reference implementation
@@ -410,7 +410,7 @@ import javax.sql.rowset.spi.*;
  * NOTE:  In order to use a <code>DataSource</code> object for making a
  * connection, the <code>DataSource</code> object must have been registered
  * with a naming service that uses the Java Naming and Directory
- * Interface&trade; (JNDI) API.  This registration
+ * Interface (JNDI) API.  This registration
  * is usually done by a person acting in the capacity of a system
  * administrator.
  * <P>

src/java.sql.rowset/share/classes/javax/sql/rowset/FilteredRowSet.java

@@ -51,7 +51,7 @@ import java.math.*;
  * <p>
  * A JDBC <code>FilteredRowSet</code> standard implementation implements the
  * <code>RowSet</code> interfaces and extends the
- * <code>CachedRowSet</code>&trade; class. The
+ * <code>CachedRowSet</code> class. The
  * <code>CachedRowSet</code> class provides a set of protected cursor manipulation
  * methods, which a <code>FilteredRowSet</code> implementation can override
  * to supply filtering support.

src/java.sql.rowset/share/classes/javax/sql/rowset/JdbcRowSet.java

@@ -38,7 +38,7 @@ import java.io.*;
  *
  * <h2>1.0 Overview</h2>
  * A wrapper around a <code>ResultSet</code> object that makes it possible
- * to use the result set as a JavaBeans&trade;
+ * to use the result set as a JavaBeans
  * component.  Thus, a <code>JdbcRowSet</code> object can be one of the Beans that
  * a tool makes available for composing an application.  Because
  * a <code>JdbcRowSet</code> is a connected rowset, that is, it continually
@@ -113,7 +113,7 @@ import java.io.*;
  * <P>
  * The implementation of the <code>RowSet</code> method <code>execute</code> in the
  * <code>JdbcRowSet</code> reference implementation differs from that in the
- * <code>CachedRowSet</code>&trade;
+ * <code>CachedRowSet</code>
  * reference implementation to account for the different
  * requirements of connected and disconnected <code>RowSet</code> objects.
  *

src/java.sql.rowset/share/classes/javax/sql/rowset/Joinable.java

@@ -138,7 +138,7 @@ public interface Joinable {
      * object. A <code>JoinRowSet</code> object can now add this <code>RowSet</code>
      * object based on the match column.
      * <p>
-     * Sub-interfaces such as the <code>CachedRowSet</code>&trade;
+     * Sub-interfaces such as the <code>CachedRowSet</code>
      * interface define the method <code>CachedRowSet.setKeyColumns</code>, which allows
      * primary key semantics to be enforced on specific columns.
      * Implementations of the <code>setMatchColumn(int columnIdx)</code> method

src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetWarning.java

@@ -35,7 +35,7 @@ import java.sql.SQLException;
  * This class complements the <code>SQLWarning</code> class.
  * <P>
  * Rowset warnings may be retrieved from <code>JdbcRowSet</code>,
- * <code>CachedRowSet</code>&trade;,
+ * <code>CachedRowSet</code>,
  * <code>WebRowSet</code>, <code>FilteredRowSet</code>, or <code>JoinRowSet</code>
  * implementations. To retrieve the first warning reported on any
  * <code>RowSet</code>

src/java.sql.rowset/share/classes/javax/sql/rowset/WebRowSet.java

@@ -89,7 +89,7 @@ import org.xml.sax.*;
  * makes it possible to describe them in XML. The
  * metadata describing the various standard JavaBeans properties as defined
  * in the RowSet interface plus the standard properties defined in
- * the {@code CachedRowSet}™ interface
+ * the {@code CachedRowSet} interface
  * provide key details that describe WebRowSet
  * properties. Outputting the WebRowSet object to XML using the standard
  * {@code writeXml} methods describes the internal properties as follows:

src/java.sql.rowset/share/classes/javax/sql/rowset/package-info.java

@@ -56,7 +56,7 @@
  * <ul>
  * <li><a href="JdbcRowSet.html"><b>{@code JdbcRowSet}</b></a> - A wrapper around
  * a {@code ResultSet} object that makes it possible to use the result set as a
- * JavaBeans&trade; component. Thus,
+ * JavaBeans component. Thus,
  * a {@code JdbcRowSet} object can be a Bean that any tool
  * makes available for assembling an application as part of a component based
  * architecture. A {@code JdbcRowSet} object is a connected {@code RowSet}
@@ -67,8 +67,8 @@
  * data structure as defined in the JDBC 3.0 specification.
  *
  * <li><a href="CachedRowSet.html">
- * <b>{@code CachedRowSet}&trade;</b></a>
- *  - A {@code CachedRowSet} object is a JavaBeans&trade;
+ * <b>{@code CachedRowSet}</b></a>
+ *  - A {@code CachedRowSet} object is a JavaBeans
  * component that is scrollable, updatable, serializable, and generally disconnected from
  * the source of its data. A {@code CachedRowSet} object
  * typically contains rows from a result set, but it can also contain rows from any