changeset 32874:b563863620ec

Merge
author ddehaven
date Mon, 28 Sep 2015 08:14:42 -0700
parents d445b313f219 8bfe2ea5617d
children eb8e90bef9aa
files hotspot/src/share/vm/classfile/imageDecompressor.cpp hotspot/src/share/vm/classfile/imageDecompressor.hpp hotspot/src/share/vm/classfile/imageFile.cpp hotspot/src/share/vm/classfile/imageFile.hpp hotspot/src/share/vm/utilities/endian.cpp hotspot/src/share/vm/utilities/endian.hpp hotspot/test/runtime/modules/ImageFile/ImageAttributeOffsetsTest.java hotspot/test/runtime/modules/ImageFile/ImageCloseTest.java hotspot/test/runtime/modules/ImageFile/ImageFileHeaderTest.java hotspot/test/runtime/modules/ImageFile/ImageFindAttributesTest.java hotspot/test/runtime/modules/ImageFile/ImageGetAttributesTest.java hotspot/test/runtime/modules/ImageFile/ImageGetDataAddressTest.java hotspot/test/runtime/modules/ImageFile/ImageGetIndexAddressTest.java hotspot/test/runtime/modules/ImageFile/ImageGetStringBytesTest.java hotspot/test/runtime/modules/ImageFile/ImageOpenTest.java hotspot/test/runtime/modules/ImageFile/ImageReadTest.java hotspot/test/runtime/modules/ImageFile/LocationConstants.java jaxws/src/java.xml.ws/share/classes/javax/xml/ws/package.html jdk/src/java.base/share/classes/sun/misc/JavaAWTAccess.java jdk/src/java.base/share/classes/sun/misc/JavaAWTFontAccess.java jdk/src/java.base/share/classes/sun/misc/JavaBeansAccess.java jdk/src/java.base/share/classes/sun/misc/JavaIOAccess.java jdk/src/java.base/share/classes/sun/misc/JavaIOFileDescriptorAccess.java jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java jdk/src/java.base/share/classes/sun/misc/JavaLangRefAccess.java jdk/src/java.base/share/classes/sun/misc/JavaNetAccess.java jdk/src/java.base/share/classes/sun/misc/JavaNetHttpCookieAccess.java jdk/src/java.base/share/classes/sun/misc/JavaNetInetAddressAccess.java jdk/src/java.base/share/classes/sun/misc/JavaNioAccess.java jdk/src/java.base/share/classes/sun/misc/JavaSecurityAccess.java jdk/src/java.base/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java jdk/src/java.base/share/classes/sun/misc/JavaUtilJarAccess.java jdk/src/java.base/share/classes/sun/misc/JavaUtilZipFileAccess.java jdk/src/java.base/share/classes/sun/misc/SharedSecrets.java jdk/src/java.base/share/native/libfdlibm/e_hypot.c jdk/src/java.base/share/native/libfdlibm/w_hypot.c jdk/src/java.desktop/share/classes/java/awt/EventQueue.java jdk/src/java.desktop/share/classes/java/beans/Introspector.java jdk/src/java.desktop/share/classes/javax/swing/TransferHandler.java jdk/src/java.desktop/share/classes/sun/awt/AppContext.java jdk/test/sun/misc/JavaLangAccess/FormatUnsigned.java jdk/test/sun/misc/JavaLangAccess/NewUnsafeString.java nashorn/samples/EvalWithArbitraryThis.java.orig nashorn/test/script/currently-failing/gettersetter.js nashorn/test/script/currently-failing/property_delete.js test/lib/Makefile
diffstat 975 files changed, 25249 insertions(+), 15549 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Sep 27 00:51:27 2015 +0300
+++ b/.hgtags	Mon Sep 28 08:14:42 2015 -0700
@@ -324,3 +324,5 @@
 3966bd3b8167419aa05c6718a4af1cf54b1e3c58 jdk9-b79
 3c9f5bd909ae7187f24622ee4b69f8a5756a9271 jdk9-b80
 2050b3a0aadcb0e024bf798197421d58e54ec8bf jdk9-b81
+6521875cb63e1d0121b30af56ebbc36db078c4c6 jdk9-b82
+f61a63b7d1e52e307abc0bfc751203155d362ec4 jdk9-b83
--- a/.hgtags-top-repo	Sun Sep 27 00:51:27 2015 +0300
+++ b/.hgtags-top-repo	Mon Sep 28 08:14:42 2015 -0700
@@ -324,3 +324,5 @@
 ba08a9f79b9849716bae1f39f71333d47f604012 jdk9-b79
 f7c5ae2933c0b8510a420d1713a955e4ffc7ad0b jdk9-b80
 b8afcf91331d78626a583ec1b63164468d6f4181 jdk9-b81
+42b56d1f418523ecb61a49d7493302c80c8009cc jdk9-b82
+ce5c14d97d95084504c32b9320cb33cce4235588 jdk9-b83
--- a/common/autoconf/basics.m4	Sun Sep 27 00:51:27 2015 +0300
+++ b/common/autoconf/basics.m4	Mon Sep 28 08:14:42 2015 -0700
@@ -445,6 +445,15 @@
   # Save the current directory this script was started from
   CURDIR="$PWD"
 
+  # We might need to rewrite ORIGINAL_PATH, if it includes "#", to quote them
+  # for make. We couldn't do this when we retrieved ORIGINAL_PATH, since SED
+  # was not available at that time.
+  REWRITTEN_PATH=`$ECHO "$ORIGINAL_PATH" | $SED -e 's/#/\\\\#/g'`
+  if test "x$REWRITTEN_PATH" != "x$ORIGINAL_PATH"; then
+    ORIGINAL_PATH="$REWRITTEN_PATH"
+    AC_MSG_NOTICE([Rewriting ORIGINAL_PATH to $REWRITTEN_PATH])
+  fi
+
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
     PATH_SEP=";"
     BASIC_CHECK_PATHS_WINDOWS
@@ -935,6 +944,7 @@
   BASIC_PATH_PROGS(HG, hg)
   BASIC_PATH_PROGS(STAT, stat)
   BASIC_PATH_PROGS(TIME, time)
+  BASIC_PATH_PROGS(PATCH, [gpatch patch])
   # Check if it's GNU time
   IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   if test "x$IS_GNU_TIME" != x; then
--- a/common/autoconf/compare.sh.in	Sun Sep 27 00:51:27 2015 +0300
+++ b/common/autoconf/compare.sh.in	Mon Sep 28 08:14:42 2015 -0700
@@ -29,47 +29,50 @@
 ##########################################################################################
 # Substitutions from autoconf
 
-LEGACY_BUILD_DIR=@OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU_LEGACY@
+export LEGACY_BUILD_DIR=@OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU_LEGACY@
 
-OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
-OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
+export OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
+export OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
 
-AWK="@AWK@"
-CAT="@CAT@"
-CMP="@CMP@"
-CP="@CP@"
-CUT="@CUT@"
-DIFF="@DIFF@"
-DUMPBIN="@FIXPATH@ @DUMPBIN@"
-EXPR="@EXPR@"
-FILE="@FILE@"
-FIND="@FIND@"
-GREP="@GREP@"
-JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
-JIMAGE="@FIXPATH@ @BUILD_OUTPUT@/jdk/bin/jimage"
-LDD="@LDD@"
-LN="@LN@"
-MKDIR="@MKDIR@"
-NAWK="@NAWK@"
-NM="@GNM@"
-OBJDUMP="@OBJDUMP@"
-OTOOL="@OTOOL@"
-PRINTF="@PRINTF@"
-READELF="@READELF@"
-RM="@RM@"
-SED="@SED@"
-SORT="@SORT@"
-STAT="@STAT@"
-STRIP="@POST_STRIP_CMD@"
-TEE="@TEE@"
-UNIQ="@UNIQ@"
-UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
-UNZIP="@UNZIP@"
+export AWK="@AWK@"
+export BASH="@BASH@"
+export CAT="@CAT@"
+export CMP="@CMP@"
+export CP="@CP@"
+export CUT="@CUT@"
+export DIFF="@DIFF@"
+export DUMPBIN="@FIXPATH@ @DUMPBIN@"
+export EXPR="@EXPR@"
+export FILE="@FILE@"
+export FIND="@FIND@"
+export GREP="@GREP@"
+export JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
+export JIMAGE="@FIXPATH@ @BUILD_OUTPUT@/jdk/bin/jimage"
+export LDD="@LDD@"
+export LN="@LN@"
+export MKDIR="@MKDIR@"
+export MV="@MV@"
+export NAWK="@NAWK@"
+export NM="@GNM@"
+export OBJDUMP="@OBJDUMP@"
+export OTOOL="@OTOOL@"
+export PRINTF="@PRINTF@"
+export READELF="@READELF@"
+export RM="@RM@"
+export SED="@SED@"
+export SORT="@SORT@"
+export STAT="@STAT@"
+export STRIP="@POST_STRIP_CMD@"
+export TEE="@TEE@"
+export UNIQ="@UNIQ@"
+export UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
+export UNZIP="@UNZIP@"
 
-SRC_ROOT="@TOPDIR@"
+export SRC_ROOT="@TOPDIR@"
+export OUTPUT_ROOT="@OUTPUT_ROOT@"
 
 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-  PATH="@VS_PATH@"
+  export PATH="@VS_PATH@"
 fi
 
 # Now locate the main script and run it.
@@ -79,4 +82,8 @@
   exit 1
 fi
 
-. "$REAL_COMPARE_SCRIPT" "$@"
+# Rotate logs
+$RM $OUTPUT_ROOT/compare.log.old 2> /dev/null
+$MV $OUTPUT_ROOT/compare.log $OUTPUT_ROOT/compare.log.old 2> /dev/null
+
+$BASH $SRC_ROOT/common/bin/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"
--- a/common/autoconf/generated-configure.sh	Sun Sep 27 00:51:27 2015 +0300
+++ b/common/autoconf/generated-configure.sh	Mon Sep 28 08:14:42 2015 -0700
@@ -841,7 +841,6 @@
 JDK_MAJOR_VERSION
 USER_RELEASE_SUFFIX
 COMPRESS_JARS
-RMICONNECTOR_IIOP
 UNLIMITED_CRYPTO
 CACERTS_FILE
 TEST_IN_BUILD
@@ -860,6 +859,7 @@
 XATTR
 DSYMUTIL
 IS_GNU_TIME
+PATCH
 TIME
 STAT
 HG
@@ -1060,7 +1060,6 @@
 enable_hotspot_test_in_build
 with_cacerts_file
 enable_unlimited_crypto
-enable_rmiconnector_iiop
 with_milestone
 with_update_version
 with_user_release_suffix
@@ -1176,6 +1175,7 @@
 HG
 STAT
 TIME
+PATCH
 DSYMUTIL
 XATTR
 CODESIGN
@@ -1848,9 +1848,6 @@
                           run the Queens test after Hotspot build [disabled]
   --enable-unlimited-crypto
                           Enable unlimited crypto policy [disabled]
-  --enable-rmiconnector-iiop
-                          enable the JMX RMIConnector iiop transport
-                          [disabled]
   --disable-warnings-as-errors
                           do not consider native warnings to be an error
                           [enabled]
@@ -2058,6 +2055,7 @@
   HG          Override default value for HG
   STAT        Override default value for STAT
   TIME        Override default value for TIME
+  PATCH       Override default value for PATCH
   DSYMUTIL    Override default value for DSYMUTIL
   XATTR       Override default value for XATTR
   CODESIGN    Override default value for CODESIGN
@@ -3951,7 +3949,7 @@
 
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, 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
@@ -4364,7 +4362,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1441958217
+DATE_WHEN_GENERATED=1442820958
 
 ###############################################################################
 #
@@ -13846,6 +13844,16 @@
   # Save the current directory this script was started from
   CURDIR="$PWD"
 
+  # We might need to rewrite ORIGINAL_PATH, if it includes "#", to quote them
+  # for make. We couldn't do this when we retrieved ORIGINAL_PATH, since SED
+  # was not available at that time.
+  REWRITTEN_PATH=`$ECHO "$ORIGINAL_PATH" | $SED -e 's/#/\\\\#/g'`
+  if test "x$REWRITTEN_PATH" != "x$ORIGINAL_PATH"; then
+    ORIGINAL_PATH="$REWRITTEN_PATH"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting ORIGINAL_PATH to $REWRITTEN_PATH" >&5
+$as_echo "$as_me: Rewriting ORIGINAL_PATH to $REWRITTEN_PATH" >&6;}
+  fi
+
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
     PATH_SEP=";"
 
@@ -18870,6 +18878,192 @@
   fi
 
 
+
+
+  # Publish this variable in the help.
+
+
+  if test "x$PATCH" = x; then
+    # The variable is not set by user, try to locate tool using the code snippet
+    for ac_prog in gpatch patch
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATCH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATCH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PATCH=$ac_cv_path_PATCH
+if test -n "$PATCH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
+$as_echo "$PATCH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PATCH" && break
+done
+
+  else
+    # The variable is set, but is it from the command line or the environment?
+
+    # Try to remove the string !PATCH! from our list.
+    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!PATCH!/}
+    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
+      # If it failed, the variable was not from the command line. Ignore it,
+      # but warn the user (except for BASH, which is always set by the calling BASH).
+      if test "xPATCH" != xBASH; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of PATCH from the environment. Use command line variables instead." >&5
+$as_echo "$as_me: WARNING: Ignoring value of PATCH from the environment. Use command line variables instead." >&2;}
+      fi
+      # Try to locate tool using the code snippet
+      for ac_prog in gpatch patch
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATCH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATCH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PATCH=$ac_cv_path_PATCH
+if test -n "$PATCH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
+$as_echo "$PATCH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PATCH" && break
+done
+
+    else
+      # If it succeeded, then it was overridden by the user. We will use it
+      # for the tool.
+
+      # First remove it from the list of overridden variables, so we can test
+      # for unknown variables in the end.
+      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
+
+      # Check if the provided tool contains a complete path.
+      tool_specified="$PATCH"
+      tool_basename="${tool_specified##*/}"
+      if test "x$tool_basename" = "x$tool_specified"; then
+        # A command without a complete path is provided, search $PATH.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool PATCH=$tool_basename" >&5
+$as_echo "$as_me: Will search for user supplied tool PATCH=$tool_basename" >&6;}
+        # Extract the first word of "$tool_basename", so it can be a program name with args.
+set dummy $tool_basename; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PATCH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PATCH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PATCH=$ac_cv_path_PATCH
+if test -n "$PATCH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
+$as_echo "$PATCH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test "x$PATCH" = x; then
+          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
+        fi
+      else
+        # Otherwise we believe it is a complete path. Use it as it is.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool PATCH=$tool_specified" >&5
+$as_echo "$as_me: Will use user supplied tool PATCH=$tool_specified" >&6;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PATCH" >&5
+$as_echo_n "checking for PATCH... " >&6; }
+        if test ! -x "$tool_specified"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+          as_fn_error $? "User supplied tool PATCH=$tool_specified does not exist or is not executable" "$LINENO" 5
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
+$as_echo "$tool_specified" >&6; }
+      fi
+    fi
+  fi
+
+
   # Check if it's GNU time
   IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   if test "x$IS_GNU_TIME" != x; then
@@ -20100,22 +20294,6 @@
 
   ###############################################################################
   #
-  # --enable-rmiconnector-iiop
-  #
-  # Check whether --enable-rmiconnector-iiop was given.
-if test "${enable_rmiconnector_iiop+set}" = set; then :
-  enableval=$enable_rmiconnector_iiop;
-fi
-
-  if test "x$enable_rmiconnector_iiop" = "xyes"; then
-    RMICONNECTOR_IIOP=true
-  else
-    RMICONNECTOR_IIOP=false
-  fi
-
-
-  ###############################################################################
-  #
   # Compress jars
   #
   COMPRESS_JARS=false
--- a/common/autoconf/jdk-options.m4	Sun Sep 27 00:51:27 2015 +0300
+++ b/common/autoconf/jdk-options.m4	Mon Sep 28 08:14:42 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, 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
@@ -455,19 +455,6 @@
 
   ###############################################################################
   #
-  # --enable-rmiconnector-iiop
-  #
-  AC_ARG_ENABLE(rmiconnector-iiop, [AS_HELP_STRING([--enable-rmiconnector-iiop],
-      [enable the JMX RMIConnector iiop transport  @<:@disabled@:>@])])
-  if test "x$enable_rmiconnector_iiop" = "xyes"; then
-    RMICONNECTOR_IIOP=true
-  else
-    RMICONNECTOR_IIOP=false
-  fi
-  AC_SUBST(RMICONNECTOR_IIOP)
-
-  ###############################################################################
-  #
   # Compress jars
   #
   COMPRESS_JARS=false
--- a/common/autoconf/spec.gmk.in	Sun Sep 27 00:51:27 2015 +0300
+++ b/common/autoconf/spec.gmk.in	Mon Sep 28 08:14:42 2015 -0700
@@ -36,6 +36,11 @@
 # A self-referential reference to this file.
 SPEC:=@SPEC@
 
+# SPACE is defined in MakeBase.gmk, but it is also used in := rules here for some
+# toolchains, and is needed if MakeBase.gmk is not included before this file.
+X:=
+SPACE:=$(X) $(X)
+
 # What make to use for main processing, after bootstrapping top-level Makefile.
 MAKE := @MAKE@
 
@@ -262,9 +267,6 @@
 # Enable unlimited crypto policy
 UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
 
-# Enable RMIConnector IIOP transport
-RMICONNECTOR_IIOP=@RMICONNECTOR_IIOP@
-
 GCOV_ENABLED=@GCOV_ENABLED@
 
 # Necessary additional compiler flags to compile X11
@@ -498,6 +500,7 @@
 MKDIR:=@MKDIR@
 MV:=@MV@
 NAWK:=@NAWK@
+PATCH:=@PATCH@
 PRINTF:=@PRINTF@
 PWD:=@THEPWDCMD@
 RM:=@RM@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/bin/blessed-modifier-order.sh	Mon Sep 28 08:14:42 2015 -0700
@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Copyright 2015 Google, Inc.  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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+
+usage() {
+  (
+    echo "$0 DIR ..."
+    echo "Modifies in place all the java source files found"
+    echo "in the given directories so that all java language modifiers"
+    echo "are in the canonical order given by Modifier#toString()."
+    echo "Tries to get it right even within javadoc comments,"
+    echo "and even if the list of modifiers spans 2 lines."
+    echo
+    echo "See:"
+    echo "https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Modifier.html#toString-int-"
+    echo
+    echo "Example:"
+    echo "$0 jdk/src/java.base jdk/test/java/{util,io,lang}"
+  ) >&2
+  exit 1
+}
+
+set -eu
+declare -ar dirs=("$@")
+[[ "${#dirs[@]}" > 0 ]] || usage
+for dir in "${dirs[@]}"; do [[ -d "$dir" ]] || usage; done
+
+declare -ar modifiers=(
+  public protected private
+  abstract static final transient
+  volatile synchronized native strictfp
+)
+declare -r SAVE_IFS="$IFS"
+for ((i = 3; i < "${#modifiers[@]}"; i++)); do
+  IFS='|'; x="${modifiers[*]:0:i}" y="${modifiers[*]:i}"; IFS="$SAVE_IFS"
+  if [[ -n "$x" && -n "$y" ]]; then
+    find "${dirs[@]}" -name '*.java' -type f -print0 | \
+      xargs -0 perl -0777 -p -i -e \
+      "do {} while s/^([A-Za-z@* ]*)\b($y)(\s|(?:\s|\n\s+\*)*\s)($x)\b/\1\4\3\2/mg"
+  fi
+done
--- a/common/bin/compare.sh	Sun Sep 27 00:51:27 2015 +0300
+++ b/common/bin/compare.sh	Mon Sep 28 08:14:42 2015 -0700
@@ -88,23 +88,19 @@
         TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
             $GREP '^[<>]' | \
             $SED -e '/[<>] \* from.*\.idl/d' \
-                 -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
+                 -e '/[<>] .*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
                  -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \
                  -e '/\/\/ Generated from input file.*/d' \
                  -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \
                  -e '/\/\/ java GenerateCharacter.*/d')
     fi
     # Ignore date strings in class files.
-    # On Macosx the system sources for generated java classes produce different output on
-    # consequtive invocations seemingly randomly.
-    # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
     # Anonymous lambda classes get randomly assigned counters in their names.
     if test "x$SUFFIX" = "xclass"; then
         # To improve performance when large diffs are found, do a rough filtering of classes
         # elibeble for these exceptions
         if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \
                 -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \
-                -e thePoint -e aPoint -e setItemsPtr \
                 -e 'lambda\$[a-zA-Z0-9]*\$[0-9]' ${THIS_FILE} > /dev/null; then
             $JAVAP -c -constants -l -p "${OTHER_FILE}" >  ${OTHER_FILE}.javap
             $JAVAP -c -constants -l -p "${THIS_FILE}" > ${THIS_FILE}.javap
