--- a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java Wed Apr 09 09:19:52 2014 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -25,6 +25,8 @@
package com.sun.corba.se.spi.orb;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.Map ;
import java.util.HashMap ;
import java.util.Properties ;
@@ -97,8 +99,7 @@
import com.sun.corba.se.impl.presentation.rmi.PresentationManagerImpl ;
-import sun.awt.AppContext;
-import sun.corba.SharedSecrets;
+import sun.misc.JavaAWTAccess;
public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
implements Broker, TypeCodeFactory
@@ -170,6 +171,13 @@
// representing LogDomain and ExceptionGroup.
private Map wrapperMap ;
+ static class Holder {
+ static final PresentationManager defaultPresentationManager =
+ setupPresentationManager();
+ }
+
+ private static final Map<Object, PresentationManager> pmContexts = new HashMap<>();
+
private static Map staticWrapperMap = new ConcurrentHashMap();
protected MonitoringManager monitoringManager;
@@ -201,8 +209,9 @@
try {
// First try the configured class name, if any
- Class<?> cls = SharedSecrets.getJavaCorbaAccess().loadClass( className ) ;
- sff = (PresentationManager.StubFactoryFactory)cls.newInstance() ;
+ Class<?> cls =
+ sun.corba.SharedSecrets.getJavaCorbaAccess().loadClass(className);
+ sff = (PresentationManager.StubFactoryFactory)cls.newInstance();
} catch (Exception exc) {
// Use the default. Log the error as a warning.
staticWrapper.errorInSettingDynamicStubFactoryFactory(
@@ -235,13 +244,34 @@
*/
public static PresentationManager getPresentationManager()
{
- AppContext ac = AppContext.getAppContext();
- PresentationManager pm = (PresentationManager) ac.get(PresentationManager.class);
- if (pm == null) {
- pm = setupPresentationManager();
- ac.put(PresentationManager.class, pm);
+ SecurityManager sm = System.getSecurityManager();
+ JavaAWTAccess javaAwtAccess = sun.misc.SharedSecrets.getJavaAWTAccess();
+ if (sm != null && javaAwtAccess != null) {
+ Object appletContext;
+ try {
+ Class<?> clazz = JavaAWTAccess.class;
+ Method method = clazz.getMethod("getAppletContext");
+ appletContext = method.invoke(javaAwtAccess);
+ } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+ InternalError err = new InternalError();
+ err.initCause(e);
+ throw err;
+ }
+
+ if (appletContext != null) {
+ synchronized (pmContexts) {
+ PresentationManager pm = pmContexts.get(appletContext);
+ if (pm == null) {
+ pm = setupPresentationManager();
+ pmContexts.put(appletContext, pm);
+ }
+ return pm;
+ }
+ }
}
- return pm;
+
+ // No security manager or AppletAppContext
+ return Holder.defaultPresentationManager;
}
/** Get the appropriate StubFactoryFactory. This
--- a/corba/src/share/classes/org/omg/CORBA/AnySeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/AnySeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/BooleanSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/BooleanSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/CharSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/CharSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/DoubleSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/DoubleSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/LongLongSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/LongLongSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/LongSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/LongSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/OctetSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/OctetSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/ShortSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/ShortSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/StringValueHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/StringValueHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/ULongLongSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/ULongLongSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/ULongSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/ULongSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/UShortSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/UShortSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/WCharSeqHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/WCharSeqHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/WStringValueHelper.java Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/WStringValueHelper.java Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/doc-files/compliance.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/doc-files/compliance.html Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/doc-files/generatedfiles.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/doc-files/generatedfiles.html Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CORBA/package.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CORBA/package.html Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/CosNaming/package.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/CosNaming/package.html Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/Dynamic/package.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/Dynamic/package.html Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/DynamicAny/DynAnyFactoryPackage/package.html Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/IOP/package.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/IOP/package.html Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/Messaging/package.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/Messaging/package.html Wed Apr 09 09:19:52 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/corba/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html Wed Apr 02 21:59:43 2014 -0700
+++ b/corba/src/share/classes/org/omg/PortableInterceptor/ORBInitInfoPackage/package.html Wed Apr 09 09:19:52 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.