Mercurial > hg > jdk9-shenandoah > corba
changeset 575:c6a001011f0a
Merge
author | lana |
---|---|
date | Tue, 01 Apr 2014 17:28:35 -0700 |
parents | 6c8563600a71 (current diff) 4b013eda1219 (diff) |
children | 2c5553d912c8 |
files | |
diffstat | 24 files changed, 49 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/org/omg/CORBA/AnySeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/AnySeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/BooleanSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/BooleanSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/CharSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/CharSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/DoubleSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/DoubleSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/LongLongSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/LongLongSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/LongSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/LongSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/OctetSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/OctetSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/ShortSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/ShortSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/StringValueHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/StringValueHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -44,11 +44,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/ULongLongSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/ULongLongSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/ULongSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/ULongSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/UShortSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/UShortSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/WCharSeqHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/WCharSeqHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -38,11 +38,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/WStringValueHelper.java Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/WStringValueHelper.java Tue Apr 01 17:28:35 2014 -0700 @@ -48,11 +48,11 @@ * OMG specifications : * <ul> * <li> ORB core as defined by CORBA 2.3.1 -* (<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) +* (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>) * </li> * * <li> IDL/Java Language Mapping as defined in -* <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> +* <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a> * </li> * </ul> */
--- a/src/share/classes/org/omg/CORBA/doc-files/compliance.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/doc-files/compliance.html Tue Apr 01 17:28:35 2014 -0700 @@ -18,26 +18,26 @@ <ul> <li> CORBA 2.3.1 (<a -href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)</li> +href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)</li> <li> IDL to Java language mapping (<a -href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>)</li> +href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>)</li> <li>Revised IDL to Java language mapping (<a -href="http://cgi.omg.org/cgi-bin/doc?ptc/00-11-03">ptc/00-11-03</a>)</li> +href="http://www.omg.org/cgi-bin/doc?ptc/00-11-03">ptc/00-11-03</a>)</li> <li> Java to IDL language mapping (<a -href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-06">ptc/00-01-06</a>)</li> +href="http://www.omg.org/cgi-bin/doc?ptc/00-01-06">ptc/00-01-06</a>)</li> <li> Interoperable Naming Service (<a -href="http://cgi.omg.org/cgi-bin/doc?ptc/00-08-07">ptc/00-08-07</a>)</li> +href="http://www.omg.org/cgi-bin/doc?ptc/00-08-07">ptc/00-08-07</a>)</li> <li> Portable Interceptors (<a -href="http://cgi.omg.org/cgi-bin/doc?ptc/2001-03-04">ptc/2001-03-04</a>)</li> +href="http://www.omg.org/cgi-bin/doc?ptc/2001-03-04">ptc/2001-03-04</a>)</li> </ul> These are the only specifications referenced by this document.
--- a/src/share/classes/org/omg/CORBA/doc-files/generatedfiles.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/doc-files/generatedfiles.html Tue Apr 01 17:28:35 2014 -0700 @@ -8,7 +8,7 @@ <H1>IDL-to-Java Generated Files</H1> -<P>The files that are generated by the IDL-to-Java compiler, in accordance with the <em><a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08">IDL-to-Java Language Mapping Specification</a></em>, which is implemented in Java<sup><font size="-2">TM</font></sup> SE 6 according the <a href="compliance.html">compliance</a> document. +<P>The files that are generated by the IDL-to-Java compiler, in accordance with the <em><a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">IDL-to-Java Language Mapping Specification</a></em>, which is implemented in Java<sup><font size="-2">TM</font></sup> SE 6 according the <a href="compliance.html">compliance</a> document. <P>In general IDL names and identifiers are mapped to Java names and identifiers with no change. Because of the nature of the Java language, a single IDL construct may be mapped to several (differently named) Java constructs. The additional names are constructed by appending a descriptive suffix. For example, the IDL interface <tt>foo</tt> is mapped to the Java interfaces <tt>foo</tt> and <tt>fooOperations</tt>, and additional Java classes <tt>fooHelper</tt>, <tt>fooHolder</tt>, <tt>fooPOA</tt>, and optionally <tt>fooPOATie</tt>.
--- a/src/share/classes/org/omg/CORBA/package.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CORBA/package.html Tue Apr 01 17:28:35 2014 -0700 @@ -344,7 +344,7 @@ </PRE> <P>For more information on Holder classes, see Chapter 1.4, <em>Mapping for -Basic Types</em> in the <a href="http://cgi.omg.org/cgi-bin/doc?ptc/00-01-08"> +Basic Types</em> in the <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08"> <em>OMG IDL to Java Language Mapping</em></a>. The Holder classes defined in the package <TT>org.omg.CORBA</TT> are: <PRE>
--- a/src/share/classes/org/omg/CosNaming/package.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/CosNaming/package.html Tue Apr 01 17:28:35 2014 -0700 @@ -331,7 +331,7 @@ <ul> <li>Interoperable Naming Service (<a -href="http://cgi.omg.org/cgi-bin/doc?ptc/00-08-07">ptc/00-08-07</a>) +href="http://www.omg.org/cgi-bin/doc?ptc/00-08-07">ptc/00-08-07</a>) </ul> <h2>Related Documentation</h2>
--- a/src/share/classes/org/omg/Dynamic/package.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/Dynamic/package.html Tue Apr 01 17:28:35 2014 -0700 @@ -33,8 +33,8 @@ <body bgcolor="white"> <P>This package contains the <tt>Dynamic</tt> module specified in the OMG Portable Interceptor specification, -<a href="http://cgi.omg.org/cgi-bin/doc?ptc/2000-08-06"> -http://cgi.omg.org/cgi-bin/doc?ptc/2000-08-06</a>, section 21.9. Please +<a href="http://www.omg.org/cgi-bin/doc?ptc/2000-08-06"> +ptc/2000-08-06</a>, section 21.9. Please refer to that OMG specification for further details.
--- a/src/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html Tue Apr 01 17:28:35 2014 -0700 @@ -38,8 +38,8 @@ <tt>DynamicAny</tt> module specified in the OMG <em>The Common Object Request Broker: Architecture and Specification</em>, -<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07"> -http://cgi.omg.org/cgi-bin/doc?formal/99-10-07</a>, section 9.2.2. Please +<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07"> +formal/99-10-07</a>, section 9.2.2. Please refer to that OMG specification for further details. <H3>Package Specification</H3>
--- a/src/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html Tue Apr 01 17:28:35 2014 -0700 @@ -34,8 +34,8 @@ interface of the <tt>DynamicAny</tt> module specified in the OMG <em>The Common Object Request Broker: Architecture and Specification</em>, -<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07"> -http://cgi.omg.org/cgi-bin/doc?formal/99-10-07</a>, section 9.2. Please +<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07"> +formal/99-10-07</a>, section 9.2. Please refer to that OMG specification for further details.
--- a/src/share/classes/org/omg/IOP/package.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/IOP/package.html Tue Apr 01 17:28:35 2014 -0700 @@ -33,8 +33,8 @@ <P>This package contains the <TT>IOP</tt> module specified in the OMG document <em>The Common Object Request Broker: Architecture and Specification</em>, -<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07"> -http://cgi.omg.org/cgi-bin/doc?formal/99-10-07</a>, section 13.6. Please +<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07"> +formal/99-10-07</a>, section 13.6. Please refer to that OMG specification for further details. <P>Please note that we do not provide all parts of the <tt>IOP</tt> module from
--- a/src/share/classes/org/omg/Messaging/package.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/Messaging/package.html Tue Apr 01 17:28:35 2014 -0700 @@ -32,8 +32,8 @@ <body bgcolor="white"> <P>This package contains the <tt>Messaging</tt> module specified in the OMG CORBA Messaging specification, -<a href="http://cgi.omg.org/cgi-bin/doc?formal/99-10-07"> -http://cgi.omg.org/cgi-bin/doc?formal/99-10-07</a>. Please refer to that OMG +<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07"> +formal/99-10-07</a>. Please refer to that OMG specification for further details. <P>Please note that we do not provide all parts of the <tt>Messaging</tt> module from
--- a/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html Thu Mar 27 11:38:11 2014 -0700 +++ b/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html Tue Apr 01 17:28:35 2014 -0700 @@ -33,8 +33,8 @@ <P>This package contains the exceptions and typedefs from the <tt>ORBInitInfo</tt> local interface of the <tt>PortableInterceptor</tt> module specified in the OMG Portable Interceptor specification, -<a href="http://cgi.omg.org/cgi-bin/doc?ptc/2000-08-06"> -http://cgi.omg.org/cgi-bin/doc?ptc/2000-08-06</a>, section 21.7.2. Please +<a href="http://www.omg.org/cgi-bin/doc?ptc/2000-08-06"> +ptc/2000-08-06</a>, section 21.7.2. Please refer to that OMG specification for further details.