@@ -112,9 +108,6 @@
                 $GREP '^[<>]' | \
                 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
                      -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \
-                     -e '/[<>].*Point   Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
-                     -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
-                     -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d' \
                      -e '/[<>].*lambda\$[a-zA-Z0-9]*\$[0-9]*/d')
         fi
     fi
@@ -313,7 +306,7 @@
         ! -name "jspawnhelper" \
         | $GREP -v "./bin/"  | $SORT | $FILTER)
 
-    echo General files...
+    echo Other files with binary differences...
     for f in $GENERAL_FILES
     do
         if [ -e $OTHER_DIR/$f ]; then
@@ -590,7 +583,7 @@
     ORIG_THIS_FILE="$THIS_FILE"
     ORIG_OTHER_FILE="$OTHER_FILE"
 
-    if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
+    if [ "$STRIP_ALL" = "true" ] || [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
         THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME
         OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME
         $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other
@@ -722,7 +715,7 @@
         fi
     fi
 
-    if [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then
+    if [ "$SORT_ALL_SYMBOLS" = "true" ] || [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then
         SYM_SORT_CMD="sort"
     else
         SYM_SORT_CMD="cat"
@@ -810,31 +803,34 @@
         if [ -z "$FULLDUMP_DIFF_FILTER" ]; then
             FULLDUMP_DIFF_FILTER="$CAT"
         fi
-        $FULLDUMP_CMD $OTHER_FILE | eval "$FULLDUMP_DIFF_FILTER" > $WORK_FILE_BASE.fulldump.other 2>&1
-        $FULLDUMP_CMD $THIS_FILE  | eval "$FULLDUMP_DIFF_FILTER" > $WORK_FILE_BASE.fulldump.this  2>&1
+        $FULLDUMP_CMD $OTHER_FILE | eval "$FULLDUMP_DIFF_FILTER" \
+            > $WORK_FILE_BASE.fulldump.other 2>&1
+        $FULLDUMP_CMD $THIS_FILE  | eval "$FULLDUMP_DIFF_FILTER" \
+            > $WORK_FILE_BASE.fulldump.this  2>&1
 
-        LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff
+        LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this \
+            > $WORK_FILE_BASE.fulldump.diff
 
         if [ -s $WORK_FILE_BASE.fulldump.diff ]; then
-            ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
-            ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE)
-            if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then
-                DIFF_ELF=true
-                if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then
-                    ELF_MSG="*$ELF_MSG*"
+            FULLDUMP_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
+            FULLDUMP_MSG=$($PRINTF "%8d" $FULLDUMP_DIFF_SIZE)
+            if [[ "$ACCEPTED_FULLDUMP_DIFF" != *"$BIN_FILE"* ]]; then
+                DIFF_FULLDUMP=true
+                if [[ "$KNOWN_FULLDUMP_DIFF" != *"$BIN_FILE"* ]]; then
+                    FULLDUMP_MSG="*$FULLDUMP_MSG*"
                     REGRESSIONS=true
                 else
-                    ELF_MSG=" $ELF_MSG "
+                    FULLDUMP_MSG=" $FULLDUMP_MSG "
                 fi
             else
-                ELF_MSG="($ELF_MSG)"
-                DIFF_ELF=
+                FULLDUMP_MSG="($FULLDUMP_MSG)"
+                DIFF_FULLDUMP=
             fi
         else
-            ELF_MSG="          "
-            DIFF_ELF=
-            if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
-                ELF_MSG="    !    "
+            FULLDUMP_MSG="          "
+            DIFF_FULLDUMP=
+            if [[ "$KNOWN_FULLDUMP_DIFF $ACCEPTED_FULLDUMP_DIFF" = *"$BIN_FILE"* ]]; then
+                FULLDUMP_MSG="    !    "
             fi
         fi
     fi
@@ -845,7 +841,7 @@
         # To get a raw diff with the complete disassembly, set
         # DIS_DIFF_FILTER="$CAT"
         if [ -z "$DIS_DIFF_FILTER" ]; then
-            DIS_DIFF_FILTER="$GREP -v ' # .* <.*>$'"
+            DIS_DIFF_FILTER="$GREP -v ' # .* <.*>$' | $SED -r -e 's/(\b|x)([0-9a-fA-F]+)(\b|:|>)/X/g'"
         fi
         $DIS_CMD $OTHER_FILE | $GREP -v $NAME | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.other 2>&1
         $DIS_CMD $THIS_FILE  | $GREP -v $NAME | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.this  2>&1
@@ -877,12 +873,12 @@
     fi
 
 
-    if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_ELF$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then
+    if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_FULLDUMP$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then
         if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi
         if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi
         if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi
         if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi
-        if [ -n "$ELF_MSG" ]; then echo -n "$ELF_MSG:"; fi
+        if [ -n "$FULLDUMP_MSG" ]; then echo -n "$FULLDUMP_MSG:"; fi
         if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi
         echo " $BIN_FILE"
         if [ "$SHOW_DIFFS" = "true" ]; then
@@ -1015,6 +1011,9 @@
     echo "-vv                 More verbose output, shows diff output of all comparisons"
     echo "-o [OTHER]          Compare with build in other directory. Will default to the old build directory"
     echo ""
+    echo "--sort-symbols      Sort all symbols before comparing"
+    echo "--strip             Strip all binaries before comparing"
+    echo ""
     echo "[FILTER]            List filenames in the image to compare, works for jars, zips, libs and execs"
     echo "Example:"
     echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
@@ -1107,6 +1106,12 @@
             shift
             shift
             ;;
+        --sort-symbols)
+            SORT_ALL_SYMBOLS=true
+            ;;
+        --strip)
+            STRIP_ALL=true
+            ;;
         *)
             CMP_NAMES=false
             CMP_PERMS=false
@@ -1223,7 +1228,7 @@
             OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle"
             OTHER_JRE_BUNDLE="$OTHER/images/jre-bundle"
 	fi
-        echo "Also comparing macosx bundles"
+        echo "Also comparing jdk macosx bundles"
         echo "  $THIS_JDK_BUNDLE"
         echo "  $OTHER_JDK_BUNDLE"
     fi
--- a/corba/.hgtags	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/.hgtags	Mon Sep 28 08:14:42 2015 -0700
@@ -324,3 +324,5 @@
 4ab250b8fac66ef8cd15ee78c40f0c651c96e16a jdk9-b79
 821a0373ef2d1642a9824facb938b901ad010413 jdk9-b80
 45c35b7f5b40d5af0085e4a7b3a4d6e3e0347c35 jdk9-b81
+c20d8ebddaa6fb09cc81d3edf3d1d05f4232700a jdk9-b82
+ca8a1719588424f6e04e943790c7fcb7cb0b8c8f jdk9-b83
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java	Mon Sep 28 08:14:42 2015 -0700
@@ -37,9 +37,9 @@
     protected byte elementData[];
 
     /**
-     * The number of valid components in this <tt>ByteBuffer</tt> object.
-     * Components <tt>elementData[0]</tt> through
-     * <tt>elementData[elementCount-1]</tt> are the actual items.
+     * The number of valid components in this {@code ByteBuffer} object.
+     * Components {@code elementData[0]} through
+     * {@code elementData[elementCount-1]} are the actual items.
      *
      * @serial
      */
