# HG changeset patch # User Andrew John Hughes # Date 1279730345 -3600 # Node ID 3ac8e6470d4f2524af37339c15863b1933696e49 # Parent 5ff85a33bb117182d8c5537a9b6ac1e6969ee4b8 Backport upstream patches to fix warnings in documentation generation. 2010-07-21 Andrew John Hughes Backport documentation patches to avoid documentation errors. * .hgignore: Remove broken openjdk regexp matching. * Makefile.am: Add new patches. * patches/openjdk/4891262-docs-accessibility.patch, * patches/openjdk/6737212-docs-sql.patch, * patches/openjdk/6875861-docs-properties.patch, * patches/openjdk/6909563-docs-rmi.patch, * patches/openjdk/6917485-docs-corba.patch, * patches/openjdk/6921068-docs-specdefault.patch: Fix warnings in producing documentation. diff -r 5ff85a33bb11 -r 3ac8e6470d4f .hgignore --- a/.hgignore Wed Jul 21 09:30:05 2010 +0100 +++ b/.hgignore Wed Jul 21 17:39:05 2010 +0100 @@ -466,6 +466,3 @@ pulse-java.jar hotspot.tar.gz ports/hotspot/src/cpu/zero/vm/bytecodes_arm.s - -syntax:regexp -openjdk diff -r 5ff85a33bb11 -r 3ac8e6470d4f ChangeLog --- a/ChangeLog Wed Jul 21 09:30:05 2010 +0100 +++ b/ChangeLog Wed Jul 21 17:39:05 2010 +0100 @@ -1,3 +1,17 @@ +2010-07-21 Andrew John Hughes + + Backport documentation patches to avoid documentation + errors. + * .hgignore: Remove broken openjdk regexp matching. + * Makefile.am: Add new patches. + * patches/openjdk/4891262-docs-accessibility.patch, + * patches/openjdk/6737212-docs-sql.patch, + * patches/openjdk/6875861-docs-properties.patch, + * patches/openjdk/6909563-docs-rmi.patch, + * patches/openjdk/6917485-docs-corba.patch, + * patches/openjdk/6921068-docs-specdefault.patch: + Fix warnings in producing documentation. + 2010-07-21 Andrew John Hughes * configure.ac: diff -r 5ff85a33bb11 -r 3ac8e6470d4f Makefile.am --- a/Makefile.am Wed Jul 21 09:30:05 2010 +0100 +++ b/Makefile.am Wed Jul 21 17:39:05 2010 +0100 @@ -670,7 +670,13 @@ patches/hotspot/$(HSBUILD)/icedtea-6791168.patch \ patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \ patches/icedtea-use-system-tzdata.patch \ - patches/openjdk/6678385.patch + patches/openjdk/6678385.patch \ + patches/openjdk/4891262-docs-accessibility.patch \ + patches/openjdk/6737212-docs-sql.patch \ + patches/openjdk/6875861-docs-properties.patch \ + patches/openjdk/6909563-docs-rmi.patch \ + patches/openjdk/6917485-docs-corba.patch \ + patches/openjdk/6921068-docs-specdefault.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 5ff85a33bb11 -r 3ac8e6470d4f patches/openjdk/4891262-docs-accessibility.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/4891262-docs-accessibility.patch Wed Jul 21 17:39:05 2010 +0100 @@ -0,0 +1,93 @@ +# HG changeset patch +# User darcy +# Date 1260480487 28800 +# Node ID bd2e4488d6734793ded74d59e17332fa7f6bba34 +# Parent f55e0d8667cb2dd0da6388789c37522ff4ddd9e4 +4891262: API spec, javax/accessibility: few invalid javadoc tags +Reviewed-by: jjg + +diff -r f55e0d8667cb -r bd2e4488d673 src/share/classes/javax/accessibility/AccessibleContext.java +--- openjdk.orig/jdk/src/share/classes/javax/accessibility/AccessibleContext.java Fri Dec 11 15:27:08 2009 +0000 ++++ openjdk/jdk/src/share/classes/javax/accessibility/AccessibleContext.java Thu Dec 10 13:28:07 2009 -0800 +@@ -296,7 +296,7 @@ + * + * @see #getAccessibleText + * @see #addPropertyChangeListener +- * @see #AccessibleText.AccessibleTextSequence ++ * @see AccessibleTextSequence + */ + public static final String ACCESSIBLE_TEXT_PROPERTY + = "AccessibleText"; +@@ -311,7 +311,7 @@ + * + * @see #getAccessibleText + * @see #addPropertyChangeListener +- * @see #AccessibleText.AccessibleTextSequence ++ * @see AccessibleTextSequence + * + * @since 1.5 + */ +@@ -334,7 +334,7 @@ + * + * @see #getAccessibleText + * @see #addPropertyChangeListener +- * @see #AccessibleText.AccessibleAttributeSequence ++ * @see AccessibleAttributeSequence + * + * @since 1.5 + */ +diff -r f55e0d8667cb -r bd2e4488d673 src/share/classes/javax/accessibility/AccessibleExtendedText.java +--- openjdk.orig/jdk/src/share/classes/javax/accessibility/AccessibleExtendedText.java Fri Dec 11 15:27:08 2009 +0000 ++++ openjdk/jdk/src/share/classes/javax/accessibility/AccessibleExtendedText.java Thu Dec 10 13:28:07 2009 -0800 +@@ -45,7 +45,6 @@ + * @see Accessible#getAccessibleContext + * @see AccessibleContext + * @see AccessibleContext#getAccessibleText +- * @see AccessibleText.AccessibleTextChunk + * + * @author Peter Korn + * @author Lynn Monsanto +diff -r f55e0d8667cb -r bd2e4488d673 src/share/classes/javax/accessibility/AccessibleKeyBinding.java +--- openjdk.orig/jdk/src/share/classes/javax/accessibility/AccessibleKeyBinding.java Fri Dec 11 15:27:08 2009 +0000 ++++ openjdk/jdk/src/share/classes/javax/accessibility/AccessibleKeyBinding.java Thu Dec 10 13:28:07 2009 -0800 +@@ -32,16 +32,11 @@ + * the standard mechanism for an assistive technology to determine the + * key bindings which exist for this object. + * Any object that has such key bindings should support this +- * interface. Applications can determine if an object supports the +- * AccessibleKeyBinding interface by first obtaining its AccessibleContext +- * (see @link Accessible} and then calling the +- * {@link AccessibleContext#getAccessibleKeyBinding} method. If the return +- * value is not null, the object supports this interface. ++ * interface. + * + * @see Accessible + * @see Accessible#getAccessibleContext + * @see AccessibleContext +- * @see AccessibleContext#getAccessibleKeyBinding + * + * @author Lynn Monsanto + * @since 1.4 +@@ -58,21 +53,7 @@ + /** + * Returns a key binding for this object. The value returned is an + * java.lang.Object which must be cast to appropriate type depending +- * on the underlying implementation of the key. For example, if the +- * Object returned is a javax.swing.KeyStroke, the user of this +- * method should do the following: +- * +- * Component c = +- * AccessibleContext ac = c.getAccessibleContext(); +- * AccessibleKeyBinding akb = ac.getAccessibleKeyBinding(); +- * for (int i = 0; i < akb.getAccessibleKeyBindingCount(); i++) { +- * Object o = akb.getAccessibleKeyBinding(i); +- * if (o instanceof javax.swing.KeyStroke) { +- * javax.swing.KeyStroke keyStroke = (javax.swing.KeyStroke)o; +- * +- * } +- * } +- * ++ * on the underlying implementation of the key. + * + * @param i zero-based index of the key bindings + * @return a javax.lang.Object which specifies the key binding diff -r 5ff85a33bb11 -r 3ac8e6470d4f patches/openjdk/6737212-docs-sql.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6737212-docs-sql.patch Wed Jul 21 17:39:05 2010 +0100 @@ -0,0 +1,266 @@ +# HG changeset patch +# User lancea +# Date 1252541722 14400 +# Node ID e321afbdc36669c231cd20cb2415b886c4e795e9 +# Parent 08bb2ce6b1ab084e54f857268b47b4547a001282 +6737212: Fixed javadoc warning messages in RowSet classes +Reviewed-by: darcy + +diff -r 08bb2ce6b1ab -r e321afbdc366 src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java +--- openjdk.orig/jdk/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java Thu Feb 26 18:51:57 2009 -0800 ++++ openjdk/jdk/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java Wed Sep 09 20:15:22 2009 -0400 +@@ -133,7 +133,7 @@ + * This method returns an enumerated handle of the keys + * which correspond to values translated to various locales. + * +- * @returns an enumerated keys which have messages tranlated to ++ * @return an enumeration of keys which have messages tranlated to + * corresponding locales. + */ + public Enumeration getKeys() { +@@ -146,7 +146,7 @@ + * returns the corresponding value reading it + * from the Resource Bundle loaded earlier. + * +- * @returns value in locale specific language ++ * @return value in locale specific language + * according to the key passed. + */ + public Object handleGetObject(String key) { +diff -r 08bb2ce6b1ab -r e321afbdc366 src/share/classes/com/sun/rowset/JoinRowSetImpl.java +--- openjdk.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java Thu Feb 26 18:51:57 2009 -0800 ++++ openjdk/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java Wed Sep 09 20:15:22 2009 -0400 +@@ -3737,7 +3737,6 @@ + * Returns a result set containing the original value of the current + * row only. + * +- * @return the original result set of the row + * @throws SQLException if there is no current row + * @see #setOriginalRow + */ +diff -r 08bb2ce6b1ab -r e321afbdc366 src/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java +--- openjdk.orig/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java Thu Feb 26 18:51:57 2009 -0800 ++++ openjdk/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java Wed Sep 09 20:15:22 2009 -0400 +@@ -46,6 +46,17 @@ + */ + public class WebRowSetXmlReader implements XmlReader, Serializable { + ++ ++ private JdbcRowSetResourceBundle resBundle; ++ ++ public WebRowSetXmlReader(){ ++ try { ++ resBundle = JdbcRowSetResourceBundle.getJdbcRowSetResourceBundle(); ++ } catch(IOException ioe) { ++ throw new RuntimeException(ioe); ++ } ++ } ++ + /** + * Parses the given WebRowSet object, getting its input from + * the given java.io.Reader object. The parser will send +@@ -69,17 +80,6 @@ + * reader for the given rowset + * @see XmlReaderContentHandler + */ +- +- private JdbcRowSetResourceBundle resBundle; +- +- public WebRowSetXmlReader(){ +- try { +- resBundle = JdbcRowSetResourceBundle.getJdbcRowSetResourceBundle(); +- } catch(IOException ioe) { +- throw new RuntimeException(ioe); +- } +- } +- + public void readXML(WebRowSet caller, java.io.Reader reader) throws SQLException { + try { + // Crimson Parser(as in J2SE 1.4.1 is NOT able to handle +diff -r 08bb2ce6b1ab -r e321afbdc366 src/share/classes/javax/sql/rowset/BaseRowSet.java +--- openjdk.orig/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java Thu Feb 26 18:51:57 2009 -0800 ++++ openjdk/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java Wed Sep 09 20:15:22 2009 -0400 +@@ -168,8 +168,8 @@ + * The majority of methods for setting placeholder parameters take two parameters, + * with the first parameter + * indicating which placeholder parameter is to be set, and the second parameter +- * giving the value to be set. Methods such as getInt, +- * getString, getBoolean, and getLong fall into ++ * giving the value to be set. Methods such as setInt, ++ * setString, setBoolean, and setLong fall into + * this category. After these methods have been called, a call to the method + * getParams will return an array with the values that have been set. Each + * element in the array is an Object instance representing the +@@ -3259,9 +3259,9 @@ + * @param x the parameter value + * @exception SQLException if a database access error occurs or + * this method is called on a closed CallableStatement +- * @see #getBoolean + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method ++ * @see #getParams + * @since 1.4 + */ + public void setBoolean(String parameterName, boolean x) throws SQLException{ +@@ -3281,7 +3281,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getByte ++ * @see #getParams + * @since 1.4 + */ + public void setByte(String parameterName, byte x) throws SQLException{ +@@ -3301,7 +3301,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getShort ++ * @see #getParams + * @since 1.4 + */ + public void setShort(String parameterName, short x) throws SQLException{ +@@ -3320,7 +3320,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getInt ++ * @see #getParams + * @since 1.4 + */ + public void setInt(String parameterName, int x) throws SQLException{ +@@ -3339,7 +3339,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getLong ++ * @see #getParams + * @since 1.4 + */ + public void setLong(String parameterName, long x) throws SQLException{ +@@ -3358,7 +3358,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getFloat ++ * @see #getParams + * @since 1.4 + */ + public void setFloat(String parameterName, float x) throws SQLException{ +@@ -3377,7 +3377,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getDouble ++ * @see #getParams + * @since 1.4 + */ + public void setDouble(String parameterName, double x) throws SQLException{ +@@ -3398,7 +3398,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getBigDecimal ++ * @see #getParams + * @since 1.4 + */ + public void setBigDecimal(String parameterName, BigDecimal x) throws SQLException{ +@@ -3421,7 +3421,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getString ++ * @see #getParams + * @since 1.4 + */ + public void setString(String parameterName, String x) throws SQLException{ +@@ -3443,7 +3443,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getBytes ++ * @see #getParams + * @since 1.4 + */ + public void setBytes(String parameterName, byte x[]) throws SQLException{ +@@ -3464,7 +3464,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getTimestamp ++ * @see #getParams + * @since 1.4 + */ + public void setTimestamp(String parameterName, java.sql.Timestamp x) +@@ -3712,7 +3712,7 @@ + * or STRUCT data type and the JDBC driver does not support + * this data type + * @see Types +- * @see #getObject ++ * @see #getParams + * @since 1.4 + */ + public void setObject(String parameterName, Object x, int targetSqlType, int scale) +@@ -3740,7 +3740,7 @@ + * REF, ROWID, SQLXML + * or STRUCT data type and the JDBC driver does not support + * this data type +- * @see #getObject ++ * @see #getParams + * @since 1.4 + */ + public void setObject(String parameterName, Object x, int targetSqlType) +@@ -3782,7 +3782,7 @@ + * Object parameter is ambiguous + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getObject ++ * @see #getParams + * @since 1.4 + */ + public void setObject(String parameterName, Object x) throws SQLException{ +@@ -4064,7 +4064,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getDate ++ * @see #getParams + * @since 1.4 + */ + public void setDate(String parameterName, java.sql.Date x) +@@ -4091,7 +4091,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getDate ++ * @see #getParams + * @since 1.4 + */ + public void setDate(String parameterName, java.sql.Date x, Calendar cal) +@@ -4111,7 +4111,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getTime ++ * @see #getParams + * @since 1.4 + */ + public void setTime(String parameterName, java.sql.Time x) +@@ -4138,7 +4138,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getTime ++ * @see #getParams + * @since 1.4 + */ + public void setTime(String parameterName, java.sql.Time x, Calendar cal) +@@ -4165,7 +4165,7 @@ + * this method is called on a closed CallableStatement + * @exception SQLFeatureNotSupportedException if the JDBC driver does not support + * this method +- * @see #getTimestamp ++ * @see #getParams + * @since 1.4 + */ + public void setTimestamp(String parameterName, java.sql.Timestamp x, Calendar cal) diff -r 5ff85a33bb11 -r 3ac8e6470d4f patches/openjdk/6875861-docs-properties.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6875861-docs-properties.patch Wed Jul 21 17:39:05 2010 +0100 @@ -0,0 +1,27 @@ +# HG changeset patch +# User darcy +# Date 1251251906 25200 +# Node ID f2172f732eb3b84f62b0164514eb59a2a5830210 +# Parent 88557649e47f984d0412243232486534004c65af +6875861: javadoc build warning on java.util.Properites from unconventional @see ordering +Reviewed-by: martin + +diff -r 88557649e47f -r f2172f732eb3 src/share/classes/java/util/Properties.java +--- openjdk.orig/jdk/src/share/classes/java/util/Properties.java Mon Dec 21 18:16:23 2009 +0000 ++++ openjdk/jdk/src/share/classes/java/util/Properties.java Tue Aug 25 18:58:26 2009 -0700 +@@ -101,12 +101,12 @@ + * <!ATTLIST entry key CDATA #REQUIRED> + * + * ++ *