@@ -88,7 +88,7 @@
 
     /**
      * Constructs an empty ByteBuffer so that its internal data array
-     * has size <tt>10</tt> and its standard capacity increment is
+     * has size {@code 10} and its standard capacity increment is
      * zero.
      */
     public ByteBuffer() {
@@ -99,7 +99,7 @@
      * Trims the capacity of this ByteBuffer to be the ByteBuffer's current
      * size. If the capacity of this cector is larger than its current
      * size, then the capacity is changed to equal the size by replacing
-     * its internal data array, kept in the field <tt>elementData</tt>,
+     * its internal data array, kept in the field {@code elementData},
      * with a smaller one. An application can use this operation to
      * minimize the storage of a ByteBuffer.
      */
@@ -138,7 +138,7 @@
      * Returns the current capacity of this ByteBuffer.
      *
      * @return  the current capacity (the length of its internal
-     *          data arary, kept in the field <tt>elementData</tt>
+     *          data arary, kept in the field {@code elementData}
      *          of this ByteBuffer.
      */
     public int capacity() {
@@ -157,9 +157,9 @@
     /**
      * Tests if this ByteBuffer has no components.
      *
-     * @return  <code>true</code> if and only if this ByteBuffer has
+     * @return  {@code true} if and only if this ByteBuffer has
      *          no components, that is, its size is zero;
-     *          <code>false</code> otherwise.
+     *          {@code false} otherwise.
      */
     public boolean isEmpty() {
         return elementCount == 0;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java	Mon Sep 28 08:14:42 2015 -0700
@@ -438,11 +438,11 @@
     }
 
     /**
-     * Writes a java.lang.Object as a CORBA Object. If <code>obj</code> is
+     * Writes a java.lang.Object as a CORBA Object. If {@code obj} is
      * an exported RMI-IIOP server object, the tie is found
-     * and wired to <code>obj</code>, then written to <code>out.write_Object(org.omg.CORBA.Object)</code>.
-     * If <code>obj</code> is a CORBA Object, it is written to
-     * <code>out.write_Object(org.omg.CORBA.Object)</code>.
+     * and wired to {@code obj}, then written to {@code out.write_Object(org.omg.CORBA.Object)}.
+     * If {@code obj} is a CORBA Object, it is written to
+     * {@code out.write_Object(org.omg.CORBA.Object)}.
      * @param out the stream in which to write the object.
      * @param obj the object to write.
      */
@@ -457,10 +457,10 @@
 
     /**
      * Writes a java.lang.Object as either a value or a CORBA Object.
-     * If <code>obj</code> is a value object or a stub object, it is written to
-     * <code>out.write_abstract_interface(java.lang.Object)</code>. If <code>obj</code> is an exported
-     * RMI-IIOP server object, the tie is found and wired to <code>obj</code>,
-     * then written to <code>out.write_abstract_interface(java.lang.Object)</code>.
+     * If {@code obj} is a value object or a stub object, it is written to
+     * {@code out.write_abstract_interface(java.lang.Object)}. If {@code obj} is an exported
+     * RMI-IIOP server object, the tie is found and wired to {@code obj},
+     * then written to {@code out.write_abstract_interface(java.lang.Object)}.
      * @param out the stream in which to write the object.
      * @param obj the object to write.
      */
@@ -595,7 +595,7 @@
      * the class might be found. May be null.
      * @param loader a class whose ClassLoader may be used to
      * load the class if all other methods fail.
-     * @return the <code>Class</code> object representing the loaded class.
+     * @return the {@code Class} object representing the loaded class.
      * @exception ClassNotFoundException if class cannot be loaded.
      */
     public Class loadClass( String className, String remoteCodebase,
@@ -605,20 +605,20 @@
     }
 
     /**
-     * The <tt>isLocal</tt> method has the same semantics as the
+     * The {@code isLocal} method has the same semantics as the
      * ObjectImpl._is_local method, except that it can throw a RemoteException.
      * (no it doesn't but the spec says it should.)
      *
-     * The <tt>_is_local()</tt> method is provided so that stubs may determine
+     * The {@code _is_local()} method is provided so that stubs may determine
      * if a particular object is implemented by a local servant and hence local
      * invocation APIs may be used.
      *
      * @param stub the stub to test.
      *
-     * @return The <tt>_is_local()</tt> method returns true if
+     * @return The {@code _is_local()} method returns true if
      * the servant incarnating the object is located in the same process as
-     * the stub and they both share the same ORB instance.  The <tt>_is_local()</tt>
-     * method returns false otherwise. The default behavior of <tt>_is_local()</tt> is
+     * the stub and they both share the same ORB instance.  The {@code _is_local()}
+     * method returns false otherwise. The default behavior of {@code _is_local()} is
      * to return false.
      *
      * @throws RemoteException The Java to IDL specification does to
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java	Mon Sep 28 08:14:42 2015 -0700
@@ -93,7 +93,7 @@
      * @param name Ignored
      * @param ctx The non-null CNCtx whose ORB to use.
      * @param env Ignored
-     * @return The CORBA object for <tt>orig</tt> or null.
+     * @return The CORBA object for {@code orig} or null.
      * @exception ConfigurationException If the CORBA object cannot be obtained
      *    due to configuration problems
      * @exception NamingException If some other problem prevented a CORBA
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java	Mon Sep 28 08:14:42 2015 -0700
@@ -165,7 +165,7 @@
      * If number is 0 then use an emphemeral port for the listener of
      * the associated type. <p>
      *
-     * If number is greater then 0 use that port number. <p>
+     * If number is greater than 0 use that port number. <p>
      *
      * An ORB creates a listener socket for each type
      * specified by the user by calling
--- a/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java	Mon Sep 28 08:14:42 2015 -0700
@@ -108,12 +108,12 @@
     }
 
     /**
-     * Writes a java.lang.Object as a CORBA Object. If <code>obj</code> is
+     * Writes a java.lang.Object as a CORBA Object. If {@code obj} is
      * an exported RMI-IIOP server object, the tie is found
-     * and wired to <code>obj</code>, then written to
-<code>out.write_Object(org.omg.CORBA.Object)</code>.
-     * If <code>obj</code> is a CORBA Object, it is written to
-     * <code>out.write_Object(org.omg.CORBA.Object)</code>.
+     * and wired to {@code obj}, then written to
+     * {@code out.write_Object(org.omg.CORBA.Object)}.
+     * If {@code obj} is a CORBA Object, it is written to
+     * {@code out.write_Object(org.omg.CORBA.Object)}.
      * @param out the stream in which to write the object.
      * @param obj the object to write.
      */
@@ -128,12 +128,11 @@
 
     /**
      * Writes a java.lang.Object as either a value or a CORBA Object.
-     * If <code>obj</code> is a value object or a stub object, it is written to
-     * <code>out.write_abstract_interface(java.lang.Object)</code>. If <code>obj</code>
-is
-an exported
-     * RMI-IIOP server object, the tie is found and wired to <code>obj</code>,
-     * then written to <code>out.write_abstract_interface(java.lang.Object)</code>.
+     * If {@code obj} is a value object or a stub object, it is written to
+     * {@code out.write_abstract_interface(java.lang.Object)}.
+     * If {@code obj} is an exported
+     * RMI-IIOP server object, the tie is found and wired to {@code obj},
+     * then written to {@code out.write_abstract_interface(java.lang.Object)}.
      * @param out the stream in which to write the object.
      * @param obj the object to write.
      */
@@ -161,8 +160,8 @@
     }
 
     /**
-     * Removes the associated tie from an internal table and calls {@link
-Tie#deactivate}
+     * Removes the associated tie from an internal table
+     * and calls {@link Tie#deactivate}
      * to deactivate the object.
      * @param target the object to unexport.
      */
@@ -219,27 +218,27 @@
      * <P>The spec for this method is the "Java to IDL language
      * mapping", ptc/00-01-06.
      * <P>In Java SE Platform, this method works as follows:
-     * <UL><LI>Find the first non-null <tt>ClassLoader</tt> on the
+     * <UL><LI>Find the first non-null {@code ClassLoader} on the
      * call stack and attempt to load the class using this
-     * <tt>ClassLoader</tt>.
-     * <LI>If the first step fails, and if <tt>remoteCodebase</tt>
+     * {@code ClassLoader}.
+     * <LI>If the first step fails, and if {@code remoteCodebase}
      * is non-null and
-     * <tt>useCodebaseOnly</tt> is false, then call
-     * <tt>java.rmi.server.RMIClassLoader.loadClass(remoteCodebase, className)</tt>.
-     * <LI>If <tt>remoteCodebase</tt> is null or <tt>useCodebaseOnly</tt>
-     * is true, then call <tt>java.rmi.server.RMIClassLoader.loadClass(className)</tt>.
+     * {@code useCodebaseOnly} is false, then call
+     * {@code java.rmi.server.RMIClassLoader.loadClass(remoteCodebase, className)}.
+     * <LI>If {@code remoteCodebase} is null or {@code useCodebaseOnly}
+     * is true, then call {@code java.rmi.server.RMIClassLoader.loadClass(className)}.
      * <LI>If a class was not successfully loaded by step 1, 2, or 3,
-     * and <tt>loader</tt> is non-null, then call <tt>loader.loadClass(className)</tt>.
+     * and {@code loader} is non-null, then call {@code loader.loadClass(className)}.
      * <LI>If a class was successfully loaded by step 1, 2, 3, or 4, then
-     *  return the loaded class, else throw <tt>ClassNotFoundException</tt>.
+     *  return the loaded class, else throw {@code ClassNotFoundException}.
      * </UL>
      *
      * @param className the name of the class.
      * @param remoteCodebase a space-separated list of URLs at which
      * the class might be found. May be null.
-     * @param loader a <tt>ClassLoader</tt> that may be used to
+     * @param loader a {@code ClassLoader} that may be used to
      * load the class if all other methods fail.
-     * @return the <code>Class</code> object representing the loaded class.
+     * @return the {@code Class} object representing the loaded class.
      * @exception ClassNotFoundException if class cannot be loaded.
      */
     public static Class loadClass(String className,
@@ -254,24 +253,24 @@
 
 
     /**
-     * The <tt>isLocal</tt> method has the same semantics as the
-     * <tt>ObjectImpl._is_local</tt>
-     * method, except that it can throw a <tt>RemoteException</tt>.
+     * The {@code isLocal} method has the same semantics as the
+     * {@code ObjectImpl._is_local}
+     * method, except that it can throw a {@code RemoteException}.
      *
-     * The <tt>_is_local()</tt> method is provided so that stubs may determine if a
+     * The {@code _is_local()} method is provided so that stubs may determine if a
      * particular object is implemented by a local servant and hence local
      * invocation APIs may be used.
      *
      * @param stub the stub to test.
      *
-     * @return The <tt>_is_local()</tt> method returns true if
+     * @return The {@code _is_local()} method returns true if
      * the servant incarnating the object is located in the same process as
-     * the stub and they both share the same ORB instance.  The <tt>_is_local()</tt>
-     * method returns false otherwise. The default behavior of <tt>_is_local()</tt> is
+     * the stub and they both share the same ORB instance.  The {@code _is_local()}
+     * method returns false otherwise. The default behavior of {@code _is_local()} is
      * to return false.
      *
      * @throws RemoteException The Java to IDL specification does not
-     * specify the conditions that cause a <tt>RemoteException</tt> to be thrown.
+     * specify the conditions that cause a {@code RemoteException} to be thrown.
      */
     public static boolean isLocal(Stub stub) throws RemoteException {
 
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -30,52 +30,52 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Any</tt>.  For more information on
+ * The Holder for {@code Any}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for <code>Any</code> objects
+ * A Holder class for {@code Any} objects
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>any</code> as an "out"
+ * If an IDL method signature has an IDL {@code any} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>AnyHolder</code> as the corresponding
+ * {@code AnyHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myAnyHolder</code> is an instance of <code>AnyHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myAnyHolder.value</code>.
+ * If {@code myAnyHolder} is an instance of {@code AnyHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myAnyHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class AnyHolder implements  Streamable {
     /**
-     * The <code>Any</code> value held by this <code>AnyHolder</code> object.
+     * The {@code Any} value held by this {@code AnyHolder} object.
      */
 
     public Any value;
 
     /**
-     * Constructs a new <code>AnyHolder</code> object with its
-     * <code>value</code> field initialized to <code>null</code>.
+     * Constructs a new {@code AnyHolder} object with its
+     * {@code value} field initialized to {@code null}.
      */
     public AnyHolder() {
     }
 
     /**
-     * Constructs a new <code>AnyHolder</code> object for the given
-     * <code>Any</code> object.
-     * @param initial the <code>Any</code> object with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>AnyHolder</code> object
+     * Constructs a new {@code AnyHolder} object for the given
+     * {@code Any} object.
+     * @param initial the {@code Any} object with which to initialize
+     *                the {@code value} field of the new
+     *                {@code AnyHolder} object
      */
     public AnyHolder(Any initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in the Holder
+     * Reads from {@code input} and initalizes the value in the Holder
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire.
@@ -85,8 +85,8 @@
     }
 
     /**
-     * Marshals to <code>output</code> the value in
-     * this <code>AnyHolder</code> object.
+     * Marshals to {@code output} the value in
+     * this {@code AnyHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data.
      */
@@ -95,11 +95,11 @@
     }
 
     /**
-     * Returns the <code>TypeCode</code> object corresponding to the value
-     * held in this <code>AnyHolder</code> object.
+     * Returns the {@code TypeCode} object corresponding to the value
+     * held in this {@code AnyHolder} object.
      *
      * @return    the TypeCode of the value held in
-     *              this <code>AnyHolder</code> object
+     *              this {@code AnyHolder} object
      */
     public TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_any);
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>AnySeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/AnySeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code AnySeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/AnySeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class AnySeqHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>AnySeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/AnySeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ * The Holder for {@code AnySeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/AnySeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ */
 
 public final class AnySeqHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java	Mon Sep 28 08:14:42 2015 -0700
@@ -25,8 +25,8 @@
 
 package org.omg.CORBA;
 /**
- * A <tt>PolicyErrorCode</tt> which would be filled in
- * the <tt>PolicyError</tt> exception.
+ * A {@code PolicyErrorCode} which would be filled in
+ * the {@code PolicyError} exception.
  *
  * @author rip-dev
  */
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,8 +26,8 @@
 package org.omg.CORBA;
 
 /**
- * A <tt>PolicyErrorCode</tt> which would be filled in
- * the <tt>PolicyError</tt> exception.
+ * A {@code PolicyErrorCode} which would be filled in
+ * the {@code PolicyError} exception.
  *
  * @author rip-dev
  */
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java	Mon Sep 28 08:14:42 2015 -0700
@@ -27,7 +27,7 @@
 
 /**
  * Exception thrown when the ORB has encountered a malformed type code
- * (for example, a type code with an invalid <tt>TCKind</tt> value).<P>
+ * (for example, a type code with an invalid {@code TCKind} value).<P>
  * It contains a minor code, which gives more detailed information about
  * what caused the exception, and a completion status. It may also contain
  * a string describing the exception.
@@ -40,7 +40,7 @@
 public final class BAD_TYPECODE extends SystemException {
 
     /**
-     * Constructs a <code>BAD_TYPECODE</code> exception with a default
+     * Constructs a {@code BAD_TYPECODE} exception with a default
      * minor code of 0 and a completion state of COMPLETED_NO.
      */
     public BAD_TYPECODE() {
@@ -48,7 +48,7 @@
     }
 
     /**
-     * Constructs a <code>BAD_TYPECODE</code> exception with the specified detail,
+     * Constructs a {@code BAD_TYPECODE} exception with the specified detail,
      * a minor code of 0, and a completion state of COMPLETED_NO.
      *
      * @param s the String containing a detail message
@@ -58,10 +58,10 @@
     }
 
     /**
-     * Constructs a <code>BAD_TYPECODE</code> exception with the specified
+     * Constructs a {@code BAD_TYPECODE} exception with the specified
      * minor code and completion status.
      * @param minor the minor code
-     * @param completed an instance of <code>CompletionStatus</code> indicating
+     * @param completed an instance of {@code CompletionStatus} indicating
      *                  the completion status
      */
     public BAD_TYPECODE(int minor, CompletionStatus completed) {
@@ -69,12 +69,12 @@
     }
 
     /**
-     * Constructs a <code>BAD_TYPECODE</code> exception with the specified detail
+     * Constructs a {@code BAD_TYPECODE} exception with the specified detail
      * message, minor code, and completion status.
      * A detail message is a String that describes this particular exception.
      * @param s the String containing a detail message
      * @param minor the minor code
-     * @param completed an instance of <code>CompletionStatus</code> indicating
+     * @param completed an instance of {@code CompletionStatus} indicating
      *                  the completion status
      */
     public BAD_TYPECODE(String s, int minor, CompletionStatus completed) {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -30,56 +30,56 @@
 
 
 /**
- * The Holder for <tt>Boolean</tt>.  For more information on
+ * The Holder for {@code Boolean}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>boolean</code>
+ * A Holder class for a {@code boolean}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>boolean</code> as an "out"
+ * If an IDL method signature has an IDL {@code boolean} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>BooleanHolder</code> as the corresponding
+ * {@code BooleanHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myBooleanHolder</code> is an instance of <code>BooleanHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myBooleanHolder.value</code>.
+ * If {@code myBooleanHolder} is an instance of {@code BooleanHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myBooleanHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class BooleanHolder implements Streamable {
 
     /**
-     * The <code>boolean</code> value held by this <code>BooleanHolder</code>
+     * The {@code boolean} value held by this {@code BooleanHolder}
      * object.
      */
     public boolean value;
 
     /**
-     * Constructs a new <code>BooleanHolder</code> object with its
-     * <code>value</code> field initialized to <code>false</code>.
+     * Constructs a new {@code BooleanHolder} object with its
+     * {@code value} field initialized to {@code false}.
      */
     public BooleanHolder() {
     }
 
     /**
-     * Constructs a new <code>BooleanHolder</code> object with its
-     * <code>value</code> field initialized with the given <code>boolean</code>.
-     * @param initial the <code>boolean</code> with which to initialize
-     *                the <code>value</code> field of the newly-created
-     *                <code>BooleanHolder</code> object
+     * Constructs a new {@code BooleanHolder} object with its
+     * {@code value} field initialized with the given {@code boolean}.
+     * @param initial the {@code boolean} with which to initialize
+     *                the {@code value} field of the newly-created
+     *                {@code BooleanHolder} object
      */
     public BooleanHolder(boolean initial) {
         value = initial;
     }
 
     /**
-     * Reads unmarshalled data from <code>input</code> and assigns it to this
-     * <code>BooleanHolder</code> object's <code>value</code> field.
+     * Reads unmarshalled data from {@code input} and assigns it to this
+     * {@code BooleanHolder} object's {@code value} field.
      *
-     * @param input the <code>InputStream</code> object containing
+     * @param input the {@code InputStream} object containing
      *              CDR formatted data from the wire
      */
     public void _read(InputStream input) {
@@ -87,8 +87,8 @@
     }
 
     /**
-     * Marshals the value in this <code>BooleanHolder</code> object's
-     * <code>value</code> field to the output stream <code>output</code>.
+     * Marshals the value in this {@code BooleanHolder} object's
+     * {@code value} field to the output stream {@code output}.
      *
      * @param output the OutputStream which will contain the CDR formatted data
      */
@@ -97,11 +97,11 @@
     }
 
     /**
-     * Retrieves the <code>TypeCode</code> object that corresponds to the
-     * value held in this <code>BooleanHolder</code> object.
+     * Retrieves the {@code TypeCode} object that corresponds to the
+     * value held in this {@code BooleanHolder} object.
      *
-     * @return    the <code>TypeCode</code> for the value held
-     *            in this <code>BooleanHolder</code> object
+     * @return    the {@code TypeCode} for the value held
+     *            in this {@code BooleanHolder} object
      */
     public TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_boolean);
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>BooleanSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/BooleanSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code BooleanSeq}.  For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/BooleanSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class BooleanSeqHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>BooleanSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/BooleanSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ * The Holder for {@code BooleanSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/BooleanSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ */
 
 public final class BooleanSeqHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -31,54 +31,54 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Byte</tt>.  For more information on
+ * The Holder for {@code Byte}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>byte</code>
+ * A Holder class for a {@code byte}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>octet</code> as an "out"
+ * If an IDL method signature has an IDL {@code octet} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>ByteHolder</code> as the corresponding
+ * {@code ByteHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myByteHolder</code> is an instance of <code>ByteHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myByteHolder.value</code>.
+ * If {@code myByteHolder} is an instance of {@code ByteHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myByteHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class ByteHolder implements Streamable {
     /**
-     * The <code>byte</code> value held by this <code>ByteHolder</code>
+     * The {@code byte} value held by this {@code ByteHolder}
      * object.
      */
 
     public byte value;
 
     /**
-     * Constructs a new <code>ByteHolder</code> object with its
-     * <code>value</code> field initialized to 0.
+     * Constructs a new {@code ByteHolder} object with its
+     * {@code value} field initialized to 0.
      */
     public ByteHolder() {
     }
 
     /**
-     * Constructs a new <code>ByteHolder</code> object for the given
-     * <code>byte</code>.
-     * @param initial the <code>byte</code> with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>ByteHolder</code> object
+     * Constructs a new {@code ByteHolder} object for the given
+     * {@code byte}.
+     * @param initial the {@code byte} with which to initialize
+     *                the {@code value} field of the new
+     *                {@code ByteHolder} object
      */
     public ByteHolder(byte initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in
-     * this <code>ByteHolder</code> object
+     * Reads from {@code input} and initalizes the value in
+     * this {@code ByteHolder} object
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire.
@@ -88,8 +88,8 @@
     }
 
     /**
-     * Marshals to <code>output</code> the value in
-     * this <code>ByteHolder</code> object.
+     * Marshals to {@code output} the value in
+     * this {@code ByteHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data.
      */
@@ -99,10 +99,10 @@
 
     /**
      * Returns the TypeCode corresponding to the value held in
-     * this <code>ByteHolder</code> object.
+     * this {@code ByteHolder} object.
      *
-     * @return    the TypeCode of the value held in
-     *               this <code>ByteHolder</code> object
+     * @return  the TypeCode of the value held in
+     *          this {@code ByteHolder} object
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_octet);
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -31,54 +31,54 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Char</tt>.  For more information on
+ * The Holder for {@code Char}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>char</code>
+ * A Holder class for a {@code char}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>char</code> as an "out"
+ * If an IDL method signature has an IDL {@code char} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>CharHolder</code> as the corresponding
+ * {@code CharHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myCharHolder</code> is an instance of <code>CharHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myCharHolder.value</code>.
+ * If {@code myCharHolder} is an instance of {@code CharHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myCharHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class CharHolder implements Streamable {
 
     /**
-     * The <code>char</code> value held by this <code>CharHolder</code>
+     * The {@code char} value held by this {@code CharHolder}
      * object.
      */
     public char value;
 
     /**
-     * Constructs a new <code>CharHolder</code> object with its
-     * <code>value</code> field initialized to <code>0</code>.
+     * Constructs a new {@code CharHolder} object with its
+     * {@code value} field initialized to {@code 0}.
      */
     public CharHolder() {
     }
 
     /**
-     * Constructs a new <code>CharHolder</code> object for the given
-     * <code>char</code>.
-     * @param initial the <code>char</code> with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>CharHolder</code> object
+     * Constructs a new {@code CharHolder} object for the given
+     * {@code char}.
+     * @param initial the {@code char} with which to initialize
+     *                the {@code value} field of the new
+     *                {@code CharHolder} object
      */
     public CharHolder(char initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in
-     * this <code>CharHolder</code> object
+     * Reads from {@code input} and initalizes the value in
+     * this {@code CharHolder} object
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire
@@ -88,8 +88,8 @@
     }
 
     /**
-     * Marshals to <code>output</code> the value in
-     * this <code>CharHolder</code> object.
+     * Marshals to {@code output} the value in
+     * this {@code CharHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data
      */
@@ -98,12 +98,12 @@
     }
 
     /**
-     * Returns the <code>TypeCode</code> object  corresponding
+     * Returns the {@code TypeCode} object  corresponding
      * to the value held in
-     * this <code>CharHolder</code> object.
+     * this {@code CharHolder} object.
      *
      * @return    the TypeCode of the value held in
-     *            this <code>CharHolder</code> object
+     *            this {@code CharHolder} object
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_char);
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>CharSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/CharSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code CharSeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/CharSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class CharSeqHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>CharSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/CharSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ * The Holder for {@code CharSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/CharSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ */
 
 public final class CharSeqHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,13 +26,13 @@
 
 
 /**
-* The Helper for <tt>CompletionStatus</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/CompletionStatusHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* 03 June 1999 11:52:03 o'clock GMT+00:00
-*/
+ * The Helper for {@code CompletionStatus}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/CompletionStatusHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * 03 June 1999 11:52:03 o'clock GMT+00:00
+ */
 
 abstract public class CompletionStatusHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/Current.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/Current.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,16 +26,16 @@
 
 
 /**
-* Interfaces derived from the <tt>Current</tt> interface enable ORB and CORBA
+* Interfaces derived from the {@code Current} interface enable ORB and CORBA
 * services to provide access to information (context) associated with
 * the thread of execution in which they are running. This information
 * is accessed in a structured manner using interfaces derived from the
-* <tt>Current</tt> interface defined in the CORBA module.
+* {@code Current} interface defined in the CORBA module.
 *
 * <P>Each ORB or CORBA service that needs its own context derives an
-* interface from the CORBA module's <tt>Current</tt>. Users of the
-* service can obtain an instance of the appropriate <tt>Current</tt>
-* interface by invoking <tt>ORB::resolve_initial_references</tt>.<P>
+* interface from the CORBA module's {@code Current}. Users of the
+* service can obtain an instance of the appropriate {@code Current}
+* interface by invoking {@code ORB::resolve_initial_references}.<P>
 *
 * org/omg/CORBA/Current.java
 * Generated by the IDL-to-Java compiler (portable), version "3.0"
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>Current</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/CurrentHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT
-*/
+ * The Helper for {@code Current}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/CurrentHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:21 AM PDT
+ */
 
 abstract public class CurrentHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -25,14 +25,14 @@
 package org.omg.CORBA;
 
 /**
-* The Holder for <tt>Current</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/CurrentHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT
-*/
+ * The Holder for {@code Current}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/CurrentHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:21 AM PDT
+ */
 
 public final class CurrentHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,15 +26,15 @@
 
 
 /**
-* The interface for <tt>Current</tt>.  For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html">
-* "Generated Files"</a>.
-*
-* org/omg/CORBA/CurrentOperations.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT.
-*/
+ * The interface for {@code Current}. For more information on
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html">
+ * "Generated Files"</a>.
+ *
+ * org/omg/CORBA/CurrentOperations.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:21 AM PDT.
+ */
 
 public interface CurrentOperations
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java	Mon Sep 28 08:14:42 2015 -0700
@@ -34,7 +34,7 @@
  * as a custom value type's implicit base class, although the custom
  * valuetype does not actually inherit it in IDL. The implementer
  * of a custom value type shall provide an implementation of the
- * <tt>CustomMarshal</tt> operations. The manner in which this is done is
+ * {@code CustomMarshal} operations. The manner in which this is done is
  * specified in the IDL to Java langauge mapping. Each custom
  * marshaled value type shall have its own implementation.
  * @see DataInputStream
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>DefinitionKind</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/DefinitionKindHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
-* 03 June 1999 11:33:43 o'clock GMT+00:00
-*/
+ * The Helper for {@code DefinitionKind}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/DefinitionKindHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ir.idl
+ * 03 June 1999 11:33:43 o'clock GMT+00:00
+ */
 
 abstract public class DefinitionKindHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java	Mon Sep 28 08:14:42 2015 -0700
@@ -25,11 +25,12 @@
 
 package org.omg.CORBA;
 
-/** Provides mechanisms for establishing and navigating relationships to
+/**
+ *  Provides mechanisms for establishing and navigating relationships to
  *  superior and subordinate domains, as well as for creating and accessing
- *  policies. The <tt>DomainManager</tt> has associated with it the policy
- *  objects for a
- *  particular domain. The domain manager also records the membership of
+ *  policies. The {@code DomainManager} has associated with it the policy
+ *  objects for a particular domain.
+ *  The domain manager also records the membership of
  *  the domain and provides the means to add and remove members. The domain
  *  manager is itself a member of a domain, possibly the domain it manages.
  *  The domain manager provides mechanisms for establishing and navigating
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,9 +26,9 @@
 package org.omg.CORBA;
 
 /**
- *  Provides the <tt>DomainManager</tt> with the means to access policies.
+ *  Provides the {@code DomainManager} with the means to access policies.
  *  <P>
- *  The <tt>DomainManager</tt> has associated with it the policy objects for a
+ *  The {@code DomainManager} has associated with it the policy objects for a
  *  particular domain. The domain manager also records the membership of
  *  the domain and provides the means to add and remove members. The domain
  *  manager is itself a member of a domain, possibly the domain it manages.
@@ -39,11 +39,12 @@
 
 public interface DomainManagerOperations
 {
-    /** This returns the policy of the specified type for objects in
+    /**
+     *  This returns the policy of the specified type for objects in
      *  this domain.  The types of policies available are domain specific.
      *  See the CORBA specification for a list of standard ORB policies.
      *
-     *@param policy_type Type of policy to request
+     *  @param policy_type Type of policy to request
      */
     public org.omg.CORBA.Policy get_domain_policy(int policy_type);
 }
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -30,47 +30,47 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Double</tt>.  For more information on
+ * The Holder for {@code Double}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>double</code>
+ * A Holder class for a {@code double}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>double</code> as an "out"
+ * If an IDL method signature has an IDL {@code double} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>DoubleHolder</code> as the corresponding
+ * {@code DoubleHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myDoubleHolder</code> is an instance of <code>DoubleHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myDoubleHolder.value</code>.
+ * If {@code myDoubleHolder} is an instance of {@code DoubleHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myDoubleHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class DoubleHolder implements Streamable {
 
     /**
-     * The <code>double</code> value held by this <code>DoubleHolder</code>
+     * The {@code double} value held by this {@code DoubleHolder}
      * object.
      */
 
     public double value;
 
     /**
-     * Constructs a new <code>DoubleHolder</code> object with its
-     * <code>value</code> field initialized to 0.0.
+     * Constructs a new {@code DoubleHolder} object with its
+     * {@code value} field initialized to 0.0.
      */
     public DoubleHolder() {
     }
 
     /**
-     * Constructs a new <code>DoubleHolder</code> object for the given
-     * <code>double</code>.
-     * @param initial the <code>double</code> with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>DoubleHolder</code> object
+     * Constructs a new {@code DoubleHolder} object for the given
+     * {@code double}.
+     * @param initial the {@code double} with which to initialize
+     *                the {@code value} field of the new
+     *                {@code DoubleHolder} object
      */
     public DoubleHolder(double initial) {
         value = initial;
@@ -80,7 +80,7 @@
      * Read a double value from the input stream and store it in the
      * value member.
      *
-     * @param input the <code>InputStream</code> to read from.
+     * @param input the {@code InputStream} to read from.
      */
     public void _read(InputStream input) {
         value = input.read_double();
@@ -88,18 +88,18 @@
 
     /**
      * Write the double value stored in this holder to an
-     * <code>OutputStream</code>.
+     * {@code OutputStream}.
      *
-     * @param output the <code>OutputStream</code> to write into.
+     * @param output the {@code OutputStream} to write into.
      */
     public void _write(OutputStream output) {
         output.write_double(value);
     }
 
     /**
-     * Return the <code>TypeCode</code> of this holder object.
+     * Return the {@code TypeCode} of this holder object.
      *
-     * @return the <code>TypeCode</code> object.
+     * @return the {@code TypeCode} object.
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_double);
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>DoubleSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/DoubleSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code DoubleSeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/DoubleSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class DoubleSeqHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>DoubleSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/DoubleSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
-*/
+ * The Holder for {@code DoubleSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/DoubleSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
+ */
 
 public final class DoubleSeqHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java	Mon Sep 28 08:14:42 2015 -0700
@@ -27,367 +27,368 @@
 package org.omg.CORBA;
 
 
-/** Enables <tt>org.omg.CORBA.Any</tt> values to be dynamically
+/**
+ * Enables {@code org.omg.CORBA.Any} values to be dynamically
  * interpreted (traversed) and
- *  constructed. A <tt>DynAny</tt> object is associated with a data value
- *  which may correspond to a copy of the value inserted into an <tt>Any</tt>.
- *  The <tt>DynAny</tt> APIs enable traversal of the data value associated with an
- *  Any at runtime and extraction of the primitive constituents of the
- *  data value.
+ * constructed. A {@code DynAny} object is associated with a data value
+ * which may correspond to a copy of the value inserted into an {@code Any}.
+ * The {@code DynAny} APIs enable traversal of the data value associated with an
+ * Any at runtime and extraction of the primitive constituents of the
+ * data value.
  * @deprecated Use the new <a href="../DynamicAny/DynAny.html">DynAny</a> instead
  */
 @Deprecated
 public interface DynAny extends org.omg.CORBA.Object
 {
     /**
-     * Returns the <code>TypeCode</code> of the object inserted into
-     * this <code>DynAny</code>.
+     * Returns the {@code TypeCode} of the object inserted into
+     * this {@code DynAny}.
      *
-     * @return the <code>TypeCode</code> object.
+     * @return the {@code TypeCode} object.
      */
     public org.omg.CORBA.TypeCode type() ;
 
     /**
      * Copy the contents from one Dynamic Any into another.
      *
-     * @param dyn_any the <code>DynAny</code> object whose contents
-     *                are assigned to this <code>DynAny</code>.
+     * @param dyn_any the {@code DynAny} object whose contents
+     *                are assigned to this {@code DynAny}.
      * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source
-     * <code>DynAny</code> is invalid
+     * {@code DynAny} is invalid
      */
     public void assign(org.omg.CORBA.DynAny dyn_any)
         throws org.omg.CORBA.DynAnyPackage.Invalid;
 
     /**
-     * Make a <code>DynAny</code> object from an <code>Any</code>
+     * Make a {@code DynAny} object from an {@code Any}
      * object.
      *
-     * @param value the <code>Any</code> object.
+     * @param value the {@code Any} object.
      * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source
-     * <code>Any</code> object is empty or bad
+     * {@code Any} object is empty or bad
      */
     public void from_any(org.omg.CORBA.Any value)
         throws org.omg.CORBA.DynAnyPackage.Invalid;
 
     /**
-     * Convert a <code>DynAny</code> object to an <code>Any</code>
+     * Convert a {@code DynAny} object to an {@code Any}
      * object.
      *
-     * @return the <code>Any</code> object.
+     * @return the {@code Any} object.
      * @throws org.omg.CORBA.DynAnyPackage.Invalid if this
-     * <code>DynAny</code> is empty or bad.
+     * {@code DynAny} is empty or bad.
      *            created or does not contain a meaningful value
      */
     public org.omg.CORBA.Any to_any()
         throws org.omg.CORBA.DynAnyPackage.Invalid;
 
     /**
-     * Destroys this <code>DynAny</code> object and frees any resources
+     * Destroys this {@code DynAny} object and frees any resources
      * used to represent the data value associated with it. This method
-     * also destroys all <code>DynAny</code> objects obtained from it.
+     * also destroys all {@code DynAny} objects obtained from it.
      * <p>
-     * Destruction of <code>DynAny</code> objects should be handled with
+     * Destruction of {@code DynAny} objects should be handled with
      * care, taking into account issues dealing with the representation of
-     * data values associated with <code>DynAny</code> objects.  A programmer
-     * who wants to destroy a <code>DynAny</code> object but still be able
+     * data values associated with {@code DynAny} objects.  A programmer
+     * who wants to destroy a {@code DynAny} object but still be able
      * to manipulate some component of the data value associated with it,
-     * should first create a <code>DynAny</code> object for the component
-     * and then make a copy of the created <code>DynAny</code> object.
+     * should first create a {@code DynAny} object for the component
+     * and then make a copy of the created {@code DynAny} object.
      */
     public void destroy() ;
 
     /**
-     * Clones this <code>DynAny</code> object.
+     * Clones this {@code DynAny} object.
      *
-     * @return a copy of this <code>DynAny</code> object
+     * @return a copy of this {@code DynAny} object
      */
     public org.omg.CORBA.DynAny copy() ;
 
     /**
-     * Inserts the given <code>boolean</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code boolean} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>boolean</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code boolean} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_boolean(boolean value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>byte</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code byte} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>byte</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code byte} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_octet(byte value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>char</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code char} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>char</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code char} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_char(char value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>short</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code short} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>short</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code short} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_short(short value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>short</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code short} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>short</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code short} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_ushort(short value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>int</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code int} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>int</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code int} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_long(int value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>int</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code int} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>int</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code int} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_ulong(int value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>float</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code float} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>float</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code float} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_float(float value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>double</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code double} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>double</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code double} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_double(double value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>String</code> object as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code String} object as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>String</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code String} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_string(String value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>org.omg.CORBA.Object</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code org.omg.CORBA.Object} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>org.omg.CORBA.Object</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code org.omg.CORBA.Object} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_reference(org.omg.CORBA.Object value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>org.omg.CORBA.TypeCode</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code org.omg.CORBA.TypeCode} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>org.omg.CORBA.TypeCode</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code org.omg.CORBA.TypeCode} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_typecode(org.omg.CORBA.TypeCode value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>long</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code long} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>long</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code long} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_longlong(long value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>long</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code long} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>long</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code long} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_ulonglong(long value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>char</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code char} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>char</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code char} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_wchar(char value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>String</code> as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code String} as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>String</code> to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code String} to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_wstring(String value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Inserts the given <code>org.omg.CORBA.Any</code> object as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code org.omg.CORBA.Any} object as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>org.omg.CORBA.Any</code> object to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code org.omg.CORBA.Any} object to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_any(org.omg.CORBA.Any value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
@@ -395,32 +396,32 @@
     // orbos 98-01-18: Objects By Value -- begin
 
     /**
-     * Inserts the given <code>java.io.Serializable</code> object as the value for this
-     * <code>DynAny</code> object.
+     * Inserts the given {@code java.io.Serializable} object as the value for this
+     * {@code DynAny} object.
      *
-     * <p> If this method is called on a constructed <code>DynAny</code>
+     * <p> If this method is called on a constructed {@code DynAny}
      * object, it initializes the next component of the constructed data
-     * value associated with this <code>DynAny</code> object.
+     * value associated with this {@code DynAny} object.
      *
-     * @param value the <code>java.io.Serializable</code> object to insert into this
-     *              <code>DynAny</code> object
+     * @param value the {@code java.io.Serializable} object to insert into this
+     *              {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.InvalidValue
      *            if the value inserted is not consistent with the type
-     *            of the accessed component in this <code>DynAny</code> object
+     *            of the accessed component in this {@code DynAny} object
      */
     public void insert_val(java.io.Serializable value)
         throws org.omg.CORBA.DynAnyPackage.InvalidValue;
 
     /**
-     * Retrieves the <code>java.io.Serializable</code> object contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code java.io.Serializable} object contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>java.io.Serializable</code> object that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code java.io.Serializable} object that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>java.io.Serializable</code> object
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code java.io.Serializable} object
      */
     public java.io.Serializable get_val()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
@@ -428,284 +429,284 @@
     // orbos 98-01-18: Objects By Value -- end
 
     /**
-     * Retrieves the <code>boolean</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code boolean} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>boolean</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code boolean} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>boolean</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code boolean}
      */
     public boolean get_boolean()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>byte</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code byte} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>byte</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code byte} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>byte</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code byte}
      */
     public byte get_octet()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
     /**
-     * Retrieves the <code>char</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code char} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>char</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code char} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>char</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code char}
      */
     public char get_char()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>short</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code short} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>short</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code short} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>short</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code short}
      */
     public short get_short()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>short</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code short} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>short</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code short} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>short</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code short}
      */
     public short get_ushort()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>int</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code int} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>int</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code int} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>int</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code int}
      */
     public int get_long()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>int</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code int} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>int</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code int} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>int</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code int}
      */
     public int get_ulong()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>float</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code float} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>float</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code float} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>float</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code float}
      */
     public float get_float()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>double</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code double} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>double</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code double} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>double</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code double}
      */
     public double get_double()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>String</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code String} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>String</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code String} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>String</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code String}
      */
     public String get_string()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>org.omg.CORBA.Other</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code org.omg.CORBA.Other} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>org.omg.CORBA.Other</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code org.omg.CORBA.Other} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for an <code>org.omg.CORBA.Other</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for an {@code org.omg.CORBA.Other}
      */
     public org.omg.CORBA.Object get_reference()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>org.omg.CORBA.TypeCode</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code org.omg.CORBA.TypeCode} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>org.omg.CORBA.TypeCode</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code org.omg.CORBA.TypeCode} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>org.omg.CORBA.TypeCode</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code org.omg.CORBA.TypeCode}
      */
     public org.omg.CORBA.TypeCode get_typecode()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>long</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code long} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>long</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code long} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>long</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code long}
      */
     public long get_longlong()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>long</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code long} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>long</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code long} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>long</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code long}
      */
     public long get_ulonglong()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>char</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code char} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>char</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code char} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>char</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code char}
      */
     public char get_wchar()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>String</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code String} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>String</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code String} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for a <code>String</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for a {@code String}
      */
     public String get_wstring()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>org.omg.CORBA.Any</code> contained
-     * in this <code>DynAny</code> object.
+     * Retrieves the {@code org.omg.CORBA.Any} contained
+     * in this {@code DynAny} object.
      *
-     * @return the <code>org.omg.CORBA.Any</code> that is the
-     *         value for this <code>DynAny</code> object
+     * @return the {@code org.omg.CORBA.Any} that is the
+     *         value for this {@code DynAny} object
      * @throws org.omg.CORBA.DynAnyPackage.TypeMismatch
      *               if the type code of the accessed component in this
-     *               <code>DynAny</code> object is not equivalent to
-     *               the type code for an <code>org.omg.CORBA.Any</code>
+     *               {@code DynAny} object is not equivalent to
+     *               the type code for an {@code org.omg.CORBA.Any}
      */
     public org.omg.CORBA.Any get_any()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
     /**
-     * Returns a <code>DynAny</code> object reference that can
+     * Returns a {@code DynAny} object reference that can
      * be used to get/set the value of the component currently accessed.
-     * The appropriate <code>insert</code> method
-     * can be called on the resulting <code>DynAny</code> object
+     * The appropriate {@code insert} method
+     * can be called on the resulting {@code DynAny} object
      * to initialize the component.
-     * The appropriate <code>get</code> method
-     * can be called on the resulting <code>DynAny</code> object
+     * The appropriate {@code get} method
+     * can be called on the resulting {@code DynAny} object
      * to extract the value of the component.
          *
-         * @return a <code>DynAny</code> object reference that can be
+         * @return a {@code DynAny} object reference that can be
          *         used to retrieve or set the value of the component currently
          *         accessed
      */
     public org.omg.CORBA.DynAny current_component() ;
 
     /**
-     * Moves to the next component of this <code>DynAny</code> object.
+     * Moves to the next component of this {@code DynAny} object.
      * This method is used for iterating through the components of
      * a constructed type, effectively moving a pointer from one
      * component to the next.  The pointer starts out on the first
-     * component when a <code>DynAny</code> object is created.
+     * component when a {@code DynAny} object is created.
      *
-     * @return <code>true</code> if the pointer points to a component;
-     * <code>false</code> if there are no more components or this
-     * <code>DynAny</code> is associated with a basic type rather than
+     * @return {@code true} if the pointer points to a component;
+     * {@code false} if there are no more components or this
+     * {@code DynAny} is associated with a basic type rather than
      * a constructed type
      */
     public boolean next() ;
@@ -714,12 +715,12 @@
      * Moves the internal pointer to the given index. Logically, this method
      * sets a new offset for this pointer.
      *
-     * @param index an <code>int</code> indicating the position to which
+     * @param index an {@code int} indicating the position to which
      *              the pointer should move.  The first position is 0.
-     * @return <code>true</code> if the pointer points to a component;
-     * <code>false</code> if there is no component at the designated
-     * index.  If this <code>DynAny</code> object is associated with a
-     * basic type, this method returns <code>false</code> for any index
+     * @return {@code true} if the pointer points to a component;
+     * {@code false} if there is no component at the designated
+     * index.  If this {@code DynAny} object is associated with a
+     * basic type, this method returns {@code false} for any index
      * other than 0.
      */
     public boolean seek(int index) ;
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java	Mon Sep 28 08:14:42 2015 -0700
@@ -27,8 +27,9 @@
 package org.omg.CORBA;
 
 
-/** Represents a <tt>DynAny</tt> object associated
- *  with an array.
+/**
+ * Represents a {@code DynAny} object associated with an array.
+ *
  * @deprecated Use the new <a href="../DynamicAny/DynArray.html">DynArray</a> instead
  */
 @Deprecated
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,8 +26,9 @@
 
 package org.omg.CORBA;
 
-/** Represents a <tt>DynAny</tt> object  associated
- *  with an IDL enum.
+/**
+ * Represents a {@code DynAny} object associated with an IDL enum.
+ *
  * @deprecated Use the new <a href="../DynamicAny/DynEnum.html">DynEnum</a> instead
  */
 @Deprecated