This class is thread-safe: multiple threads can share a single ++ * Properties object without the need for external synchronization. ++ * + * @see native2ascii tool for Solaris + * @see native2ascii tool for Windows + * +- *

This class is thread-safe: multiple threads can share a single +- * Properties object without the need for external synchronization. +- * + * @author Arthur van Hoff + * @author Michael McCloskey + * @author Xueming Shen diff -r 5ff85a33bb11 -r 3ac8e6470d4f patches/openjdk/6909563-docs-rmi.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6909563-docs-rmi.patch Wed Jul 21 17:39:05 2010 +0100 @@ -0,0 +1,70 @@ +# HG changeset patch +# User darcy +# Date 1261419383 0 +# Node ID 88557649e47f984d0412243232486534004c65af +# Parent e321afbdc36669c231cd20cb2415b886c4e795e9 +6909563: Javadoc build warnings in rmi, security, management +Reviewed-by: mchung, mullan + +diff -r e321afbdc366 -r 88557649e47f src/share/classes/java/rmi/activation/Activatable.java +--- openjdk.orig/jdk/src/share/classes/java/rmi/activation/Activatable.java Wed Sep 09 20:15:22 2009 -0400 ++++ openjdk/jdk/src/share/classes/java/rmi/activation/Activatable.java Mon Dec 21 18:16:23 2009 +0000 +@@ -73,7 +73,7 @@ + * can be handled properly. + * + *