@@ -35,14 +36,14 @@
 {
     /**
      * Return the value of the IDL enum stored in this
-     * <code>DynEnum</code> as a string.
+     * {@code DynEnum} as a string.
      *
      * @return the stringified value.
      */
     public String value_as_string();
 
     /**
-     * Set a particular enum in this <code>DynEnum</code>.
+     * Set a particular enum in this {@code DynEnum}.
      *
      * @param arg the string corresponding to the value.
      */
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,13 +26,13 @@
 
 
 /**
-* The Helper for <tt>FieldName</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/FieldNameHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* 03 June 1999 11:52:03 o'clock GMT+00:00
-*/
+ * The Helper for {@code FieldName}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/FieldNameHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * 03 June 1999 11:52:03 o'clock GMT+00:00
+ */
 
 abstract public class FieldNameHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -31,7 +31,7 @@
 
 
 /**
- * The Holder for <tt>Fixed</tt>.  For more information on
+ * The Holder for {@code Fixed}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
  * FixedHolder is a container class for values of IDL type "fixed",
@@ -69,7 +69,7 @@
      * Read a fixed point value from the input stream and store it in
      * the value member.
      *
-     * @param input the <code>InputStream</code> to read from.
+     * @param input the {@code InputStream} to read from.
      */
     public void _read(InputStream input) {
         value = input.read_fixed();
@@ -77,9 +77,9 @@
 
     /**
      * Write the fixed point value stored in this holder to an
-     * <code>OutputStream</code>.
+     * {@code OutputStream}.
      *
-     * @param output the <code>OutputStream</code> to write into.
+     * @param output the {@code OutputStream} to write into.
      */
     public void _write(OutputStream output) {
         output.write_fixed(value);
@@ -87,9 +87,9 @@
 
 
     /**
-     * Return the <code>TypeCode</code> of this holder object.
+     * Return the {@code TypeCode} of this holder object.
      *
-     * @return the <code>TypeCode</code> object.
+     * @return the {@code TypeCode} object.
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_fixed);
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -31,45 +31,45 @@
 
 
 /**
- * The Holder for <tt>Float</tt>.  For more information on
+ * The Holder for {@code Float}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>float</code>
+ * A Holder class for a {@code float}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>float</code> as an "out"
+ * If an IDL method signature has an IDL {@code float} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>FloatHolder</code> as the corresponding
+ * {@code FloatHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myFloatHolder</code> is an instance of <code>FloatHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myFloatHolder.value</code>.
+ * If {@code myFloatHolder} is an instance of {@code FloatHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myFloatHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class FloatHolder implements Streamable {
     /**
-     * The <code>float</code> value held by this <code>FloatHolder</code>
+     * The {@code float} value held by this {@code FloatHolder}
      * object.
      */
     public float value;
 
     /**
-     * Constructs a new <code>FloatHolder</code> object with its
-     * <code>value</code> field initialized to 0.0.
+     * Constructs a new {@code FloatHolder} object with its
+     * {@code value} field initialized to 0.0.
      */
     public FloatHolder() {
     }
 
     /**
-     * Constructs a new <code>FloatHolder</code> object for the given
-     * <code>float</code>.
-     * @param initial the <code>float</code> with which to initialize
-     *                the <code>value</code> field of the new
-     *                <code>FloatHolder</code> object
+     * Constructs a new {@code FloatHolder} object for the given
+     * {@code float}.
+     * @param initial the {@code float} with which to initialize
+     *                the {@code value} field of the new
+     *                {@code FloatHolder} object
      */
     public FloatHolder(float initial) {
         value = initial;
@@ -79,7 +79,7 @@
      * Read a float from an input stream and initialize the value
      * member with the float value.
      *
-     * @param input the <code>InputStream</code> to read from.
+     * @param input the {@code InputStream} to read from.
      */
     public void _read(InputStream input) {
         value = input.read_float();
@@ -88,16 +88,16 @@
     /**
      * Write the float value into an output stream.
      *
-     * @param output the <code>OutputStream</code> to write into.
+     * @param output the {@code OutputStream} to write into.
      */
     public void _write(OutputStream output) {
         output.write_float(value);
     }
 
     /**
-     * Return the <code>TypeCode</code> of this Streamable.
+     * Return the {@code TypeCode} of this Streamable.
      *
-     * @return the <code>TypeCode</code> object.
+     * @return the {@code TypeCode} object.
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_float);
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>FloatSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/FloatSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code FloatSeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/FloatSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class FloatSeqHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>FloatSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/FloatSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
-*/
+ * The Holder for {@code FloatSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/FloatSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
+ */
 
 public final class FloatSeqHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>IDLType</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/IDLTypeHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
-* 03 June 1999 11:33:44 o'clock GMT+00:00
-*/
+ * The Helper for {@code IDLType}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/IDLTypeHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ir.idl
+ * 03 June 1999 11:33:44 o'clock GMT+00:00
+ */
 
 abstract public class IDLTypeHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java	Mon Sep 28 08:14:42 2015 -0700
@@ -25,10 +25,10 @@
 package org.omg.CORBA;
 
 /**
-* The interface for <tt>IDLType</tt>.  For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
-* "Generated Files: Operations files"</a>.
-*/
+ * The interface for {@code IDLType}. For more information on
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
+ * "Generated Files: Operations files"</a>.
+ */
 
 /*
  tempout/org/omg/CORBA/IDLTypeOperations.java
@@ -51,8 +51,8 @@
 {
     /**
      * The type attribute describes the type defined by an object
-     * derived from <code>IDLType</code>.
-     * @return the <code>TypeCode</code> defined by this object.
+     * derived from {@code IDLType}.
+     * @return the {@code TypeCode} defined by this object.
      */
     org.omg.CORBA.TypeCode type ();
 } // interface IDLTypeOperations
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java	Mon Sep 28 08:14:42 2015 -0700
@@ -32,7 +32,7 @@
  * exception is raised by ORB::string_to_object if the passed
  * string does not decode correctly. An ORB may choose to detect
  * calls via nil references (but is not obliged to do detect them).
- * <tt>INV_OBJREF</tt> is used to indicate this.<P>
+ * {@code INV_OBJREF} is used to indicate this.<P>
  * It contains a minor code, which gives more detailed information about
  * what caused the exception, and a completion status. It may also contain
  * a string describing the exception.
@@ -47,7 +47,7 @@
 
 public final class INV_OBJREF extends SystemException {
     /**
-     * Constructs an <code>INV_OBJREF</code> exception with a default
+     * Constructs an {@code INV_OBJREF} exception with a default
      * minor code of 0 and a completion state of COMPLETED_NO.
      */
     public INV_OBJREF() {
@@ -55,7 +55,7 @@
     }
 
     /**
-     * Constructs an <code>INV_OBJREF</code> exception with the specified detail
+     * Constructs an {@code INV_OBJREF} exception with the specified detail
      * message, a minor code of 0, and a completion state of COMPLETED_NO.
      * @param s the String containing a detail message
      */
@@ -64,10 +64,10 @@
     }
 
     /**
-     * Constructs an <code>INV_OBJREF</code> exception with the specified
+     * Constructs an {@code INV_OBJREF} exception with the specified
      * minor code and completion status.
      * @param minor the minor code
-     * @param completed a <code>CompletionStatus</code> instance indicating
+     * @param completed a {@code CompletionStatus} instance indicating
      *                  the completion status
      */
     public INV_OBJREF(int minor, CompletionStatus completed) {
@@ -75,12 +75,12 @@
     }
 
     /**
-     * Constructs an <code>INV_OBJREF</code> exception with the specified detail
+     * Constructs an {@code INV_OBJREF} exception with the specified detail
      * message, minor code, and completion status.
      * A detail message is a String that describes this particular exception.
      * @param s the String containing a detail message
      * @param minor the minor code
-     * @param completed a <code>CompletionStatus</code> instance indicating
+     * @param completed a {@code CompletionStatus} instance indicating
      *                  the completion status
      */
     public INV_OBJREF(String s, int minor, CompletionStatus completed) {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java	Mon Sep 28 08:14:42 2015 -0700
@@ -28,7 +28,7 @@
 /**
  * Standard exception  thrown
  * when an invocation cannot be made because of an incompatibility between
- * <tt>Policy</tt> overrides that apply to the particular invocation.
+ * {@code Policy} overrides that apply to the particular invocation.
  * It contains a minor code, which gives more detailed information about
  * what caused the exception, and a completion status. It may also contain
  * a string describing the exception.
@@ -39,7 +39,7 @@
 
 public final class INV_POLICY extends SystemException {
     /**
-     * Constructs a <code>INV_POLICY</code> exception with a default minor code
+     * Constructs a {@code INV_POLICY} exception with a default minor code
      * of 0, a completion state of CompletionStatus.COMPLETED_NO,
      * and a null description.
      */
@@ -48,7 +48,7 @@
     }
 
     /**
-     * Constructs a <code>INV_POLICY</code> exception with the
+     * Constructs a {@code INV_POLICY} exception with the
      * specified description message,
      * a minor code of 0, and a completion state of COMPLETED_NO.
      * @param s the String containing a detail message
@@ -58,7 +58,7 @@
     }
 
     /**
-     * Constructs a <code>INV_POLICY</code> exception with the specified
+     * Constructs a {@code INV_POLICY} exception with the specified
      * minor code and completion status.
      * @param minor the minor code
      * @param completed the completion status
@@ -68,7 +68,7 @@
     }
 
     /**
-     * Constructs a <code>INV_POLICY</code> exception with the
+     * Constructs a {@code INV_POLICY} exception with the
      * specified description message, minor code, and completion status.
      * @param s the String containing a description message
      * @param minor the minor code
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,10 +26,10 @@
 
 
 /**
-* The interface for <tt>IRObject</tt>.  For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
-* "Generated Files: Operations files"</a>.
-*/
+ * The interface for {@code IRObject}.  For more information on
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
+ * "Generated Files: Operations files"</a>.
+ */
 
 /*
  tempout/org/omg/CORBA/IRObjectOperations.java
@@ -39,7 +39,7 @@
 */
 
 /**
- * This is the Operations interface for the mapping from <tt>IRObject</tt>.
+ * This is the Operations interface for the mapping from {@code IRObject}.
  * Several interfaces are used as base interfaces for objects in
  * the Interface Repository (IR). These base interfaces are not instantiable.
  * A common set of operations is used to locate objects within the
@@ -59,8 +59,8 @@
 
     // read interface
     /**
-     * Returns the <code>DefinitionKind</code> corresponding to this Interface Repository object.
-     * @return the <code>DefinitionKind</code> corresponding to this Interface Repository object.
+     * Returns the {@code DefinitionKind} corresponding to this Interface Repository object.
+     * @return the {@code DefinitionKind} corresponding to this Interface Repository object.
      */
     org.omg.CORBA.DefinitionKind def_kind ();
 
@@ -70,13 +70,13 @@
      * this method is applied to all its contents. If the object contains an IDLType
      * attribute for an anonymous type, that IDLType is destroyed.
      * If the object is currently contained in some other object, it is removed.
-     * If the method is invoked on a <code>Repository</code> or on a <code>PrimitiveDef</code>
-     * then the <code>BAD_INV_ORDER</code> exception is raised with minor value 2.
+     * If the method is invoked on a {@code Repository} or on a {@code PrimitiveDef}
+     * then the {@code BAD_INV_ORDER} exception is raised with minor value 2.
      * An attempt to destroy an object that would leave the repository in an
-     * incoherent state causes <code>BAD_INV_ORDER</code> exception to be raised
+     * incoherent state causes {@code BAD_INV_ORDER} exception to be raised
      * with the minor code 1.
      * @exception BAD_INV_ORDER if this method is invoked on a repository or
-     *            <code>PrimitiveDef</code>, or if an attempt to destroy an
+     *            {@code PrimitiveDef}, or if an attempt to destroy an
      *            object would leave the repository in an incoherent state
      */
     void destroy ();
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>Identifier</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/IdentifierHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
-* 03 June 1999 11:33:42 o'clock GMT+00:00
-*/
+ * The Helper for {@code Identifier}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/IdentifierHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ir.idl
+ * 03 June 1999 11:33:42 o'clock GMT+00:00
+ */
 
 abstract public class IdentifierHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -30,57 +30,57 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Int</tt>.  For more information on
+ * The Holder for {@code Int}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for an <code>int</code>
+ * A Holder class for an {@code int}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>long</code> as an "out"
+ * If an IDL method signature has an IDL {@code long} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>IntHolder</code> as the corresponding
+ * {@code IntHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myIntHolder</code> is an instance of <code>IntHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myIntHolder.value</code>.
+ * If {@code myIntHolder} is an instance of {@code IntHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myIntHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class IntHolder implements Streamable {
 
     /**
-     * The <code>int</code> value held by this <code>IntHolder</code>
-     * object in its <code>value</code> field.
+     * The {@code int} value held by this {@code IntHolder}
+     * object in its {@code value} field.
      */
     public int value;
 
     /**
-     * Constructs a new <code>IntHolder</code> object with its
-     * <code>value</code> field initialized to <code>0</code>.
+     * Constructs a new {@code IntHolder} object with its
+     * {@code value} field initialized to {@code 0}.
      */
     public IntHolder() {
     }
 
     /**
-     * Constructs a new <code>IntHolder</code> object with its
-     * <code>value</code> field initialized to the given
-     * <code>int</code>.
-     * @param initial the <code>int</code> with which to initialize
-     *                the <code>value</code> field of the newly-created
-     *                <code>IntHolder</code> object
+     * Constructs a new {@code IntHolder} object with its
+     * {@code value} field initialized to the given
+     * {@code int}.
+     * @param initial the {@code int} with which to initialize
+     *                the {@code value} field of the newly-created
+     *                {@code IntHolder} object
      */
     public IntHolder(int initial) {
         value = initial;
     }
 
     /**
-     * Reads unmarshalled data from <code>input</code> and assigns it to
-     * the <code>value</code> field in this <code>IntHolder</code> object.
+     * Reads unmarshalled data from {@code input} and assigns it to
+     * the {@code value} field in this {@code IntHolder} object.
      *
-     * @param input the <code>InputStream</code> object containing CDR
+     * @param input the {@code InputStream} object containing CDR
      *              formatted data from the wire
      */
     public void _read(InputStream input) {
@@ -88,10 +88,10 @@
     }
 
     /**
-     * Marshals the value in this <code>IntHolder</code> object's
-     * <code>value</code> field to the output stream <code>output</code>.
+     * Marshals the value in this {@code IntHolder} object's
+     * {@code value} field to the output stream {@code output}.
      *
-     * @param output the <code>OutputStream</code> object that will contain
+     * @param output the {@code OutputStream} object that will contain
      *               the CDR formatted data
      */
     public void _write(OutputStream output) {
@@ -99,11 +99,11 @@
     }
 
     /**
-     * Retrieves the <code>TypeCode</code> object that corresponds
-     * to the value held in this <code>IntHolder</code> object's
-     * <code>value</code> field.
+     * Retrieves the {@code TypeCode} object that corresponds
+     * to the value held in this {@code IntHolder} object's
+     * {@code value} field.
      *
-     * @return    the type code for the value held in this <code>IntHolder</code>
+     * @return    the type code for the value held in this {@code IntHolder}
      *            object
      */
     public org.omg.CORBA.TypeCode _type() {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java	Mon Sep 28 08:14:42 2015 -0700
@@ -30,26 +30,26 @@
 /**
  * Used as a base class for implementation of a local IDL interface in the
  * Java language mapping.  It is a class which implements all the operations
- * in the <tt>org.omg.CORBA.Object</tt> interface.
+ * in the {@code org.omg.CORBA.Object} interface.
  * <P>Local interfaces are implemented by using CORBA::LocalObject
- *  to provide implementations of <code>Object</code> pseudo
- *  operations and any other ORB-specific support mechanisms that are
- *  appropriate for such objects.  Object implementation techniques are
- *  inherently language-mapping specific.  Therefore, the
- *  <code>LocalObject</code> type is not defined in IDL, but is specified
- *  in each language mapping.
- *  <P>Methods that do not apply to local objects throw
- *  an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with the message,
- *  "This is a locally contrained object."  Attempting to use a
- *  <TT>LocalObject</TT> to create a DII request results in NO_IMPLEMENT
- *  system exception.  Attempting to marshal or stringify a
- *  <TT>LocalObject</TT> results in a MARSHAL system exception.  Narrowing
- *  and widening references to <TT>LocalObjects</TT> must work as for regular
- *  object references.
- *  <P><code>LocalObject</code> is to be used as the base class of locally
- *  constrained objects, such as those in the PortableServer module.
- *  The specification here is based on the CORBA Components
- *  Volume I - orbos/99-07-01
+ * to provide implementations of {@code Object} pseudo
+ * operations and any other ORB-specific support mechanisms that are
+ * appropriate for such objects.  Object implementation techniques are
+ * inherently language-mapping specific.  Therefore, the
+ * {@code LocalObject} type is not defined in IDL, but is specified
+ * in each language mapping.
+ * <P>Methods that do not apply to local objects throw
+ * an {@code org.omg.CORBA.NO_IMPLEMENT} exception with the message,
+ * "This is a locally contrained object."  Attempting to use a
+ * {@code LocalObject} to create a DII request results in NO_IMPLEMENT
+ * system exception.  Attempting to marshal or stringify a
+ * {@code LocalObject} results in a MARSHAL system exception.  Narrowing
+ * and widening references to {@code LocalObjects} must work as for regular
+ * object references.
+ * <P>{@code LocalObject} is to be used as the base class of locally
+ * constrained objects, such as those in the PortableServer module.
+ * The specification here is based on the CORBA Components
+ * Volume I - orbos/99-07-01
  *
  * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
  *      comments for unimplemented features</a>
@@ -60,7 +60,7 @@
     private static String reason = "This is a locally constrained object.";
 
     /**
-     * Constructs a default <code>LocalObject</code> instance.
+     * Constructs a default {@code LocalObject} instance.
      */
     public LocalObject() {}
 
@@ -75,9 +75,9 @@
      * <P>Default implementation of the org.omg.CORBA.Object method.
      *
      * @param that the object reference with which to check for equivalence
-     * @return <code>true</code> if this object reference is known to be
+     * @return {@code true} if this object reference is known to be
      *         equivalent to the given object reference.
-     *         Note that <code>false</code> indicates only that the two
+     *         Note that {@code false} indicates only that the two
      *         object references are distinct, not necessarily that
      *         they reference distinct objects.
      */
@@ -86,11 +86,11 @@
     }
 
     /**
-     * Always returns <code>false</code>.
+     * Always returns {@code false}.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @return <code>false</code>
+     * @return {@code false}
      */
     public boolean _non_existent() {
         return false;
@@ -100,9 +100,9 @@
      * Returns a hash value that is consistent for the
      * lifetime of the object, using the given number as the maximum.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param maximum an <code>int</code> identifying maximum value of
+     * @param maximum an {@code int} identifying maximum value of
      *                the hashcode
      * @return this instance's hashcode
      */
@@ -111,13 +111,13 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."  This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param repository_id a <code>String</code>
+     * @param repository_id a {@code String}
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @exception NO_IMPLEMENT because this is a locally constrained object
@@ -130,12 +130,12 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @return a duplicate of this <code>LocalObject</code> instance.
+     * @return a duplicate of this {@code LocalObject} instance.
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -145,10 +145,10 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -159,14 +159,14 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param operation a <code>String</code> giving the name of an operation
+     * @param operation a {@code String} giving the name of an operation
      *        to be performed by the request that is returned
-     * @return a <code>Request</code> object with the given operation
+     * @return a {@code Request} object with the given operation
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -176,20 +176,20 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param ctx          a <code>Context</code> object containing
+     * @param ctx          a {@code Context} object containing
      *                     a list of properties
-     * @param operation    the <code>String</code> representing the name of the
+     * @param operation    the {@code String} representing the name of the
      *                     method to be invoked
-     * @param arg_list     an <code>NVList</code> containing the actual arguments
+     * @param arg_list     an {@code NVList} containing the actual arguments
      *                     to the method being invoked
-     * @param result       a <code>NamedValue</code> object to serve as a
+     * @param result       a {@code NamedValue} object to serve as a
      *                     container for the method's return value
-     * @return a new <code>Request</code> object initialized with the given
+     * @return a new {@code Request} object initialized with the given
      * arguments
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -203,25 +203,25 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param ctx          a <code>Context</code> object containing
+     * @param ctx          a {@code Context} object containing
      *                     a list of properties
      * @param operation    the name of the method to be invoked
-     * @param arg_list     an <code>NVList</code> containing the actual arguments
+     * @param arg_list     an {@code NVList} containing the actual arguments
      *                     to the method being invoked
-     * @param result       a <code>NamedValue</code> object to serve as a
+     * @param result       a {@code NamedValue} object to serve as a
      *                     container for the method's return value
-     * @param exceptions   an <code>ExceptionList</code> object containing a
+     * @param exceptions   an {@code ExceptionList} object containing a
      *                     list of possible exceptions the method can throw
-     * @param contexts     a <code>ContextList</code> object containing a list of
+     * @param contexts     a {@code ContextList} object containing a list of
      *                     context strings that need to be resolved and sent
      *                     with the
-     *                     <code>Request</code> instance
-     * @return the new <code>Request</code> object initialized with the given
+     *                     {@code Request} instance
+     * @return the new {@code Request} object initialized with the given
      * arguments
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -237,11 +237,11 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
@@ -256,10 +256,10 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -278,12 +278,12 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      * @return the ORB instance that created the Delegate contained in this
-     * <code>ObjectImpl</code>
+     * {@code ObjectImpl}
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -293,13 +293,13 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param policy_type  an <code>int</code>
+     * @param policy_type  an {@code int}
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @exception NO_IMPLEMENT because this is a locally constrained object
@@ -313,11 +313,11 @@
 
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
@@ -328,11 +328,11 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @param policies an array
      * @param set_add a flag
@@ -351,13 +351,13 @@
 
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.<P>
-     * Returns <code>true</code> for this <code>LocalObject</code> instance.
+     * {@code org.omg.CORBA.Object} method.<P>
+     * Returns {@code true} for this {@code LocalObject} instance.
      *
-     * @return <code>true</code> always
+     * @return {@code true} always
      * @exception NO_IMPLEMENT
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
@@ -367,12 +367,12 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
-     * @param operation a <code>String</code> indicating which operation
+     * @param operation a {@code String} indicating which operation
      *                  to preinvoke
      * @param expectedType the class of the type of operation mentioned above
      * @return NO_IMPLEMENT because this is a locally constrained object
@@ -388,10 +388,10 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @param servant the servant object on which to post-invoke
      * @exception NO_IMPLEMENT
@@ -408,17 +408,17 @@
      */
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      * <P>Called by a stub to obtain an OutputStream for
      * marshaling arguments. The stub must supply the operation name,
      * and indicate if a response is expected (i.e is this a oneway call).
      *
      * @param operation the name of the operation being requested
-     * @param responseExpected <code>true</code> if a response is expected,
-     *                         <code>false</code> if it is a one-way call
+     * @param responseExpected {@code true} if a response is expected,
+     *                         {@code false} if it is a one-way call
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @exception NO_IMPLEMENT because this is a locally constrained object
@@ -432,32 +432,32 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      * <P>Called to invoke an operation. The stub provides an
-     * <code>OutputStream</code> that was previously returned by a
-     * <code>_request()</code>
-     * call. <code>_invoke</code> returns an <code>InputStream</code> which
+     * {@code OutputStream} that was previously returned by a
+     * {@code _request()}
+     * call. {@code _invoke} returns an {@code InputStream} which
      * contains the
-     * marshaled reply. If an exception occurs, <code>_invoke</code> may throw an
-     * <code>ApplicationException</code> object which contains an
-     * <code>InputStream</code> from
+     * marshaled reply. If an exception occurs, {@code _invoke} may throw an
+     * {@code ApplicationException} object which contains an
+     * {@code InputStream} from
      * which the user exception state may be unmarshaled.
      *
-     * @param output the <code>OutputStream</code> to invoke
+     * @param output the {@code OutputStream} to invoke
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
      * @throws ApplicationException If an exception occurs,
-     * <code>_invoke</code> may throw an
-     * <code>ApplicationException</code> object which contains
-     * an <code>InputStream</code> from
+     * {@code _invoke} may throw an
+     * {@code ApplicationException} object which contains
+     * an {@code InputStream} from
      * which the user exception state may be unmarshaled.
      * @throws RemarshalException If an exception occurs,
-     * <code>_invoke</code> may throw an
-     * <code>ApplicationException</code> object which contains
-     * an <code>InputStream</code> from
+     * {@code _invoke} may throw an
+     * {@code ApplicationException} object which contains
+     * an {@code InputStream} from
      * which the user exception state may be unmarshaled.
      * @exception NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
@@ -471,17 +471,17 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object."
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      * <P>May optionally be called by a stub to release a
      * reply stream back to the ORB when the unmarshaling has
-     * completed. The stub passes the <code>InputStream</code> returned by
-     * <code>_invoke()</code> or
-     * <code>ApplicationException.getInputStream()</code>.
+     * completed. The stub passes the {@code InputStream} returned by
+     * {@code _invoke()} or
+     * {@code ApplicationException.getInputStream()}.
      * A null
-     * value may also be passed to <code>_releaseReply</code>, in which case the
+     * value may also be passed to {@code _releaseReply}, in which case the
      * method is a no-op.
      *
      * @param input the reply stream back to the ORB or null
@@ -494,11 +494,11 @@
     }
 
     /**
-     * Throws an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with
+     * Throws an {@code org.omg.CORBA.NO_IMPLEMENT} exception with
      * the message "This is a locally constrained object." This method
      * does not apply to local objects and is therefore not implemented.
      * This method is the default implementation of the
-     * <code>org.omg.CORBA.Object</code> method.
+     * {@code org.omg.CORBA.Object} method.
      *
      * @return NO_IMPLEMENT because this is a locally constrained object
      *      and this method does not apply to local objects
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LongHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LongHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -30,54 +30,54 @@
 import org.omg.CORBA.portable.OutputStream;
 
 /**
- * The Holder for <tt>Long</tt>.  For more information on
+ * The Holder for {@code Long}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A Holder class for a <code>long</code>
+ * A Holder class for a {@code long}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>long long</code> as an "out"
+ * If an IDL method signature has an IDL {@code long long} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>LongHolder</code> as the corresponding
+ * {@code LongHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myLongHolder</code> is an instance of <code>LongHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myLongHolder.value</code>.
+ * If {@code myLongHolder} is an instance of {@code LongHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myLongHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class LongHolder implements Streamable {
 
     /**
-     * The <code>long</code> value held by this <code>LongHolder</code>
+     * The {@code long} value held by this {@code LongHolder}
      * object.
      */
     public long value;
 
     /**
-     * Constructs a new <code>LongHolder</code> object with its
-     * <code>value</code> field initialized to <code>0</code>.
+     * Constructs a new {@code LongHolder} object with its
+     * {@code value} field initialized to {@code 0}.
      */
     public LongHolder() {
     }
 
     /**
-     * Constructs a new <code>LongHolder</code> object with its
-     * <code>value</code> field initialized to the given
-     * <code>long</code>.
-     * @param initial the <code>long</code> with which to initialize
-     *                the <code>value</code> field of the newly-created
-     *                <code>LongHolder</code> object
+     * Constructs a new {@code LongHolder} object with its
+     * {@code value} field initialized to the given
+     * {@code long}.
+     * @param initial the {@code long} with which to initialize
+     *                the {@code value} field of the newly-created
+     *                {@code LongHolder} object
      */
     public LongHolder(long initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in the Holder
+     * Reads from {@code input} and initalizes the value in the Holder
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire
@@ -87,7 +87,7 @@
     }
 
     /**
-     * Marshals to <code>output</code> the value in the Holder.
+     * Marshals to {@code output} the value in the Holder.
      *
      * @param output the OutputStream which will contain the CDR formatted data
      */
@@ -96,7 +96,7 @@
     }
 
     /**
-     * Returns the <code>TypeCode</code> object
+     * Returns the {@code TypeCode} object
      * corresponding to the value held in the Holder.
      *
      * @return    the TypeCode of the value held in the holder
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>LongLongSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/LongLongSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code LongLongSeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/LongLongSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class LongLongSeqHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>LongLongSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/LongLongSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ * The Holder for {@code LongLongSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/LongLongSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ */
 
 public final class LongLongSeqHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>LongSeqHelper</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/LongSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code LongSeqHelper}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/LongSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class LongSeqHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>LongSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/LongSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ * The Holder for {@code LongSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/LongSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ */
 
 public final class LongSeqHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/MARSHAL.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/MARSHAL.java	Mon Sep 28 08:14:42 2015 -0700
@@ -31,7 +31,7 @@
  * or server-side run time. For example, if a reply from the server
  * indicates that the message contains 1000 bytes, but the actual
  * message is shorter or longer than 1000 bytes, the ORB raises
- * this exception. <tt>MARSHAL</tt> can also be caused by using
+ * this exception. {@code MARSHAL} can also be caused by using
  * the DII or DSI incorrectly, for example, if the type of the
  * actual parameters sent does not agree with IDL signature of an
  * operation.<P>
@@ -47,7 +47,7 @@
 
 public final class MARSHAL extends SystemException {
     /**
-     * Constructs a <code>MARSHAL</code> exception with a default minor code
+     * Constructs a {@code MARSHAL} exception with a default minor code
      * of 0, a completion state of CompletionStatus.COMPLETED_NO,
      * and a null description.
      */
@@ -56,7 +56,7 @@
     }
 
     /**
-     * Constructs a <code>MARSHAL</code> exception with the specified description message,
+     * Constructs a {@code MARSHAL} exception with the specified description message,
      * a minor code of 0, and a completion state of COMPLETED_NO.
      * @param s the String containing a description of the exception
      */
@@ -65,7 +65,7 @@
     }
 
     /**
-     * Constructs a <code>MARSHAL</code> exception with the specified
+     * Constructs a {@code MARSHAL} exception with the specified
      * minor code and completion status.
      * @param minor the minor code
      * @param completed the completion status
@@ -75,7 +75,7 @@
     }
 
     /**
-     * Constructs a <code>MARSHAL</code> exception with the specified description
+     * Constructs a {@code MARSHAL} exception with the specified description
      * message, minor code, and completion status.
      * @param s the String containing a description message
      * @param minor the minor code
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/NO_IMPLEMENT.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/NO_IMPLEMENT.java	Mon Sep 28 08:14:42 2015 -0700
@@ -28,7 +28,7 @@
 /**
  * This exception indicates that even though the operation that
  * was invoked exists (it has an IDL definition), no implementation
- * for that operation exists. <tt>NO_IMPLEMENT</tt> can, for
+ * for that operation exists. {@code NO_IMPLEMENT} can, for
  * example, be raised by an ORB if a client asks for an object's
  * type definition from the interface repository, but no interface
  * repository is provided by the ORB.<P>
@@ -44,7 +44,7 @@
 
 public final class NO_IMPLEMENT extends SystemException {
     /**
-     * Constructs a <code>NO_IMPLEMENT</code> exception with a default minor code
+     * Constructs a {@code NO_IMPLEMENT} exception with a default minor code
      * of 0, a completion state of CompletionStatus.COMPLETED_NO,
      * and a null description.
      */
@@ -53,7 +53,7 @@
     }
 
     /**
-     * Constructs a <code>NO_IMPLEMENT</code> exception with the specified description message,
+     * Constructs a {@code NO_IMPLEMENT} exception with the specified description message,
      * a minor code of 0, and a completion state of COMPLETED_NO.
      * @param s the String containing a description of the exception
      */
@@ -62,10 +62,10 @@
     }
 
     /**
-     * Constructs a <code>NO_IMPLEMENT</code> exception with the specified
+     * Constructs a {@code NO_IMPLEMENT} exception with the specified
      * minor code and completion status.
-     * @param minor an <code>int</code> specifying the minor code
-     * @param completed a <code>CompletionStatus</code> instance indicating
+     * @param minor an {@code int} specifying the minor code
+     * @param completed a {@code CompletionStatus} instance indicating
      *                  the completion status
      */
     public NO_IMPLEMENT(int minor, CompletionStatus completed) {
@@ -73,11 +73,11 @@
     }
 
     /**
-     * Constructs a <code>NO_IMPLEMENT</code> exception with the specified description
+     * Constructs a {@code NO_IMPLEMENT} exception with the specified description
      * message, minor code, and completion status.
      * @param s the String containing a description message
-     * @param minor an <code>int</code> specifying the minor code
-     * @param completed a <code>CompletionStatus</code> instance indicating
+     * @param minor an {@code int} specifying the minor code
+     * @param completed a {@code CompletionStatus} instance indicating
      *                  the completion status
      */
     public NO_IMPLEMENT(String s, int minor, CompletionStatus completed) {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePair.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePair.java	Mon Sep 28 08:14:42 2015 -0700
@@ -28,33 +28,33 @@
 
 /**
  * Associates  a name with a value that is an
- * attribute of an IDL struct, and is used in the <tt>DynStruct</tt> APIs.
+ * attribute of an IDL struct, and is used in the {@code DynStruct} APIs.
  */
 
 public final class NameValuePair implements org.omg.CORBA.portable.IDLEntity {
 
     /**
-     * The name to be associated with a value by this <code>NameValuePair</code> object.
+     * The name to be associated with a value by this {@code NameValuePair} object.
      */
     public String id;
 
     /**
-     * The value to be associated with a name by this <code>NameValuePair</code> object.
+     * The value to be associated with a name by this {@code NameValuePair} object.
      */
     public org.omg.CORBA.Any value;
 
     /**
-     * Constructs an empty <code>NameValuePair</code> object.
+     * Constructs an empty {@code NameValuePair} object.
      * To associate a name with a value after using this constructor, the fields
      * of this object have to be accessed individually.
      */
     public NameValuePair() { }
 
     /**
-     * Constructs a <code>NameValuePair</code> object that associates
-     * the given name with the given <code>org.omg.CORBA.Any</code> object.
-     * @param __id the name to be associated with the given <code>Any</code> object
-     * @param __value the <code>Any</code> object to be associated with the given name
+     * Constructs a {@code NameValuePair} object that associates
+     * the given name with the given {@code org.omg.CORBA.Any} object.
+     * @param __id the name to be associated with the given {@code Any} object
+     * @param __value the {@code Any} object to be associated with the given name
      */
     public NameValuePair(String __id, org.omg.CORBA.Any __value) {
         id = __id;
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePairHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePairHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,13 +26,13 @@
 
 
 /**
-* The Helper for <tt>NameValuePair</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/NameValuePairHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* 03 June 1999 11:52:03 o'clock GMT+00:00
-*/
+ * The Helper for {@code NameValuePair}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/NameValuePairHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * 03 June 1999 11:52:03 o'clock GMT+00:00
+ */
 
 abstract public class NameValuePairHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java	Mon Sep 28 08:14:42 2015 -0700
@@ -40,7 +40,7 @@
 
 /**
  * A class providing APIs for the CORBA Object Request Broker
- * features.  The <code>ORB</code> class also provides
+ * features.  The {@code ORB} class also provides
  * "pluggable ORB implementation" APIs that allow another vendor's ORB
  * implementation to be used.
  * <P>
@@ -49,12 +49,12 @@
  * objects servicing requests (servers).
  * <P>
  *
- * The <code>ORB</code> class, which
+ * The {@code ORB} class, which
  * encapsulates generic CORBA functionality, does the following:
  * (Note that items 5 and 6, which include most of the methods in
- * the class <code>ORB</code>, are typically used with the <code>Dynamic Invocation
- * Interface</code> (DII) and the <code>Dynamic Skeleton Interface</code>
- * (DSI).
+ * the class {@code ORB}, are typically used with the
+ * {@code Dynamic Invocation Interface} (DII) and
+ * the {@code Dynamic Skeleton Interface} (DSI).
  * These interfaces may be used by a developer directly, but
  * most commonly they are used by the ORB internally and are
  * not seen by the general programmer.)
@@ -62,29 +62,29 @@
  * <li> initializes the ORB implementation by supplying values for
  *      predefined properties and environmental parameters
  * <li> obtains initial object references to services such as
- * the NameService using the method <code>resolve_initial_references</code>
+ * the NameService using the method {@code resolve_initial_references}
  * <li> converts object references to strings and back
  * <li> connects the ORB to a servant (an instance of a CORBA object
  * implementation) and disconnects the ORB from a servant
  * <li> creates objects such as
  *   <ul>
- *   <li><code>TypeCode</code>
- *   <li><code>Any</code>
- *   <li><code>NamedValue</code>
- *   <li><code>Context</code>
- *   <li><code>Environment</code>
- *   <li>lists (such as <code>NVList</code>) containing these objects
+ *   <li>{@code TypeCode}
+ *   <li>{@code Any}
+ *   <li>{@code NamedValue}
+ *   <li>{@code Context}
+ *   <li>{@code Environment}
+ *   <li>lists (such as {@code NVList}) containing these objects
  *   </ul>
  * <li> sends multiple messages in the DII
  * </OL>
  *
  * <P>
- * The <code>ORB</code> class can be used to obtain references to objects
+ * The {@code ORB} class can be used to obtain references to objects
  * implemented anywhere on the network.
  * <P>
  * An application or applet gains access to the CORBA environment
- * by initializing itself into an <code>ORB</code> using one of
- * three <code>init</code> methods.  Two of the three methods use the properties
+ * by initializing itself into an {@code ORB} using one of
+ * three {@code init} methods.  Two of the three methods use the properties
  * (associations of a name with a value) shown in the
  * table below.<BR>
  * <TABLE BORDER=1 SUMMARY="Standard Java CORBA Properties">
@@ -93,10 +93,10 @@
  *     <TR><TD>org.omg.CORBA.ORBClass</TD>
  *     <TD>class name of an ORB implementation</TD></TR>
  *     <TR><TD>org.omg.CORBA.ORBSingletonClass</TD>
- *     <TD>class name of the ORB returned by <code>init()</code></TD></TR>
+ *     <TD>class name of the ORB returned by {@code init()}</TD></TR>
  * </TABLE>
  * <P>
- * These properties allow a different vendor's <code>ORB</code>
+ * These properties allow a different vendor's {@code ORB}
  * implementation to be "plugged in."
  * <P>
  * When an ORB instance is being created, the class name of the ORB
@@ -122,12 +122,12 @@
  * <P>
  * Note that Java&nbsp;IDL provides a default implementation for the
  * fully-functional ORB and for the Singleton ORB.  When the method
- * <code>init</code> is given no parameters, the default Singleton
- * ORB is returned.  When the method <code>init</code> is given parameters
+ * {@code init} is given no parameters, the default Singleton
+ * ORB is returned.  When the method {@code init} is given parameters
  * but no ORB class is specified, the Java&nbsp;IDL ORB implementation
  * is returned.
  * <P>
- * The following code fragment creates an <code>ORB</code> object
+ * The following code fragment creates an {@code ORB} object
  * initialized with the default ORB Singleton.
  * This ORB has a
  * restricted implementation to prevent malicious applets from doing
@@ -138,9 +138,9 @@
  *    ORB orb = ORB.init();
  * </PRE>
  * <P>
- * The following code fragment creates an <code>ORB</code> object
- * for an application.  The parameter <code>args</code>
- * represents the arguments supplied to the application's <code>main</code>
+ * The following code fragment creates an {@code ORB} object
+ * for an application.  The parameter {@code args}
+ * represents the arguments supplied to the application's {@code main}
  * method.  Since the property specifies the ORB class to be
  * "SomeORBImplementation", the new ORB will be initialized with
  * that ORB implementation.  If p had been null,
@@ -153,7 +153,7 @@
  *    ORB orb = ORB.init(args, p);
  * </PRE>
  * <P>
- * The following code fragment creates an <code>ORB</code> object
+ * The following code fragment creates an {@code ORB} object
  * for the applet supplied as the first parameter.  If the given
  * applet does not specify an ORB class, the new ORB will be
  * initialized with the default Java&nbsp;IDL implementation.
@@ -271,27 +271,27 @@
     }
 
     /**
-     * Returns the <code>ORB</code> singleton object. This method always returns the
+     * Returns the {@code ORB} singleton object. This method always returns the
      * same ORB instance, which is an instance of the class described by the
-     * <code>org.omg.CORBA.ORBSingletonClass</code> system property.
+     * {@code org.omg.CORBA.ORBSingletonClass} system property.
      * <P>
-     * This no-argument version of the method <code>init</code> is used primarily
-     * as a factory for <code>TypeCode</code> objects, which are used by
-     * <code>Helper</code> classes to implement the method <code>type</code>.
-     * It is also used to create <code>Any</code> objects that are used to
-     * describe <code>union</code> labels (as part of creating a <code>
-     * TypeCode</code> object for a <code>union</code>).
+     * This no-argument version of the method {@code init} is used primarily
+     * as a factory for {@code TypeCode} objects, which are used by
+     * {@code Helper} classes to implement the method {@code type}.
+     * It is also used to create {@code Any} objects that are used to
+     * describe {@code union} labels (as part of creating a
+     * {@code TypeCode} object for a {@code union}).
      * <P>
      * This method is not intended to be used by applets, and in the event
      * that it is called in an applet environment, the ORB it returns
      * is restricted so that it can be used only as a factory for
-     * <code>TypeCode</code> objects.  Any <code>TypeCode</code> objects
+     * {@code TypeCode} objects.  Any {@code TypeCode} objects
      * it produces can be safely shared among untrusted applets.
      * <P>
      * If an ORB is created using this method from an applet,
      * a system exception will be thrown if
      * methods other than those for
-     * creating <code>TypeCode</code> objects are invoked.
+     * creating {@code TypeCode} objects are invoked.
      *
      * @return the singleton ORB
      *
@@ -350,13 +350,13 @@
     }
 
     /**
-     * Creates a new <code>ORB</code> instance for a standalone
+     * Creates a new {@code ORB} instance for a standalone
      * application.  This method may be called from applications
-     * only and returns a new fully functional <code>ORB</code> object
+     * only and returns a new fully functional {@code ORB} object
      * each time it is called.
-     * @param args command-line arguments for the application's <code>main</code>
-     *             method; may be <code>null</code>
-     * @param props application-specific properties; may be <code>null</code>
+     * @param args command-line arguments for the application's {@code main}
+     *             method; may be {@code null}
+     * @param props application-specific properties; may be {@code null}
      * @return the newly-created ORB instance
      *
      * @implNote
@@ -394,11 +394,11 @@
 
 
     /**
-     * Creates a new <code>ORB</code> instance for an applet.  This
+     * Creates a new {@code ORB} instance for an applet.  This
      * method may be called from applets only and returns a new
-     * fully-functional <code>ORB</code> object each time it is called.
-     * @param app the applet; may be <code>null</code>
-     * @param props applet-specific properties; may be <code>null</code>
+     * fully-functional {@code ORB} object each time it is called.
+     * @param app the applet; may be {@code null}
+     * @param props applet-specific properties; may be {@code null}
      * @return the newly-created ORB instance
      *
      * @implNote
@@ -430,11 +430,11 @@
      * Allows the ORB implementation to be initialized with the given
      * parameters and properties. This method, used in applications only,
      * is implemented by subclass ORB implementations and called
-     * by the appropriate <code>init</code> method to pass in its parameters.
+     * by the appropriate {@code init} method to pass in its parameters.
      *
-     * @param args command-line arguments for the application's <code>main</code>
-     *             method; may be <code>null</code>
-     * @param props application-specific properties; may be <code>null</code>
+     * @param args command-line arguments for the application's {@code main}
+     *             method; may be {@code null}
+     * @param props application-specific properties; may be {@code null}
      */
     abstract protected void set_parameters(String[] args, Properties props);
 
@@ -442,10 +442,10 @@
      * Allows the ORB implementation to be initialized with the given
      * applet and parameters. This method, used in applets only,
      * is implemented by subclass ORB implementations and called
-     * by the appropriate <code>init</code> method to pass in its parameters.
+     * by the appropriate {@code init} method to pass in its parameters.
      *
-     * @param app the applet; may be <code>null</code>
-     * @param props applet-specific properties; may be <code>null</code>
+     * @param app the applet; may be {@code null}
+     * @param props applet-specific properties; may be {@code null}
      */
     abstract protected void set_parameters(Applet app, Properties props);
 
@@ -453,17 +453,17 @@
      * Connects the given servant object (a Java object that is
      * an instance of the server implementation class)
      * to the ORB. The servant class must
-     * extend the <code>ImplBase</code> class corresponding to the interface that is
+     * extend the {@code ImplBase} class corresponding to the interface that is
      * supported by the server. The servant must thus be a CORBA object
-     * reference, and inherit from <code>org.omg.CORBA.Object</code>.
+     * reference, and inherit from {@code org.omg.CORBA.Object}.
      * Servants created by the user can start receiving remote invocations
-     * after the method <code>connect</code> has been called. A servant may also be
+     * after the method {@code connect} has been called. A servant may also be
      * automatically and implicitly connected to the ORB if it is passed as
      * an IDL parameter in an IDL method invocation on a non-local object,
      * that is, if the servant object has to be marshalled and sent outside of the
      * process address space.
      * <P>
-     * Calling the method <code>connect</code> has no effect
+     * Calling the method {@code connect} has no effect
      * when the servant object is already connected to the ORB.
      * <P>
      * Deprecated by the OMG in favor of the Portable Object Adapter APIs.
@@ -477,17 +477,17 @@
     /**
      * Destroys the ORB so that its resources can be reclaimed.
      * Any operation invoked on a destroyed ORB reference will throw the
-     * <code>OBJECT_NOT_EXIST</code> exception.
-     * Once an ORB has been destroyed, another call to <code>init</code>
+     * {@code OBJECT_NOT_EXIST} exception.
+     * Once an ORB has been destroyed, another call to {@code init}
      * with the same ORBid will return a reference to a newly constructed ORB.<p>
-     * If <code>destroy</code> is called on an ORB that has not been shut down,
+     * If {@code destroy} is called on an ORB that has not been shut down,
      * it will start the shut down process and block until the ORB has shut down
      * before it destroys the ORB.<br>
-     * If an application calls <code>destroy</code> in a thread that is currently servicing
-     * an invocation, the <code>BAD_INV_ORDER</code> system exception will be thrown
+     * If an application calls {@code destroy} in a thread that is currently servicing
+     * an invocation, the {@code BAD_INV_ORDER} system exception will be thrown
      * with the OMG minor code 3, since blocking would result in a deadlock.<p>
      * For maximum portability and to avoid resource leaks, an application should
-     * always call <code>shutdown</code> and <code>destroy</code>
+     * always call {@code shutdown} and {@code destroy}
      * on all ORB instances before exiting.
      *
      * @throws org.omg.CORBA.BAD_INV_ORDER if the current thread is servicing an invocation
@@ -500,14 +500,14 @@
      * Disconnects the given servant object from the ORB. After this method returns,
      * the ORB will reject incoming remote requests for the disconnected
      * servant and will send the exception
-     * <code>org.omg.CORBA.OBJECT_NOT_EXIST</code> back to the
+     * {@code org.omg.CORBA.OBJECT_NOT_EXIST} back to the
      * remote client. Thus the object appears to be destroyed from the
      * point of view of remote clients. Note, however, that local requests issued
      * using the servant  directly do not
      * pass through the ORB; hence, they will continue to be processed by the
      * servant.
      * <P>
-     * Calling the method <code>disconnect</code> has no effect
+     * Calling the method {@code disconnect} has no effect
      * if the servant is not connected to the ORB.
      * <P>
      * Deprecated by the OMG in favor of the Portable Object Adapter APIs.
@@ -535,7 +535,7 @@
      * Returns a list of the initially available CORBA object references,
      * such as "NameService" and "InterfaceRepository".
      *
-     * @return an array of <code>String</code> objects that represent
+     * @return an array of {@code String} objects that represent
      *         the object references for CORBA services
      *         that are initially available with this ORB
      */
@@ -559,8 +559,8 @@
      * strings generated by a different ORB to be converted back into an object
      * reference.
      * <P>
-     * The resulting <code>String</code> object may be stored or communicated
-     * in any way that a <code>String</code> object can be manipulated.
+     * The resulting {@code String} object may be stored or communicated
+     * in any way that a {@code String} object can be manipulated.
      *
      * @param obj the object reference to stringify
      * @return the string representing the object reference
@@ -568,43 +568,43 @@
     abstract public String object_to_string(org.omg.CORBA.Object obj);
 
     /**
-     * Converts a string produced by the method <code>object_to_string</code>
+     * Converts a string produced by the method {@code object_to_string}
      * back to a CORBA object reference.
      *
      * @param str the string to be converted back to an object reference.  It must
      * be the result of converting an object reference to a string using the
-     * method <code>object_to_string</code>.
+     * method {@code object_to_string}.
      * @return the object reference
      */
     abstract public org.omg.CORBA.Object string_to_object(String str);
 
     /**
-     * Allocates an <code>NVList</code> with (probably) enough
-     * space for the specified number of <code>NamedValue</code> objects.
+     * Allocates an {@code NVList} with (probably) enough
+     * space for the specified number of {@code NamedValue} objects.
      * Note that the specified size is only a hint to help with
      * storage allocation and does not imply the maximum size of the list.
      *
-     * @param count  suggested number of <code>NamedValue</code> objects for
+     * @param count  suggested number of {@code NamedValue} objects for
      *               which to allocate space
-     * @return the newly-created <code>NVList</code>
+     * @return the newly-created {@code NVList}
      *
      * @see NVList
      */
     abstract public NVList create_list(int count);
 
     /**
-     * Creates an <code>NVList</code> initialized with argument
+     * Creates an {@code NVList} initialized with argument
      * descriptions for the operation described in the given
-     * <code>OperationDef</code> object.  This <code>OperationDef</code> object
+     * {@code OperationDef} object.  This {@code OperationDef} object
      * is obtained from an Interface Repository. The arguments in the
-     * returned <code>NVList</code> object are in the same order as in the
+     * returned {@code NVList} object are in the same order as in the
      * original IDL operation definition, which makes it possible for the list
      * to be used in dynamic invocation requests.
      *
-     * @param oper      the <code>OperationDef</code> object to use to create the list
-     * @return          a newly-created <code>NVList</code> object containing
+     * @param oper      the {@code OperationDef} object to use to create the list
+     * @return          a newly-created {@code NVList} object containing
      * descriptions of the arguments to the method described in the given
-     * <code>OperationDef</code> object
+     * {@code OperationDef} object
      *
      * @see NVList
      */
@@ -657,63 +657,63 @@
 
 
     /**
-     * Creates a <code>NamedValue</code> object
+     * Creates a {@code NamedValue} object
      * using the given name, value, and argument mode flags.
      * <P>
-     * A <code>NamedValue</code> object serves as (1) a parameter or return
+     * A {@code NamedValue} object serves as (1) a parameter or return
      * value or (2) a context property.
      * It may be used by itself or
-     * as an element in an <code>NVList</code> object.
+     * as an element in an {@code NVList} object.
      *
-     * @param s  the name of the <code>NamedValue</code> object
-     * @param any  the <code>Any</code> value to be inserted into the
-     *             <code>NamedValue</code> object
-     * @param flags  the argument mode flags for the <code>NamedValue</code>: one of
-     * <code>ARG_IN.value</code>, <code>ARG_OUT.value</code>,
-     * or <code>ARG_INOUT.value</code>.
+     * @param s  the name of the {@code NamedValue} object
+     * @param any  the {@code Any} value to be inserted into the
+     *             {@code NamedValue} object
+     * @param flags  the argument mode flags for the {@code NamedValue}: one of
+     * {@code ARG_IN.value}, {@code ARG_OUT.value},
+     * or {@code ARG_INOUT.value}.
      *
-     * @return  the newly-created <code>NamedValue</code> object
+     * @return  the newly-created {@code NamedValue} object
      * @see NamedValue
      */
     abstract public NamedValue create_named_value(String s, Any any, int flags);
 
     /**
-     * Creates an empty <code>ExceptionList</code> object.
+     * Creates an empty {@code ExceptionList} object.
      *
-     * @return  the newly-created <code>ExceptionList</code> object
+     * @return  the newly-created {@code ExceptionList} object
      */
     abstract public ExceptionList create_exception_list();
 
     /**
-     * Creates an empty <code>ContextList</code> object.
+     * Creates an empty {@code ContextList} object.
      *
-     * @return  the newly-created <code>ContextList</code> object
+     * @return  the newly-created {@code ContextList} object
      * @see ContextList
      * @see Context
      */
     abstract public ContextList create_context_list();
 
     /**
-     * Gets the default <code>Context</code> object.
+     * Gets the default {@code Context} object.
      *
-     * @return the default <code>Context</code> object
+     * @return the default {@code Context} object
      * @see Context
      */
     abstract public Context get_default_context();
 
     /**
-     * Creates an <code>Environment</code> object.
+     * Creates an {@code Environment} object.
      *
-     * @return  the newly-created <code>Environment</code> object
+     * @return  the newly-created {@code Environment} object
      * @see Environment
      */
     abstract public Environment create_environment();
 
     /**
-     * Creates a new <code>org.omg.CORBA.portable.OutputStream</code> into which
+     * Creates a new {@code org.omg.CORBA.portable.OutputStream} into which
      * IDL method parameters can be marshalled during method invocation.
-     * @return          the newly-created
-     *              <code>org.omg.CORBA.portable.OutputStream</code> object
+     * @return  the newly-created
+     *          {@code org.omg.CORBA.portable.OutputStream} object
      */
     abstract public org.omg.CORBA.portable.OutputStream create_output_stream();
 
@@ -722,31 +722,31 @@
      * any responses. Note that oneway invocations are not guaranteed to
      * reach the server.
      *
-     * @param req               an array of request objects
+     * @param req  an array of request objects
      */
     abstract public void send_multiple_requests_oneway(Request[] req);
 
     /**
      * Sends multiple dynamic (DII) requests asynchronously.
      *
-     * @param req               an array of <code>Request</code> objects
+     * @param req  an array of {@code Request} objects
      */
     abstract public void send_multiple_requests_deferred(Request[] req);
 
     /**
      * Finds out if any of the deferred (asynchronous) invocations have
      * a response yet.
-     * @return <code>true</code> if there is a response available;
-     *         <code> false</code> otherwise
+     * @return {@code true} if there is a response available;
+     *         {@code false} otherwise
      */
     abstract public boolean poll_next_response();
 
     /**
-     * Gets the next <code>Request</code> instance for which a response
+     * Gets the next {@code Request} instance for which a response
      * has been received.
      *
-     * @return          the next <code>Request</code> object ready with a response
-     * @exception WrongTransaction if the method <code>get_next_response</code>
+     * @return the next {@code Request} object ready with a response
+     * @exception WrongTransaction if the method {@code get_next_response}
      * is called from a transaction scope different
      * from the one from which the original request was sent. See the
      * OMG Transaction Service specification for details.
@@ -754,150 +754,150 @@
     abstract public Request get_next_response() throws WrongTransaction;
 
     /**
-     * Retrieves the <code>TypeCode</code> object that represents
+     * Retrieves the {@code TypeCode} object that represents
      * the given primitive IDL type.
      *
-     * @param tcKind    the <code>TCKind</code> instance corresponding to the
+     * @param tcKind    the {@code TCKind} instance corresponding to the
      *                  desired primitive type
-     * @return          the requested <code>TypeCode</code> object
+     * @return          the requested {@code TypeCode} object
      */
     abstract public TypeCode get_primitive_tc(TCKind tcKind);
 
     /**
-     * Creates a <code>TypeCode</code> object representing an IDL <code>struct</code>.
-     * The <code>TypeCode</code> object is initialized with the given id,
+     * Creates a {@code TypeCode} object representing an IDL {@code struct}.
+     * The {@code TypeCode} object is initialized with the given id,
      * name, and members.
      *
-     * @param id        the repository id for the <code>struct</code>
-     * @param name      the name of the <code>struct</code>
-     * @param members   an array describing the members of the <code>struct</code>
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              an IDL <code>struct</code>
+     * @param id        the repository id for the {@code struct}
+     * @param name      the name of the {@code struct}
+     * @param members   an array describing the members of the {@code struct}
+     * @return          a newly-created {@code TypeCode} object describing
+     *                  an IDL {@code struct}
      */
     abstract public TypeCode create_struct_tc(String id, String name,
                                               StructMember[] members);
 
     /**
-     * Creates a <code>TypeCode</code> object representing an IDL <code>union</code>.
-     * The <code>TypeCode</code> object is initialized with the given id,
+     * Creates a {@code TypeCode} object representing an IDL {@code union}.
+     * The {@code TypeCode} object is initialized with the given id,
      * name, discriminator type, and members.
      *
-     * @param id        the repository id of the <code>union</code>
-     * @param name      the name of the <code>union</code>
-     * @param discriminator_type        the type of the <code>union</code> discriminator
-     * @param members   an array describing the members of the <code>union</code>
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              an IDL <code>union</code>
+     * @param id        the repository id of the {@code union}
+     * @param name      the name of the {@code union}
+     * @param discriminator_type        the type of the {@code union} discriminator
+     * @param members   an array describing the members of the {@code union}
+     * @return          a newly-created {@code TypeCode} object describing
+     *                  an IDL {@code union}
      */
     abstract public TypeCode create_union_tc(String id, String name,
                                              TypeCode discriminator_type,
                                              UnionMember[] members);
 
     /**
-     * Creates a <code>TypeCode</code> object representing an IDL <code>enum</code>.
-     * The <code>TypeCode</code> object is initialized with the given id,
+     * Creates a {@code TypeCode} object representing an IDL {@code enum}.
+     * The {@code TypeCode} object is initialized with the given id,
      * name, and members.
      *
-     * @param id        the repository id for the <code>enum</code>
-     * @param name      the name for the <code>enum</code>
-     * @param members   an array describing the members of the <code>enum</code>
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              an IDL <code>enum</code>
+     * @param id        the repository id for the {@code enum}
+     * @param name      the name for the {@code enum}
+     * @param members   an array describing the members of the {@code enum}
+     * @return          a newly-created {@code TypeCode} object describing
+     *                  an IDL {@code enum}
      */
     abstract public TypeCode create_enum_tc(String id, String name, String[] members);
 
     /**
-     * Creates a <code>TypeCode</code> object representing an IDL <code>alias</code>
-     * (<code>typedef</code>).
-     * The <code>TypeCode</code> object is initialized with the given id,
+     * Creates a {@code TypeCode} object representing an IDL {@code alias}
+     * ({@code typedef}).
+     * The {@code TypeCode} object is initialized with the given id,
      * name, and original type.
      *
      * @param id        the repository id for the alias
      * @param name      the name for the alias
      * @param original_type
-     *                  the <code>TypeCode</code> object describing the original type
-     *          for which this is an alias
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              an IDL <code>alias</code>
+     *                  the {@code TypeCode} object describing the original type
+     *                  for which this is an alias
+     * @return          a newly-created {@code TypeCode} object describing
+     *                  an IDL {@code alias}
      */
     abstract public TypeCode create_alias_tc(String id, String name,
                                              TypeCode original_type);
 
     /**
-     * Creates a <code>TypeCode</code> object representing an IDL <code>exception</code>.
-     * The <code>TypeCode</code> object is initialized with the given id,
+     * Creates a {@code TypeCode} object representing an IDL {@code exception}.
+     * The {@code TypeCode} object is initialized with the given id,
      * name, and members.
      *
-     * @param id        the repository id for the <code>exception</code>
-     * @param name      the name for the <code>exception</code>
-     * @param members   an array describing the members of the <code>exception</code>
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              an IDL <code>exception</code>
+     * @param id        the repository id for the {@code exception}
+     * @param name      the name for the {@code exception}
+     * @param members   an array describing the members of the {@code exception}
+     * @return          a newly-created {@code TypeCode} object describing
+     *                  an IDL {@code exception}
      */
     abstract public TypeCode create_exception_tc(String id, String name,
                                                  StructMember[] members);
 
     /**
-     * Creates a <code>TypeCode</code> object representing an IDL <code>interface</code>.
-     * The <code>TypeCode</code> object is initialized with the given id
+     * Creates a {@code TypeCode} object representing an IDL {@code interface}.
+     * The {@code TypeCode} object is initialized with the given id
      * and name.
      *
-     * @param id        the repository id for the interface
-     * @param name      the name for the interface
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              an IDL <code>interface</code>
+     * @param id    the repository id for the interface
+     * @param name  the name for the interface
+     * @return      a newly-created {@code TypeCode} object describing
+     *              an IDL {@code interface}
      */
 
     abstract public TypeCode create_interface_tc(String id, String name);
 
     /**
-     * Creates a <code>TypeCode</code> object representing a bounded IDL
-     * <code>string</code>.
-     * The <code>TypeCode</code> object is initialized with the given bound,
+     * Creates a {@code TypeCode} object representing a bounded IDL
+     * {@code string}.
+     * The {@code TypeCode} object is initialized with the given bound,
      * which represents the maximum length of the string. Zero indicates
      * that the string described by this type code is unbounded.
      *
-     * @param bound     the bound for the <code>string</code>; cannot be negative
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              a bounded IDL <code>string</code>
+     * @param bound the bound for the {@code string}; cannot be negative
+     * @return      a newly-created {@code TypeCode} object describing
+     *              a bounded IDL {@code string}
      * @exception BAD_PARAM if bound is a negative value
      */
 
     abstract public TypeCode create_string_tc(int bound);
 
     /**
-     * Creates a <code>TypeCode</code> object representing a bounded IDL
-     * <code>wstring</code> (wide string).
-     * The <code>TypeCode</code> object is initialized with the given bound,
+     * Creates a {@code TypeCode} object representing a bounded IDL
+     * {@code wstring} (wide string).
+     * The {@code TypeCode} object is initialized with the given bound,
      * which represents the maximum length of the wide string. Zero indicates
      * that the string described by this type code is unbounded.
      *
-     * @param bound     the bound for the <code>wstring</code>; cannot be negative
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              a bounded IDL <code>wstring</code>
+     * @param bound the bound for the {@code wstring}; cannot be negative
+     * @return      a newly-created {@code TypeCode} object describing
+     *              a bounded IDL {@code wstring}
      * @exception BAD_PARAM if bound is a negative value
      */
     abstract public TypeCode create_wstring_tc(int bound);
 
     /**
-     * Creates a <code>TypeCode</code> object representing an IDL <code>sequence</code>.
-     * The <code>TypeCode</code> object is initialized with the given bound and
+     * Creates a {@code TypeCode} object representing an IDL {@code sequence}.
+     * The {@code TypeCode} object is initialized with the given bound and
      * element type.
      *
-     * @param bound     the bound for the <code>sequence</code>, 0 if unbounded
-     * @param element_type
-     *                  the <code>TypeCode</code> object describing the elements
-     *          contained in the <code>sequence</code>
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              an IDL <code>sequence</code>
+     * @param bound     the bound for the {@code sequence}, 0 if unbounded
+     * @param element_type the {@code TypeCode} object describing
+     *        the elements contained in the {@code sequence}
+     *
+     * @return  a newly-created {@code TypeCode} object describing
+     *          an IDL {@code sequence}
      */
     abstract public TypeCode create_sequence_tc(int bound, TypeCode element_type);
 
     /**
-     * Creates a <code>TypeCode</code> object representing a
-     * a recursive IDL <code>sequence</code>.
+     * Creates a {@code TypeCode} object representing a
+     * a recursive IDL {@code sequence}.
      * <P>
-     * For the IDL <code>struct</code> Node in following code fragment,
+     * For the IDL {@code struct} Node in following code fragment,
      * the offset parameter for creating its sequence would be 1:
      * <PRE>
      *    Struct Node {
@@ -907,10 +907,10 @@
      * </PRE>
      *
      * @param bound     the bound for the sequence, 0 if unbounded
-     * @param offset    the index to the enclosing <code>TypeCode</code> object
+     * @param offset    the index to the enclosing {@code TypeCode} object
      *                  that describes the elements of this sequence
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *                   a recursive sequence
+     * @return          a newly-created {@code TypeCode} object describing
+     *                  a recursive sequence
      * @deprecated Use a combination of create_recursive_tc and create_sequence_tc instead
      * @see #create_recursive_tc(String) create_recursive_tc
      * @see #create_sequence_tc(int, TypeCode) create_sequence_tc
@@ -919,20 +919,20 @@
     abstract public TypeCode create_recursive_sequence_tc(int bound, int offset);
 
     /**
-     * Creates a <code>TypeCode</code> object representing an IDL <code>array</code>.
-     * The <code>TypeCode</code> object is initialized with the given length and
+     * Creates a {@code TypeCode} object representing an IDL {@code array}.
+     * The {@code TypeCode} object is initialized with the given length and
      * element type.
      *
-     * @param length    the length of the <code>array</code>
-     * @param element_type  a <code>TypeCode</code> object describing the type
-     *                      of element contained in the <code>array</code>
-     * @return          a newly-created <code>TypeCode</code> object describing
-     *              an IDL <code>array</code>
+     * @param length    the length of the {@code array}
+     * @param element_type  a {@code TypeCode} object describing the type
+     *                      of element contained in the {@code array}
+     * @return  a newly-created {@code TypeCode} object describing
+     *          an IDL {@code array}
      */
     abstract public TypeCode create_array_tc(int length, TypeCode element_type);
 
     /**
-     * Create a <code>TypeCode</code> object for an IDL native type.
+     * Create a {@code TypeCode} object for an IDL native type.
      *
      * @param id        the logical id for the native type.
      * @param name      the name of the native type.
@@ -945,7 +945,7 @@
     }
 
     /**
-     * Create a <code>TypeCode</code> object for an IDL abstract interface.
+     * Create a {@code TypeCode} object for an IDL abstract interface.
      *
      * @param id        the logical id for the abstract interface type.
      * @param name      the name of the abstract interface type.
@@ -960,7 +960,7 @@
 
 
     /**
-     * Create a <code>TypeCode</code> object for an IDL fixed type.
+     * Create a {@code TypeCode} object for an IDL fixed type.
      *
      * @param digits    specifies the total number of decimal digits in the number
      *                  and must be from 1 to 31 inclusive.
@@ -977,7 +977,7 @@
 
 
     /**
-     * Create a <code>TypeCode</code> object for an IDL value type.
+     * Create a {@code TypeCode} object for an IDL value type.
      * The concrete_base parameter is the TypeCode for the immediate
      * concrete valuetype base of the valuetype for which the TypeCode
      * is being created.
@@ -987,7 +987,7 @@
      * @param name               the name of the value type.
      * @param type_modifier      one of the value type modifier constants:
      *                           VM_NONE, VM_CUSTOM, VM_ABSTRACT or VM_TRUNCATABLE
-     * @param concrete_base      a <code>TypeCode</code> object
+     * @param concrete_base      a {@code TypeCode} object
      *                           describing the concrete valuetype base
      * @param members            an array containing the members of the value type
      * @return                   the requested TypeCode
@@ -1002,14 +1002,14 @@
     }
 
     /**
-     * Create a recursive <code>TypeCode</code> object which
+     * Create a recursive {@code TypeCode} object which
      * serves as a placeholder for a concrete TypeCode during the process of creating
      * TypeCodes which contain recursion. The id parameter specifies the repository id of
      * the type for which the recursive TypeCode is serving as a placeholder. Once the
      * recursive TypeCode has been properly embedded in the enclosing TypeCode which
      * corresponds to the specified repository id, it will function as a normal TypeCode.
      * Invoking operations on the recursive TypeCode before it has been embedded in the
-     * enclosing TypeCode will result in a <code>BAD_TYPECODE</code> exception.
+     * enclosing TypeCode will result in a {@code BAD_TYPECODE} exception.
      * <P>
      * For example, the following IDL type declaration contains recursion:
      * <PRE>
@@ -1046,7 +1046,7 @@
     }
 
     /**
-     * Creates a <code>TypeCode</code> object for an IDL value box.
+     * Creates a {@code TypeCode} object for an IDL value box.
      *
      * @param id                 the logical id for the value type
      * @param name               the name of the value type
@@ -1064,11 +1064,11 @@
     // orbos 98-01-18: Objects By Value -- end
 
     /**
-     * Creates an IDL <code>Any</code> object initialized to
-     * contain a <code>Typecode</code> object whose <code>kind</code> field
-     * is set to <code>TCKind.tc_null</code>.
+     * Creates an IDL {@code Any} object initialized to
+     * contain a {@code Typecode} object whose {@code kind} field
+     * is set to {@code TCKind.tc_null}.
      *
-     * @return          a newly-created <code>Any</code> object
+     * @return          a newly-created {@code Any} object
      */
     abstract public Any create_any();
 
@@ -1076,15 +1076,15 @@
 
 
     /**
-     * Retrieves a <code>Current</code> object.
-     * The <code>Current</code> interface is used to manage thread-specific
+     * Retrieves a {@code Current} object.
+     * The {@code Current} interface is used to manage thread-specific
      * information for use by services such as transactions and security.
      *
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      *
-     * @return          a newly-created <code>Current</code> object
-     * @deprecated      use <code>resolve_initial_references</code>.
+     * @return          a newly-created {@code Current} object
+     * @deprecated      use {@code resolve_initial_references}.
      */
     @Deprecated
     public org.omg.CORBA.Current get_current()
@@ -1095,7 +1095,7 @@
     /**
      * This operation blocks the current thread until the ORB has
      * completed the shutdown process, initiated when some thread calls
-     * <code>shutdown</code>. It may be used by multiple threads which
+     * {@code shutdown}. It may be used by multiple threads which
      * get all notified when the ORB shuts down.
      *
      */
@@ -1107,29 +1107,29 @@
     /**
      * Instructs the ORB to shut down, which causes all
      * object adapters to shut down, in preparation for destruction.<br>
-     * If the <code>wait_for_completion</code> parameter
+     * If the {@code wait_for_completion} parameter
      * is true, this operation blocks until all ORB processing (including
      * processing of currently executing requests, object deactivation,
      * and other object adapter operations) has completed.
      * If an application does this in a thread that is currently servicing
-     * an invocation, the <code>BAD_INV_ORDER</code> system exception
+     * an invocation, the {@code BAD_INV_ORDER} system exception
      * will be thrown with the OMG minor code 3,
      * since blocking would result in a deadlock.<br>
-     * If the <code>wait_for_completion</code> parameter is <code>FALSE</code>,
+     * If the {@code wait_for_completion} parameter is {@code FALSE},
      * then shutdown may not have completed upon return.<p>
      * While the ORB is in the process of shutting down, the ORB operates as normal,
      * servicing incoming and outgoing requests until all requests have been completed.
      * Once an ORB has shutdown, only object reference management operations
      * may be invoked on the ORB or any object reference obtained from it.
-     * An application may also invoke the <code>destroy</code> operation on the ORB itself.
-     * Invoking any other operation will throw the <code>BAD_INV_ORDER</code>
+     * An application may also invoke the {@code destroy} operation on the ORB itself.
+     * Invoking any other operation will throw the {@code BAD_INV_ORDER}
      * system exception with the OMG minor code 4.<p>
-     * The <code>ORB.run</code> method will return after
-     * <code>shutdown</code> has been called.
+     * The {@code ORB.run} method will return after
+     * {@code shutdown} has been called.
      *
-     * @param wait_for_completion <code>true</code> if the call
+     * @param wait_for_completion {@code true} if the call
      *        should block until the shutdown is complete;
-     *        <code>false</code> if it should return immediately
+     *        {@code false} if it should return immediately
      * @throws org.omg.CORBA.BAD_INV_ORDER if the current thread is servicing
      *         an invocation
      */
@@ -1139,12 +1139,12 @@
     }
 
     /**
-     * Returns <code>true</code> if the ORB needs the main thread to
-     * perform some work, and <code>false</code> if the ORB does not
+     * Returns {@code true} if the ORB needs the main thread to
+     * perform some work, and {@code false} if the ORB does not
      * need the main thread.
      *
-     * @return <code>true</code> if there is work pending, meaning that the ORB
-     *         needs the main thread to perform some work; <code>false</code>
+     * @return {@code true} if there is work pending, meaning that the ORB
+     *         needs the main thread to perform some work; {@code false}
      *         if there is no work pending and thus the ORB does not need the
      *         main thread
      *
@@ -1157,7 +1157,7 @@
     /**
      * Performs an implementation-dependent unit of work if called
      * by the main thread. Otherwise it does nothing.
-     * The methods <code>work_pending</code> and <code>perform_work</code>
+     * The methods {@code work_pending} and {@code perform_work}
      * can be used in
      * conjunction to implement a simple polling loop that multiplexes
      * the main thread among the ORB and other activities.
@@ -1172,23 +1172,23 @@
      * Used to obtain information about CORBA facilities and services
      * that are supported by this ORB. The service type for which
      * information is being requested is passed in as the in
-     * parameter <tt>service_type</tt>, the values defined by
+     * parameter {@code service_type}, the values defined by
      * constants in the CORBA module. If service information is
      * available for that type, that is returned in the out parameter
-     * <tt>service_info</tt>, and the operation returns the
-     * value <tt>true</tt>. If no information for the requested
-     * services type is available, the operation returns <tt>false</tt>
+     * {@code service_info}, and the operation returns the
+     * value {@code true}. If no information for the requested
+     * services type is available, the operation returns {@code false}
      *  (i.e., the service is not supported by this ORB).
      *
-     * @param service_type a <code>short</code> indicating the
+     * @param service_type a {@code short} indicating the
      *        service type for which information is being requested
-     * @param service_info a <code>ServiceInformationHolder</code> object
-     *        that will hold the <code>ServiceInformation</code> object
+     * @param service_info a {@code ServiceInformationHolder} object
+     *        that will hold the {@code ServiceInformation} object
      *        produced by this method
-     * @return <code>true</code> if service information is available
-     *        for the <tt>service_type</tt>;
-     *         <tt>false</tt> if no information for the
-     *         requested services type is available
+     * @return {@code true} if service information is available
+     *        for the {@code service_type};
+     *        {@code false} if no information for the
+     *        requested services type is available
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      */
@@ -1201,13 +1201,13 @@
     // orbos 98-01-18: Objects By Value -- begin
 
     /**
-     * Creates a new <code>DynAny</code> object from the given
-     * <code>Any</code> object.
+     * Creates a new {@code DynAny} object from the given
+     * {@code Any} object.
      *
-     * @param value the <code>Any</code> object from which to create a new
-     *        <code>DynAny</code> object
-     * @return the new <code>DynAny</code> object created from the given
-     *         <code>Any</code> object
+     * @param value the {@code Any} object from which to create a new
+     *        {@code DynAny} object
+     * @return the new {@code DynAny} object created from the given
+     *         {@code Any} object
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      * @deprecated Use the new <a href="../DynamicAny/DynAnyFactory.html">DynAnyFactory</a> API instead
@@ -1219,15 +1219,15 @@
     }
 
     /**
-     * Creates a basic <code>DynAny</code> object from the given
-     * <code>TypeCode</code> object.
+     * Creates a basic {@code DynAny} object from the given
+     * {@code TypeCode} object.
      *
-     * @param type the <code>TypeCode</code> object from which to create a new
-     *        <code>DynAny</code> object
-     * @return the new <code>DynAny</code> object created from the given
-     *         <code>TypeCode</code> object
+     * @param type the {@code TypeCode} object from which to create a new
+     *        {@code DynAny} object
+     * @return the new {@code DynAny} object created from the given
+     *         {@code TypeCode} object
      * @throws org.omg.CORBA.ORBPackage.InconsistentTypeCode if the given
-     *         <code>TypeCode</code> object is not consistent with the operation.
+     *         {@code TypeCode} object is not consistent with the operation.
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      * @deprecated Use the new <a href="../DynamicAny/DynAnyFactory.html">DynAnyFactory</a> API instead
@@ -1239,15 +1239,15 @@
     }
 
     /**
-     * Creates a new <code>DynStruct</code> object from the given
-     * <code>TypeCode</code> object.
+     * Creates a new {@code DynStruct} object from the given
+     * {@code TypeCode} object.
      *
-     * @param type the <code>TypeCode</code> object from which to create a new
-     *        <code>DynStruct</code> object
-     * @return the new <code>DynStruct</code> object created from the given
-     *         <code>TypeCode</code> object
+     * @param type the {@code TypeCode} object from which to create a new
+     *        {@code DynStruct} object
+     * @return the new {@code DynStruct} object created from the given
+     *         {@code TypeCode} object
      * @throws org.omg.CORBA.ORBPackage.InconsistentTypeCode if the given
-     *         <code>TypeCode</code> object is not consistent with the operation.
+     *         {@code TypeCode} object is not consistent with the operation.
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      * @deprecated Use the new <a href="../DynamicAny/DynAnyFactory.html">DynAnyFactory</a> API instead
@@ -1259,15 +1259,15 @@
     }
 
     /**
-     * Creates a new <code>DynSequence</code> object from the given
-     * <code>TypeCode</code> object.
+     * Creates a new {@code DynSequence} object from the given
+     * {@code TypeCode} object.
      *
-     * @param type the <code>TypeCode</code> object from which to create a new
-     *        <code>DynSequence</code> object
-     * @return the new <code>DynSequence</code> object created from the given
-     *         <code>TypeCode</code> object
+     * @param type the {@code TypeCode} object from which to create a new
+     *        {@code DynSequence} object
+     * @return the new {@code DynSequence} object created from the given
+     *         {@code TypeCode} object
      * @throws org.omg.CORBA.ORBPackage.InconsistentTypeCode if the given
-     *         <code>TypeCode</code> object is not consistent with the operation.
+     *         {@code TypeCode} object is not consistent with the operation.
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      * @deprecated Use the new <a href="../DynamicAny/DynAnyFactory.html">DynAnyFactory</a> API instead
@@ -1280,15 +1280,15 @@
 
 
     /**
-     * Creates a new <code>DynArray</code> object from the given
-     * <code>TypeCode</code> object.
+     * Creates a new {@code DynArray} object from the given
+     * {@code TypeCode} object.
      *
-     * @param type the <code>TypeCode</code> object from which to create a new
-     *        <code>DynArray</code> object
-     * @return the new <code>DynArray</code> object created from the given
-     *         <code>TypeCode</code> object
+     * @param type the {@code TypeCode} object from which to create a new
+     *        {@code DynArray} object
+     * @return the new {@code DynArray} object created from the given
+     *         {@code TypeCode} object
      * @throws org.omg.CORBA.ORBPackage.InconsistentTypeCode if the given
-     *         <code>TypeCode</code> object is not consistent with the operation.
+     *         {@code TypeCode} object is not consistent with the operation.
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      * @deprecated Use the new <a href="../DynamicAny/DynAnyFactory.html">DynAnyFactory</a> API instead
@@ -1300,15 +1300,15 @@
     }
 
     /**
-     * Creates a new <code>DynUnion</code> object from the given
-     * <code>TypeCode</code> object.
+     * Creates a new {@code DynUnion} object from the given
+     * {@code TypeCode} object.
      *
-     * @param type the <code>TypeCode</code> object from which to create a new
-     *        <code>DynUnion</code> object
-     * @return the new <code>DynUnion</code> object created from the given
-     *         <code>TypeCode</code> object
+     * @param type the {@code TypeCode} object from which to create a new
+     *        {@code DynUnion} object
+     * @return the new {@code DynUnion} object created from the given
+     *         {@code TypeCode} object
      * @throws org.omg.CORBA.ORBPackage.InconsistentTypeCode if the given
-     *         <code>TypeCode</code> object is not consistent with the operation.
+     *         {@code TypeCode} object is not consistent with the operation.
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      * @deprecated Use the new <a href="../DynamicAny/DynAnyFactory.html">DynAnyFactory</a> API instead
@@ -1320,15 +1320,15 @@
     }
 
     /**
-     * Creates a new <code>DynEnum</code> object from the given
-     * <code>TypeCode</code> object.
+     * Creates a new {@code DynEnum} object from the given
+     * {@code TypeCode} object.
      *
-     * @param type the <code>TypeCode</code> object from which to create a new
-     *        <code>DynEnum</code> object
-     * @return the new <code>DynEnum</code> object created from the given
-     *         <code>TypeCode</code> object
+     * @param type the {@code TypeCode} object from which to create a new
+     *        {@code DynEnum} object
+     * @return the new {@code DynEnum} object created from the given
+     *         {@code TypeCode} object
      * @throws org.omg.CORBA.ORBPackage.InconsistentTypeCode if the given
-     *         <code>TypeCode</code> object is not consistent with the operation.
+     *         {@code TypeCode} object is not consistent with the operation.
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package
      *      comments for unimplemented features</a>
      * @deprecated Use the new <a href="../DynamicAny/DynAnyFactory.html">DynAnyFactory</a> API instead
@@ -1342,19 +1342,19 @@
     /**
     * Can be invoked to create new instances of policy objects
     * of a specific type with specified initial state. If
-    * <tt>create_policy</tt> fails to instantiate a new Policy
+    * {@code create_policy} fails to instantiate a new Policy
     * object due to its inability to interpret the requested type
-    * and content of the policy, it raises the <tt>PolicyError</tt>
+    * and content of the policy, it raises the {@code PolicyError}
     * exception with the appropriate reason.
-    * @param type the <tt>PolicyType</tt> of the policy object to
+    * @param type the {@code PolicyType} of the policy object to
     *        be created
     * @param val the value that will be used to set the initial
-    *        state of the <tt>Policy</tt> object that is created
-    * @return Reference to a newly created <tt>Policy</tt> object
-    *        of type specified by the <tt>type</tt> parameter and
-    *        initialized to a state specified by the <tt>val</tt>
+    *        state of the {@code Policy} object that is created
+    * @return Reference to a newly created {@code Policy} object
+    *        of type specified by the {@code type} parameter and
+    *        initialized to a state specified by the {@code val}
     *        parameter
-    * @throws <tt>org.omg.CORBA.PolicyError</tt> when the requested
+    * @throws org.omg.CORBA.PolicyError when the requested
     *        policy is not supported or a requested initial state
     *        for the policy is not supported.
     */
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -24,10 +24,10 @@
  */
 
 /**
-* The Helper for <tt>Object</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-*/
+ * The Helper for {@code Object}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ */
 
 /*
  * Licensed Materials - Property of IBM
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -31,55 +31,55 @@
 
 
 /**
- * The Holder for <tt>Object</tt>.  For more information on
+ * The Holder for {@code Object}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
  * A Holder class for a CORBA object reference (a value of type
- * <code>org.omg.CORBA.Object</code>).  It is usually
+ * {@code org.omg.CORBA.Object}).  It is usually
  * used to store "out" and "inout" parameters in IDL methods.
  * If an IDL method signature has a CORBA Object reference as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>ObjectHolder</code> as the corresponding
+ * {@code ObjectHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myObjectHolder</code> is an instance of <code>ObjectHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myObjectHolder.value</code>.
+ * If {@code myObjectHolder} is an instance of {@code ObjectHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myObjectHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class ObjectHolder implements Streamable {
     /**
-     * The <code>Object</code> value held by this <code>ObjectHolder</code>
+     * The {@code Object} value held by this {@code ObjectHolder}
      * object.
      */
     public Object value;
 
     /**
-     * Constructs a new <code>ObjectHolder</code> object with its
-     * <code>value</code> field initialized to <code>null</code>.
+     * Constructs a new {@code ObjectHolder} object with its
+     * {@code value} field initialized to {@code null}.
      */
     public ObjectHolder() {
     }
 
     /**
-     * Constructs a new <code>ObjectHolder</code> object with its
-     * <code>value</code> field initialized to the given
-     * <code>Object</code>.
-     * @param initial the <code>Object</code> with which to initialize
-     *                the <code>value</code> field of the newly-created
-     *                <code>ObjectHolder</code> object
+     * Constructs a new {@code ObjectHolder} object with its
+     * {@code value} field initialized to the given
+     * {@code Object}.
+     * @param initial the {@code Object} with which to initialize
+     *                the {@code value} field of the newly-created
+     *                {@code ObjectHolder} object
      */
     public ObjectHolder(Object initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in
-     * this <code>ObjectHolder</code> object
+     * Reads from {@code input} and initalizes the value in
+     * this {@code ObjectHolder} object
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire.
@@ -89,8 +89,8 @@
     }
 
     /**
-     * Marshals to <code>output</code> the value in
-     * this <code>ObjectHolder</code> object.
+     * Marshals to {@code output} the value in
+     * this {@code ObjectHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data.
      */
@@ -100,10 +100,10 @@
 
     /**
      * Returns the TypeCode corresponding to the value held in
-     * this <code>ObjectHolder</code> object
+     * this {@code ObjectHolder} object
      *
      * @return    the TypeCode of the value held in
-     *            this <code>ObjectHolder</code> object
+     *            this {@code ObjectHolder} object
      */
     public org.omg.CORBA.TypeCode _type() {
         return org.omg.CORBA.ORB.init().get_primitive_tc(TCKind.tk_objref);
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,26 +26,26 @@
 
 
 /**
-* The Helper for <tt>OctetSeq</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/OctetSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*
-* The class definition has been modified to conform to the following
-* OMG specifications :
-*   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
-*       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
-*   </ul>
-*/
+ * The Helper for {@code OctetSeq}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/OctetSeqHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ *
+ * The class definition has been modified to conform to the following
+ * OMG specifications :
+ *   <ul>
+ *       <li> ORB core as defined by CORBA 2.3.1
+ *       (<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://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
+ *       </li>
+ *   </ul>
+ */
 
 public abstract class OctetSeqHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>OctetSeq</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/OctetSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ * The Holder for {@code OctetSeq}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/OctetSeqHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from streams.idl
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
+ */
 
 public final class OctetSeqHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/Policy.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/Policy.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,21 +26,21 @@
 
 
 /**
-* Interfaces derived from the <tt>Policy</tt> interface allow an
-* ORB or CORBA service  access to certain choices that affect
-* its operation. This information is accessed in a structured
-* manner using interfaces derived from the <tt>Policy</tt>
-* interface defined in the CORBA module. A CORBA service does not
-* have to use this method of accessing operating options, but
-* may choose to do so. The Security Service in particular uses
-* this technique for associating Security Policy with objects
-* in the system.
-* An interface generated by the IDL-to-Java compiler.
-* org/omg/CORBA/Policy.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:20 AM PDT
-*/
+ * Interfaces derived from the {@code Policy} interface allow an
+ * ORB or CORBA service  access to certain choices that affect
+ * its operation. This information is accessed in a structured
+ * manner using interfaces derived from the {@code Policy}
+ * interface defined in the CORBA module. A CORBA service does not
+ * have to use this method of accessing operating options, but
+ * may choose to do so. The Security Service in particular uses
+ * this technique for associating Security Policy with objects
+ * in the system.
+ * An interface generated by the IDL-to-Java compiler.
+ * org/omg/CORBA/Policy.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:20 AM PDT
+ */
 
 public interface Policy extends PolicyOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>Policy</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/PolicyHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:20 AM PDT
-*/
+ * The Helper for {@code Policy}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/PolicyHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:20 AM PDT
+ */
 
 abstract public class PolicyHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -25,14 +25,14 @@
 package org.omg.CORBA;
 
 /**
-* The Holder for <tt>Policy</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/PolicyHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:20 AM PDT
-*/
+ * The Holder for {@code Policy}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/PolicyHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:20 AM PDT
+ */
 
 public final class PolicyHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>PolicyList</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/PolicyListHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT
-*/
+ * The Helper for {@code PolicyList}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/PolicyListHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:21 AM PDT
+ */
 
 abstract public class PolicyListHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyListHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Holder for <tt>PolicyList</tt>.  For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/PolicyListHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT
-*/
+ * The Holder for {@code PolicyList}. For more information on
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * "Generated Files: Holder Files"</a>.<P>
+ * org/omg/CORBA/PolicyListHolder.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:21 AM PDT
+ */
 
 public final class PolicyListHolder implements org.omg.CORBA.portable.Streamable
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyOperations.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyOperations.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,18 +26,18 @@
 
 
 /**
-* The interface for <tt>Policy</tt>.  For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
-* "Generated Files: Operations files"</a>.
-*<P>
-* org/omg/CORBA/PolicyOperations.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:20 AM PDT
-*/
+ * The interface for {@code Policy}. For more information on
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
+ * "Generated Files: Operations files"</a>.
+ * <P>
+ * org/omg/CORBA/PolicyOperations.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:20 AM PDT
+ */
 
 /**
- * Provides the operations for a <code>Policy</code> object.
+ * Provides the operations for a {@code Policy} object.
  */
 public interface PolicyOperations
 {
@@ -57,16 +57,16 @@
   int policy_type ();
 
   /**
-   * Returns a copy of the <code>Policy</code> object. The copy does not retain
+   * Returns a copy of the {@code Policy} object. The copy does not retain
    * any relationships that the policy had with any domain or object.
    *
-   * @return a copy of the <code>Policy</code> object
+   * @return a copy of the {@code Policy} object
    */
   org.omg.CORBA.Policy copy ();
 
   /**
-   * Destroys the <code>Policy</code> object.  It is the responsibility of
-   * the <code>Policy</code> object to determine whether it can be destroyed.
+   * Destroys the {@code Policy} object.  It is the responsibility of
+   * the {@code Policy} object to determine whether it can be destroyed.
    */
   void destroy ();
 } // interface PolicyOperations
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyTypeHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/PolicyTypeHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,14 +26,14 @@
 
 
 /**
-* The Helper for <tt>PolicyType</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/PolicyTypeHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:20 AM PDT
-*/
+ * The Helper for {@code PolicyType}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ * org/omg/CORBA/PolicyTypeHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * Saturday, July 17, 1999 12:26:20 AM PDT
+ */
 
 
 // basic Policy definition
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/PrincipalHolder.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/PrincipalHolder.java	Mon Sep 28 08:14:42 2015 -0700
@@ -31,22 +31,22 @@
 
 
 /**
- * The Holder for <tt>Principal</tt>.  For more information on
+ * The Holder for {@code Principal}. For more information on
  * Holder files, see <a href="doc-files/generatedfiles.html#holder">
  * "Generated Files: Holder Files"</a>.<P>
- * A container class for values of type <code>Principal</code>
+ * A container class for values of type {@code Principal}
  * that is used to store "out" and "inout" parameters in IDL methods.
- * If an IDL method signature has an IDL <code>Principal</code> as an "out"
+ * If an IDL method signature has an IDL {@code Principal} as an "out"
  * or "inout" parameter, the programmer must pass an instance of
- * <code>PrincipalHolder</code> as the corresponding
+ * {@code PrincipalHolder} as the corresponding
  * parameter in the method invocation; for "inout" parameters, the programmer
  * must also fill the "in" value to be sent to the server.
  * Before the method invocation returns, the ORB will fill in the
  * value corresponding to the "out" value returned from the server.
  * <P>
- * If <code>myPrincipalHolder</code> is an instance of <code>PrincipalHolder</code>,
- * the value stored in its <code>value</code> field can be accessed with
- * <code>myPrincipalHolder.value</code>.
+ * If {@code myPrincipalHolder} is an instance of {@code PrincipalHolder},
+ * the value stored in its {@code value} field can be accessed with
+ * {@code myPrincipalHolder.value}.
  *
  * @since       JDK1.2
  * @deprecated Deprecated by CORBA 2.2.
@@ -54,25 +54,25 @@
 @Deprecated
 public final class PrincipalHolder implements Streamable {
     /**
-     * The <code>Principal</code> value held by this <code>PrincipalHolder</code>
+     * The {@code Principal} value held by this {@code PrincipalHolder}
      * object.
      */
     public Principal value;
 
     /**
-     * Constructs a new <code>PrincipalHolder</code> object with its
-     * <code>value</code> field initialized to <code>null</code>.
+     * Constructs a new {@code PrincipalHolder} object with its
+     * {@code value} field initialized to {@code null}.
      */
     public PrincipalHolder() {
     }
 
     /**
-     * Constructs a new <code>PrincipalHolder</code> object with its
-     * <code>value</code> field initialized to the given
-     * <code>Principal</code> object.
-     * @param initial the <code>Principal</code> with which to initialize
-     *                the <code>value</code> field of the newly-created
-     *                <code>PrincipalHolder</code> object
+     * Constructs a new {@code PrincipalHolder} object with its
+     * {@code value} field initialized to the given
+     * {@code Principal} object.
+     * @param initial the {@code Principal} with which to initialize
+     *                the {@code value} field of the newly-created
+     *                {@code PrincipalHolder} object
      */
     public PrincipalHolder(Principal initial) {
         value = initial;
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/RepositoryIdHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/RepositoryIdHelper.java	Mon Sep 28 08:14:42 2015 -0700
@@ -26,15 +26,15 @@
 
 
 /**
-* The Helper for <tt>RepositoryId</tt>.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
-
-* org/omg/CORBA/RepositoryIdHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
-* 03 June 1999 11:33:43 o'clock GMT+00:00
-*/
+ * The Helper for {@code RepositoryId}. For more information on
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.<P>
+ *
+ * org/omg/CORBA/RepositoryIdHelper.java
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * from ir.idl
+ * 03 June 1999 11:33:43 o'clock GMT+00:00
+ */
 
 abstract public class RepositoryIdHelper
 {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetailHelper.java	Sun Sep 27 00:51:27 2015 +0300
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ServiceDetailHelper.java	Mon Sep 28 08:14:42 2015 -0700