This method invokes the {@link +- * exportObject(Remote,String,MarshalledObject,boolean,port) ++ * #exportObject(Remote,String,MarshalledObject,boolean,int) + * exportObject} method with this object, and the specified location, + * data, restart mode, and port. Subsequent calls to {@link #getID} + * will return the activation identifier returned from the call to +@@ -120,7 +120,7 @@ + * can be handled properly. + * + *

This method invokes the {@link +- * exportObject(Remote,String,MarshalledObject,boolean,port,RMIClientSocketFactory,RMIServerSocketFactory) ++ * #exportObject(Remote,String,MarshalledObject,boolean,int,RMIClientSocketFactory,RMIServerSocketFactory) + * exportObject} method with this object, and the specified location, + * data, restart mode, port, and client and server socket factories. + * Subsequent calls to {@link #getID} will return the activation +@@ -312,7 +312,7 @@ + * separately, so that exceptions can be handled properly. + * + *

This method invokes the {@link +- * exportObject(Remote,String,MarshalledObject,boolean,port,RMIClientSocketFactory,RMIServerSocketFactory) ++ * #exportObject(Remote,String,MarshalledObject,boolean,int,RMIClientSocketFactory,RMIServerSocketFactory) + * exportObject} method with the specified object, location, data, + * restart mode, and port, and null for both client and + * server socket factories, and then returns the resulting activation +diff -r e321afbdc366 -r 88557649e47f src/share/classes/java/rmi/registry/LocateRegistry.java +--- openjdk.orig/jdk/src/share/classes/java/rmi/registry/LocateRegistry.java Wed Sep 09 20:15:22 2009 -0400 ++++ openjdk/jdk/src/share/classes/java/rmi/registry/LocateRegistry.java Mon Dec 21 18:16:23 2009 +0000 +@@ -187,7 +187,7 @@ + * host that accepts requests on the specified port. + * + *

The Registry instance is exported as if the static +- * {@link UnicastRemoteObject.exportObject(Remote,int) ++ * {@link UnicastRemoteObject#exportObject(Remote,int) + * UnicastRemoteObject.exportObject} method is invoked, passing the + * Registry instance and the specified port as + * arguments, except that the Registry instance is +@@ -213,7 +213,7 @@ + * + *

The Registry instance is exported as if + * the static {@link +- * UnicastRemoteObject.exportObject(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory) ++ * UnicastRemoteObject#exportObject(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory) + * UnicastRemoteObject.exportObject} method is invoked, passing the + * Registry instance, the specified port, the + * specified RMIClientSocketFactory, and the specified +diff -r e321afbdc366 -r 88557649e47f src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java +--- openjdk.orig/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Wed Sep 09 20:15:22 2009 -0400 ++++ openjdk/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Mon Dec 21 18:16:23 2009 +0000 +@@ -138,7 +138,6 @@ + * instance + * @throws Throwable the exception to throw from the method invocation + * on the proxy instance +- * @see + **/ + public Object invoke(Object proxy, Method method, Object[] args) + throws Throwable diff -r 5ff85a33bb11 -r 3ac8e6470d4f patches/openjdk/6917485-docs-corba.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6917485-docs-corba.patch Wed Jul 21 17:39:05 2010 +0100 @@ -0,0 +1,131 @@ +# HG changeset patch +# User andrew +# Date 1263603844 0 +# Node ID 05436b84e93a16d660aca42b9b5cd0d724ab9121 +# Parent aa446c0200fdf2c2167dc0476f5ad02570f5257e +6917485: Corba doc warnings +Summary: Fix warnings generated by javadoc +Reviewed-by: darcy + +diff -r aa446c0200fd -r 05436b84e93a src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java +--- openjdk.orig/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java Sun Oct 11 11:59:07 2009 +0200 ++++ openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java Sat Jan 16 01:04:04 2010 +0000 +@@ -123,7 +123,7 @@ + + /** + * Coerces a number to the target type of this expression. +- * @parm number The number to coerce. ++ * @param obj The number to coerce. + * @return the value of number coerced to the (target) type of + * this expression. + **/ +@@ -142,7 +142,7 @@ + /** + * Coerces an integral value (BigInteger) to its corresponding unsigned + * representation, if the target type of this expression is unsigned. +- * @parm b The BigInteger to be coerced. ++ * @param b The BigInteger to be coerced. + * @return the value of an integral type coerced to its corresponding + * unsigned integral type, if the target type of this expression is + * unsigned. +@@ -170,7 +170,7 @@ + /** + * Coerces an integral value (BigInteger) to its corresponding signed + * representation, if the target type of this expression is signed. +- * @parm b The BigInteger to be coerced. ++ * @param b The BigInteger to be coerced. + * @return the value of an integral type coerced to its corresponding + * signed integral type, if the target type of this expression is + * signed. +diff -r aa446c0200fd -r 05436b84e93a src/share/classes/javax/rmi/PortableRemoteObject.java +--- openjdk.orig/corba/src/share/classes/javax/rmi/PortableRemoteObject.java Sun Oct 11 11:59:07 2009 +0200 ++++ openjdk/corba/src/share/classes/javax/rmi/PortableRemoteObject.java Sat Jan 16 01:04:04 2010 +0000 +@@ -161,7 +161,7 @@ + * happens implicitly when the object is sent or received as an argument + * on a remote method call, but in some circumstances it is useful to + * perform this action by making an explicit call. See the +- * {@link Stub#connect} method for more information. ++ * {@link javax.rmi.CORBA.Stub#connect} method for more information. + * @param target the object to connect. + * @param source a previously connected object. + * @throws RemoteException if source is not connected +diff -r aa446c0200fd -r 05436b84e93a src/share/classes/org/omg/CORBA/SetOverrideType.java +--- openjdk.orig/corba/src/share/classes/org/omg/CORBA/SetOverrideType.java Sun Oct 11 11:59:07 2009 +0200 ++++ openjdk/corba/src/share/classes/org/omg/CORBA/SetOverrideType.java Sat Jan 16 01:04:04 2010 +0000 +@@ -31,7 +31,7 @@ + * indicate whether policies should replace the + * existing policies of an Object or be added to them. + *

+- * The method {@link omg.org.CORBA.Object._set_policy_override} takes ++ * The method {@link org.omg.CORBA.Object#_set_policy_override} takes + * either SetOverrideType.SET_OVERRIDE or + * SetOverrideType.ADD_OVERRIDE as its second argument. + * The method _set_policy_override +diff -r aa446c0200fd -r 05436b84e93a src/share/classes/org/omg/CORBA/TCKind.java +--- openjdk.orig/corba/src/share/classes/org/omg/CORBA/TCKind.java Sun Oct 11 11:59:07 2009 +0200 ++++ openjdk/corba/src/share/classes/org/omg/CORBA/TCKind.java Sat Jan 16 01:04:04 2010 +0000 +@@ -545,8 +545,6 @@ + * @param _value the int to convert. It must be one of + * the int constants in the class + * TCKind. +- * @return a new TCKind instance whose value +- * field matches the given int + */ + @Deprecated + protected TCKind(int _value){ +diff -r aa446c0200fd -r 05436b84e93a src/share/classes/org/omg/CORBA/UnknownUserException.java +--- openjdk.orig/corba/src/share/classes/org/omg/CORBA/UnknownUserException.java Sun Oct 11 11:59:07 2009 +0200 ++++ openjdk/corba/src/share/classes/org/omg/CORBA/UnknownUserException.java Sat Jan 16 01:04:04 2010 +0000 +@@ -56,7 +56,7 @@ + * Constructs an UnknownUserException object that contains the given + * Any object. + * +- * @ param a an Any object that contains a user exception returned ++ * @param a an Any object that contains a user exception returned + * by the server + */ + public UnknownUserException(Any a) { +diff -r aa446c0200fd -r 05436b84e93a src/share/classes/org/omg/CORBA/portable/ServantObject.java +--- openjdk.orig/corba/src/share/classes/org/omg/CORBA/portable/ServantObject.java Sun Oct 11 11:59:07 2009 +0200 ++++ openjdk/corba/src/share/classes/org/omg/CORBA/portable/ServantObject.java Sat Jan 16 01:04:04 2010 +0000 +@@ -43,7 +43,6 @@ + /** The real servant. The local stub may cast this field to the expected type, and then + * invoke the operation directly. Note, the object may or may not be the actual servant + * instance. +- * @return The real servant + */ + public java.lang.Object servant; + } +diff -r aa446c0200fd -r 05436b84e93a src/share/classes/org/omg/CosNaming/nameservice.idl +--- openjdk.orig/corba/src/share/classes/org/omg/CosNaming/nameservice.idl Sun Oct 11 11:59:07 2009 +0200 ++++ openjdk/corba/src/share/classes/org/omg/CosNaming/nameservice.idl Sat Jan 16 01:04:04 2010 +0000 +@@ -256,7 +256,7 @@ + * + * @param n Name of the object

+ * +- * @parm obj The Object to rebind with the given name

++ * @param obj The Object to rebind with the given name

+ * + * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.

+ * +diff -r aa446c0200fd -r 05436b84e93a src/share/classes/org/omg/PortableInterceptor/Interceptors.idl +--- openjdk.orig/corba/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl Sun Oct 11 11:59:07 2009 +0200 ++++ openjdk/corba/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl Sat Jan 16 01:04:04 2010 +0000 +@@ -1730,7 +1730,7 @@ + *

+ * Any number of components may exist with the same component ID. + * +- * @param a_component The IOP.TaggedComponent to add. ++ * @param tagged_component The IOP.TaggedComponent to add. + */ + void add_ior_component + (in IOP::TaggedComponent tagged_component); +@@ -1744,7 +1744,7 @@ + *

+ * Any number of components may exist with the same component ID. + * +- * @param a_component The IOP.TaggedComponent to add. ++ * @param tagged_component The IOP.TaggedComponent to add. + * @param profile_id The profile id of the profile to + * which this component will be added. + * @exception BAD_PARAM thrown, with a standard minor code of 29, if the diff -r 5ff85a33bb11 -r 3ac8e6470d4f patches/openjdk/6921068-docs-specdefault.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6921068-docs-specdefault.patch Wed Jul 21 17:39:05 2010 +0100 @@ -0,0 +1,21 @@ +# HG changeset patch +# User andrew +# Date 1264712473 0 +# Node ID ffceebe8e01f99d4dab1f5ad3de3abb01dcd3680 +# Parent 879703b75a4a9dcaffee24b741306d5e03a76fb7 +6921068: Remove javadoc builds warnings from specdefault tag +Summary: Ignore specdefault tag to avoid javadoc warnings +Reviewed-by: darcy, ohair + +diff -r 879703b75a4a -r ffceebe8e01f make/docs/Makefile +--- openjdk.orig/jdk/make/docs/Makefile Wed Jan 27 17:36:22 2010 +0100 ++++ openjdk/jdk/make/docs/Makefile Thu Jan 28 21:01:13 2010 +0000 +@@ -91,7 +91,7 @@ + THIS_YEAR := $(shell $(DATE) | $(SED) -e 's/ / /g' | $(CUT) -d' ' -f6) + TRADEMARK = &\#x2122; + +-IGNORED_TAGS = beaninfo revised since.unbundled spec Note ToDo ++IGNORED_TAGS = beaninfo revised since.unbundled spec specdefault Note ToDo + + JLS3_URL = http://java.sun.com/docs/books/jls/ + JLS3_CITE = \