Merge

Reviewed-by: hannesw, lagergren

.hgtags

@@ -310,3 +310,21 @@ e7dbbef69d12b6a74dfad331b7188e7f893e8d29 jdk9-b62
 4915246064b2f89d5f00c96e758686b7fdad36a6 jdk9-b65
 ff3fc75f3214ad7e03595be1b0d0f38d887b6f0e jdk9-b66
 56166ce66037952fa21e9f680b31bf8eb47312c0 jdk9-b67
+5b500c93ce4822d47061cd518ff3f72d9d8cb5b5 jdk9-b68
+d69c968463f0ae5d0b45de3fc14fe65171b23948 jdk9-b69
+43d0179ee9de3bfffae3417f09e07eb6d8efc963 jdk9-b70
+f66c185284727f6e6ffd27e9c45ed2dd9da0a691 jdk9-b71
+61d2d0629b6dbf4c091dc86151ade1b3ef34fffe jdk9-b72
+9b3a9d72f07b40c648de79961679f42283af1bb5 jdk9-b73
+7c577fda1855d03c04546694d514678f596508c9 jdk9-b74
+f55df5cfe11c97e4b58998b76f5bd00a73cde12d jdk9-b75
+eeea9adfd1e3d075ef82148c00a4847a1aab4d26 jdk9-b76
+c25e882cee9622ec75c4e9d60633539a2f0a8809 jdk9-b77
+c8753d0be1778944dc512ec86a459941ea1ad2c3 jdk9-b78
+3966bd3b8167419aa05c6718a4af1cf54b1e3c58 jdk9-b79
+3c9f5bd909ae7187f24622ee4b69f8a5756a9271 jdk9-b80
+2050b3a0aadcb0e024bf798197421d58e54ec8bf jdk9-b81
+6521875cb63e1d0121b30af56ebbc36db078c4c6 jdk9-b82
+f61a63b7d1e52e307abc0bfc751203155d362ec4 jdk9-b83
+51b2db2fa04c16d767b66113dbf08c5349ce382a jdk9-b84
+8392405ab038b22e69a3728e17dbdd9e3d3a22ed jdk9-b85

.hgtags-top-repo

@@ -310,3 +310,21 @@ ea38728b4f4bdd8fd0d7a89b18069f521cf05013 jdk9-b61
 7c31f9d7b932f7924f1258d52885b1c7c3e078c2 jdk9-b65
 dc6e8336f51bb6b67b7245766179eab5ca7720b4 jdk9-b66
 f546760134eb861fcfecd4ce611b0040b0d25a6a jdk9-b67
+70e4272790b6199e9ca89df2758ff9cb58ec4125 jdk9-b68
+1bcfd6b8726582cff5a42dbfc75903e36f9dd4fe jdk9-b69
+eed77fcd77711fcdba05f18fc22f37d86efb243c jdk9-b70
+c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71
+8582c35016fb6211b373810b6b172feccf9c483b jdk9-b72
+4c2cbaae528bce970dabbb5676005d379357f4b6 jdk9-b73
+57f3134853ecdd4a3ee2d4d26f22ba981d653d79 jdk9-b74
+8fd6eeb878606e39c908f12535f34ebbfd225a4a jdk9-b75
+d82072b699b880a1f647a5e2d7c0f86cec958941 jdk9-b76
+7972dc8f2a47f0c4cd8f02fa5662af41f028aa14 jdk9-b77
+8c40d4143ee13bdf8170c68cc384c36ab1e9fadb jdk9-b78
+ba08a9f79b9849716bae1f39f71333d47f604012 jdk9-b79
+f7c5ae2933c0b8510a420d1713a955e4ffc7ad0b jdk9-b80
+b8afcf91331d78626a583ec1b63164468d6f4181 jdk9-b81
+42b56d1f418523ecb61a49d7493302c80c8009cc jdk9-b82
+ce5c14d97d95084504c32b9320cb33cce4235588 jdk9-b83
+1c8134475511ffe6726677e1418a89a7a45e92d6 jdk9-b84
+1f345217c9bab05f192d00cf1665b3286c49ccdb jdk9-b85

common/autoconf/basics.m4

@@ -288,7 +288,7 @@ AC_DEFUN([BASIC_SETUP_TOOL],
   # Publish this variable in the help.
   AC_ARG_VAR($1, [Override default value for $1])
 
-  if test "x[$]$1" = x; then
+  if [[ -z "${$1+x}" ]]; then
     # The variable is not set by user, try to locate tool using the code snippet
     $2
   else
@@ -312,25 +312,32 @@ AC_DEFUN([BASIC_SETUP_TOOL],
       # for unknown variables in the end.
       CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 
-      # Check if the provided tool contains a complete path.
+      # Check if we try to supply an empty value
-      tool_specified="[$]$1"
+      if test "x[$]$1" = x; then
-      tool_basename="${tool_specified##*/}"
+        AC_MSG_NOTICE([Setting user supplied tool $1= (no value)])
-      if test "x$tool_basename" = "x$tool_specified"; then
-        # A command without a complete path is provided, search $PATH.
-        AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename])
-        AC_PATH_PROG($1, $tool_basename)
-        if test "x[$]$1" = x; then
-          AC_MSG_ERROR([User supplied tool $tool_basename could not be found])
-        fi
-      else
-        # Otherwise we believe it is a complete path. Use it as it is.
-        AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified])
         AC_MSG_CHECKING([for $1])
-        if test ! -x "$tool_specified"; then
+        AC_MSG_RESULT([disabled])
-          AC_MSG_RESULT([not found])
+      else
-          AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable])
+        # Check if the provided tool contains a complete path.
+        tool_specified="[$]$1"
+        tool_basename="${tool_specified##*/}"
+        if test "x$tool_basename" = "x$tool_specified"; then
+          # A command without a complete path is provided, search $PATH.
+          AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename])
+          AC_PATH_PROG($1, $tool_basename)
+          if test "x[$]$1" = x; then
+            AC_MSG_ERROR([User supplied tool $tool_basename could not be found])
+          fi
+        else
+          # Otherwise we believe it is a complete path. Use it as it is.
+          AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified])
+          AC_MSG_CHECKING([for $1])
+          if test ! -x "$tool_specified"; then
+            AC_MSG_RESULT([not found])
+            AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable])
+          fi
+          AC_MSG_RESULT([$tool_specified])
         fi
-        AC_MSG_RESULT([$tool_specified])
       fi
     fi
   fi
@@ -376,9 +383,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
 [
   # Start with tools that do not need have cross compilation support
   # and can be expected to be found in the default PATH. These tools are
-  # used by configure. Nor are these tools expected to be found in the
+  # used by configure.
-  # devkit from the builddeps server either, since they are
-  # needed to download the devkit.
 
   # First are all the simple required tools.
   BASIC_REQUIRE_PROGS(BASENAME, basename)
@@ -436,8 +441,8 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   BASIC_PATH_PROGS(CYGPATH, cygpath)
   BASIC_PATH_PROGS(READLINK, [greadlink readlink])
   BASIC_PATH_PROGS(DF, df)
-  BASIC_PATH_PROGS(SETFILE, SetFile)
   BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
+  BASIC_PATH_PROGS(NICE, nice)
 ])
 
 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
@@ -446,6 +451,15 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   # 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
@@ -574,10 +588,11 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   )
 
   if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
-    # detect if Xcode is installed by running xcodebuild -version
+    # If a devkit has been supplied, find xcodebuild in the toolchain_path.
+    # If not, detect if Xcode is installed by running xcodebuild -version
     # if no Xcode installed, xcodebuild exits with 1
     # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
-    if /usr/bin/xcodebuild -version >/dev/null 2>&1; then
+    if test "x$DEVKIT_ROOT" != x || /usr/bin/xcodebuild -version >/dev/null 2>&1; then
       # We need to use xcodebuild in the toolchain dir provided by the user, this will
       # fall back on the stub binary in /usr/bin/xcodebuild
       AC_PATH_PROG([XCODEBUILD], [xcodebuild], [/usr/bin/xcodebuild], [$TOOLCHAIN_PATH])
@@ -935,6 +950,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   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
@@ -961,6 +977,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
         AC_MSG_RESULT([yes])
       fi
     fi
+    BASIC_REQUIRE_PROGS(SETFILE, SetFile)
   fi
 ])
 

common/autoconf/boot-jdk.m4

@@ -108,12 +108,6 @@ AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS],
   fi
 ])
 
-# Test: Is bootjdk available from builddeps?
-AC_DEFUN([BOOTJDK_CHECK_BUILDDEPS],
-[
-  BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=maybe], [BOOT_JDK_FOUND=no])
-])
-
 # Test: Is $JAVA_HOME set?
 AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
 [
@@ -276,9 +270,6 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
     AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK])
   fi
 
-  # Test: Is bootjdk available from builddeps?
-  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_BUILDDEPS])
-
   # Test: On MacOS X, can we find a boot jdk using /usr/libexec/java_home?
   BOOTJDK_DO_CHECK([BOOTJDK_CHECK_MACOSX_JAVA_LOCATOR])
 

common/autoconf/build-aux/config.guess

@@ -86,4 +86,11 @@ if [ "x$OUT" = x ]; then
   fi
 fi
 
+# Test and fix cpu on Macosx when C preprocessor is not on the path
+echo $OUT | grep i386-apple-darwin > /dev/null 2> /dev/null
+if test $? = 0; then
+  REAL_CPU=`uname -m`
+  OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'`
+fi
+
 echo $OUT

common/autoconf/builddeps.conf.example

@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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
-# 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.
-#
-
-# This is a configuration example using builddeps
-# that are downloaded from an ftp server.
-# This is how you use it:
-
-#configure --with-builddeps-server=ftp://builddeps.server/adir \
-#          --with-builddeps-conf=..../builddeps.conf.example
-#          --with-builddeps-dir=/localdisk/mybuilddeps
-
-# Translate a configuration triplet/quadruplet into something
-# known by this configuration file.
-# If no rewrite was found, then rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
-REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu
-REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10
-
-# The needed cups builddeps are platform independent header files.
-# I.e. they need not be part of the devkit.
-builddep_cups=lib/cups_1_3_9.zip
-builddep_cups_CFLAGS=-I${depdir}
-
-# The devkit is the cross compiler tools and sys-roots
-# for the build platform.
-builddep_devkit=sdk/sdk-${rewritten_build}-20110921.tar.gz
-
-# The freetype dependency is partly platform dependent.
-# It is stored inside the sys-root.
-builddep_freetype2=sdk/sdk-${rewritten_build}-20110921.tar.gz
-builddep_freetype2_CFLAGS=-I${depdir}/${rewritten_target}/sys-root/usr/include/freetype2
-builddep_freetype2_LIBS=-lfreetype
-
-# There are many other build dependencies, but they are implicitly
-# found inside the devkit sys-root.
-
-# The boot jdk runs on the build system and is used to compile and run
-# Java build tools and of course, the bootstrap javac.
-builddep_bootjdk_BUILD_i386_pc_solaris2=java/jdk-7u2-fcs-bin-b13-solaris-i586-17_nov_2011.zip
-builddep_bootjdk_BUILD_x86_64_pc_solaris2=java/jdk-7u2-fcs-bin-b13-solaris-x64-17_nov_2011.zip
-builddep_bootjdk_BUILD_i686_unknown_linux_gnu=java/jdk-7u2-fcs-bin-b13-linux-i586-17_nov_2011.zip
-builddep_bootjdk_BUILD_x86_64_unknown_linux_gnu=java/jdk-7u2-fcs-bin-b13-linux-x64-17_nov_2011.zip
-builddep_bootjdk_BUILD_sparc_solaris2=java/jdk-7u2-fcs-bin-b13-solaris-sparc-17_nov_2011.zip
-builddep_bootjdk_BUILD_sparcv9_solaris2=java/jdk-7u2-fcs-bin-b13-solaris-sparcv9-17_nov_2011.zip
-builddep_bootjdk_BUILD_i386_pc_windows=java/jdk-7u2-fcs-bin-b13-windows-i586-17_nov_2011.zip
-builddep_bootjdk_BUILD_x86_64_pc_windows=java/jdk-7u2-fcs-bin-b13-windows-x64-17_nov_2011.zip
-builddep_bootjdk_ROOT=${depdir}/jdk7_02/jdk1.7.0_02

common/autoconf/builddeps.conf.nfs.example

@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2012, 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
-# 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.
-#
-
-# This is a configuration example using an nfs-mount /java
-# it will use the builddeps directly from the nfs mounted directory.
-# This is how you use it:
-
-#configure --with-builddeps-conf=..../builddeps.conf.nfs.example
-
-REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu
-REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10
-
-DEVTOOLS=/java/devtools
-
-builddep_cups=${DEVTOOLS}/linux/cups/include
-builddep_cups_CFLAGS=-I${depdir}
-
-JDK_ROOT=/java/re/jdk/7u4/latest/binaries
-builddep_bootjdk_BUILD_i386_pc_solaris2=${JDK_ROOT}/solaris-i586
-builddep_bootjdk_BUILD_x86_64_pc_solaris2=${JDK_ROOT}/solaris-amd64
-builddep_bootjdk_BUILD_i686_unknown_linux_gnu=${JDK_ROOT}/linux-i586
-builddep_bootjdk_BUILD_x86_64_unknown_linux_gnu=${JDK_ROOT}/linux-amd64
-builddep_bootjdk_ROOT=

common/autoconf/builddeps.m4

@@ -1,247 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-AC_DEFUN_ONCE([BDEPS_SCAN_FOR_BUILDDEPS],
-[
-  define(LIST_OF_BUILD_DEPENDENCIES,)
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    if test "x$with_builddeps_conf" != x; then
-      AC_MSG_CHECKING([for supplied builddeps configuration file])
-      builddepsfile=$with_builddeps_conf
-      if test -s $builddepsfile; then
-        . $builddepsfile
-        AC_MSG_RESULT([loaded!])
-      else
-        AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!])
-      fi
-    else
-      AC_MSG_CHECKING([for builddeps.conf files in sources...])
-      builddepsfile=`mktemp`
-      touch $builddepsfile
-      # Put all found confs into a single file.
-      find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
-      # Source the file to acquire the variables
-      if test -s $builddepsfile; then
-        . $builddepsfile
-        AC_MSG_RESULT([found at least one!])
-      else
-        AC_MSG_ERROR([Could not find any builddeps.conf at all!])
-      fi
-    fi
-    # Create build and target names that use _ instead of "-" and ".".
-    # This is necessary to use them in variable names.
-    build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
-    target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
-    # Extract rewrite information for build and target
-    eval rewritten_build=\${REWRITE_${build_var}}
-    if test "x$rewritten_build" = x; then
-      rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
-      echo Build stays the same $rewritten_build
-    else
-      echo Rewriting build for builddeps into $rewritten_build
-    fi
-    eval rewritten_target=\${REWRITE_${target_var}}
-    if test "x$rewritten_target" = x; then
-      rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
-      echo Target stays the same $rewritten_target
-    else
-      echo Rewriting target for builddeps into $rewritten_target
-    fi
-    rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
-    rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
-  fi
-  AC_CHECK_PROGS(BDEPS_UNZIP, [7z unzip])
-  if test "x$BDEPS_UNZIP" = x7z; then
-    BDEPS_UNZIP="7z x"
-  fi
-
-  AC_CHECK_PROGS(BDEPS_FTP, [wget lftp ftp])
-])
-
-AC_DEFUN([BDEPS_FTPGET],
-[
-  # $1 is the ftp://abuilddeps.server.com/libs/cups.zip
-  # $2 is the local file name for the downloaded file.
-  VALID_TOOL=no
-  if test "x$BDEPS_FTP" = xwget; then
-    VALID_TOOL=yes
-    wget -O $2 $1
-  fi
-  if test "x$BDEPS_FTP" = xlftp; then
-    VALID_TOOL=yes
-    lftp -c "get $1 -o $2"
-  fi
-  if test "x$BDEPS_FTP" = xftp; then
-    VALID_TOOL=yes
-    FTPSERVER=`echo $1 | cut -f 3 -d '/'`
-    FTPPATH=`echo $1 | cut -f 4- -d '/'`
-    FTPUSERPWD=${FTPSERVER%%@*}
-    if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
-      FTPUSER=${userpwd%%:*}
-      FTPPWD=${userpwd#*@}
-      FTPSERVER=${FTPSERVER#*@}
-    else
-      FTPUSER=ftp
-      FTPPWD=ftp
-    fi
-    # the "pass" command does not work on some
-    # ftp clients (read ftp.exe) but if it works,
-    # passive mode is better!
-    ( \
-        echo "user $FTPUSER $FTPPWD"        ; \
-        echo "pass"                         ; \
-        echo "bin"                          ; \
-        echo "get $FTPPATH $2"              ; \
-    ) | ftp -in $FTPSERVER
-  fi
-  if test "x$VALID_TOOL" != xyes; then
-    AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP])
-  fi
-])
-
-AC_DEFUN([BDEPS_CHECK_MODULE],
-[
-  define([LIST_OF_BUILD_DEPENDENCIES],LIST_OF_BUILD_DEPENDENCIES[$2=$3'\n'])
-  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
-    # Source the builddeps file again, to make sure it uses the latest variables!
-    . $builddepsfile
-    # Look for a target and build machine specific resource!
-    eval resource=\${builddep_$2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a target specific resource
-      eval resource=\${builddep_$2_TARGET_${rewritten_target_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a build specific resource
-      eval resource=\${builddep_$2_BUILD_${rewritten_build_var}}
-    fi
-    if test "x$resource" = x; then
-      # Ok, lets instead look for a generic resource
-      # (The $2 comes from M4 and not the shell, thus no need for eval here.)
-      resource=${builddep_$2}
-    fi
-    if test "x$resource" != x; then
-      AC_MSG_NOTICE([Using builddeps $resource for $2])
-      # If the resource in the builddeps.conf file is an existing directory,
-      # for example /java/linux/cups
-      if test -d ${resource}; then
-        depdir=${resource}
-      else
-        BDEPS_FETCH($2, $resource, $with_builddeps_server, $with_builddeps_dir, depdir)
-      fi
-      # Source the builddeps file again, because in the previous command, the depdir
-      # was updated to point at the current build dependency install directory.
-      . $builddepsfile
-      # Now extract variables from the builddeps.conf files.
-      theroot=${builddep_$2_ROOT}
-      thecflags=${builddep_$2_CFLAGS}
-      thelibs=${builddep_$2_LIBS}
-      if test "x$depdir" = x; then
-        AC_MSG_ERROR([Could not download build dependency $2])
-      fi
-      $1=$depdir
-      if test "x$theroot" != x; then
-        $1="$theroot"
-      fi
-      if test "x$thecflags" != x; then
-        $1_CFLAGS="$thecflags"
-      fi
-      if test "x$thelibs" != x; then
-        $1_LIBS="$thelibs"
-      fi
-      m4_default([$4], [:])
-      m4_ifvaln([$5], [else $5])
-    fi
-    m4_ifvaln([$5], [else $5])
-  fi
-])
-
-AC_DEFUN([BDEPS_FETCH],
-[
-  # $1 is for example mymodule
-  # $2 is for example libs/general/libmymod_1_2_3.zip
-  # $3 is for example ftp://mybuilddeps.myserver.com/builddeps
-  # $4 is for example /localhome/builddeps
-  # $5 is the name of the variable into which we store the depdir, eg MYMOD
-  # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
-  # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
-  filename=`basename $2`
-  filebase=`echo $filename | sed 's/\.[[^\.]]*$//'`
-  filebase=${filename%%.*}
-  extension=${filename#*.}
-  installdir=$4/$filebase
-  if test ! -f $installdir/$filename.unpacked; then
-    AC_MSG_NOTICE([Downloading build dependency $1 from $3/$2 and installing into $installdir])
-    if test ! -d $installdir; then
-      mkdir -p $installdir
-    fi
-    if test ! -d $installdir; then
-      AC_MSG_ERROR([Could not create directory $installdir])
-    fi
-    tmpfile=`mktemp $installdir/$1.XXXXXXXXX`
-    touch $tmpfile
-    if test ! -f $tmpfile; then
-      AC_MSG_ERROR([Could not create files in directory $installdir])
-    fi
-    BDEPS_FTPGET([$3/$2] , [$tmpfile])
-    mv $tmpfile $installdir/$filename
-    if test ! -s $installdir/$filename; then
-      AC_MSG_ERROR([Could not download $3/$2])
-    fi
-    case "$extension" in
-      zip)  echo "Unzipping $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
-        ;;
-      tar.gz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      tgz) echo "Untaring $installdir/$filename..."
-        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
-        ;;
-      *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension])
-        ;;
-    esac
-  fi
-  if test -f $installdir/$filename.unpacked; then
-    $5=$installdir
-  fi
-])
-
-AC_DEFUN_ONCE([BDEPS_CONFIGURE_BUILDDEPS],
-[
-  AC_ARG_WITH(builddeps-conf, [AS_HELP_STRING([--with-builddeps-conf],
-      [use this configuration file for the builddeps])])
-
-  AC_ARG_WITH(builddeps-server, [AS_HELP_STRING([--with-builddeps-server],
-      [download and use build dependencies from this server url])])
-
-  AC_ARG_WITH(builddeps-dir, [AS_HELP_STRING([--with-builddeps-dir],
-      [store downloaded build dependencies here @<:@/localhome/builddeps@:>@])],
-      [],
-      [with_builddeps_dir=/localhome/builddeps])
-
-  AC_ARG_WITH(builddeps-group, [AS_HELP_STRING([--with-builddeps-group],
-      [chgrp the downloaded build dependencies to this group])])
-])

common/autoconf/compare.sh.in

@@ -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@"
+export OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
-OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
+export OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
 
-AWK="@AWK@"
+export AWK="@AWK@"
-CAT="@CAT@"
+export BASH="@BASH@"
-CMP="@CMP@"
+export CAT="@CAT@"
-CP="@CP@"
+export CMP="@CMP@"
-CUT="@CUT@"
+export CP="@CP@"
-DIFF="@DIFF@"
+export CUT="@CUT@"
-DUMPBIN="@FIXPATH@ @DUMPBIN@"
+export DIFF="@DIFF@"
-EXPR="@EXPR@"
+export DUMPBIN="@FIXPATH@ @DUMPBIN@"
-FILE="@FILE@"
+export EXPR="@EXPR@"
-FIND="@FIND@"
+export FILE="@FILE@"
-GREP="@GREP@"
+export FIND="@FIND@"
-JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
+export GREP="@GREP@"
-JIMAGE="@FIXPATH@ @BUILD_OUTPUT@/jdk/bin/jimage"
+export JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
-LDD="@LDD@"
+export JIMAGE="@FIXPATH@ @BUILD_OUTPUT@/jdk/bin/jimage"
-LN="@LN@"
+export LDD="@LDD@"
-MKDIR="@MKDIR@"
+export LN="@LN@"
-NAWK="@NAWK@"
+export MKDIR="@MKDIR@"
-NM="@GNM@"
+export MV="@MV@"
-OBJDUMP="@OBJDUMP@"
+export NAWK="@NAWK@"
-OTOOL="@OTOOL@"
+export NM="@GNM@"
-PRINTF="@PRINTF@"
+export OBJDUMP="@OBJDUMP@"
-READELF="@READELF@"
+export OTOOL="@OTOOL@"
-RM="@RM@"
+export PRINTF="@PRINTF@"
-SED="@SED@"
+export READELF="@READELF@"
-SORT="@SORT@"
+export RM="@RM@"
-STAT="@STAT@"
+export SED="@SED@"
-STRIP="@POST_STRIP_CMD@"
+export SORT="@SORT@"
-TEE="@TEE@"
+export STAT="@STAT@"
-UNIQ="@UNIQ@"
+export STRIP="@STRIP@ @STRIPFLAGS@"
-UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
+export TEE="@TEE@"
-UNZIP="@UNZIP@"
+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 @@ if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then
   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" "$@"

common/autoconf/configure.ac

@@ -39,7 +39,6 @@ m4_include([build-aux/pkg.m4])
 # Include these first...
 m4_include([basics.m4])
 m4_include([basics_windows.m4])
-m4_include([builddeps.m4])
 # ... then the rest
 m4_include([boot-jdk.m4])
 m4_include([build-performance.m4])
@@ -121,12 +120,6 @@ PKG_PROG_PKG_CONFIG
 # After basic tools have been setup, we can check build os specific details.
 PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION
 
-# Setup builddeps, for automatic downloading of tools we need.
-# This is needed before we can call BDEPS_CHECK_MODULE, which is done in
-# boot-jdk setup, but we need to have basic tools setup first.
-BDEPS_CONFIGURE_BUILDDEPS
-BDEPS_SCAN_FOR_BUILDDEPS
-
 ###############################################################################
 #
 # Determine OpenJDK variants, options and version numbers.
@@ -165,6 +158,11 @@ SRCDIRS_SETUP_OUTPUT_DIRS
 # First determine the toolchain type (compiler family)
 TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE
 
+# User supplied flags should be used when configure detects compilers
+FLAGS_SETUP_USER_SUPPLIED_FLAGS
+# The sysroot cflags are needed for configure to be able to run the compilers
+FLAGS_SETUP_SYSROOT_FLAGS
+
 # Then detect the actual binaries needed
 TOOLCHAIN_PRE_DETECTION
 TOOLCHAIN_DETECT_TOOLCHAIN_CORE
@@ -206,14 +204,8 @@ JDKOPT_SETUP_CODE_COVERAGE
 # After we have toolchain, we can compile fixpath. It's needed by the lib checks.
 BASIC_COMPILE_FIXPATH
 
-LIB_SETUP_INIT
+LIB_DETERMINE_DEPENDENCIES
-LIB_SETUP_X11
+LIB_SETUP_LIBRARIES
-LIB_SETUP_CUPS
-LIB_SETUP_FREETYPE
-LIB_SETUP_ALSA
-LIB_SETUP_MISC_LIBS
-LIB_SETUP_STATIC_LINK_LIBSTDCPP
-LIB_SETUP_ON_WINDOWS
 
 ###############################################################################
 #

common/autoconf/flags.m4

@@ -23,6 +23,100 @@
 # questions.
 #
 
+# Reset the global CFLAGS/LDFLAGS variables and initialize them with the
+# corresponding configure arguments instead
+AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
+[
+  if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
+    AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
+  fi
+
+  if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
+    AC_MSG_WARN([Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags])
+  fi
+
+  if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
+    AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
+  fi
+
+  AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
+      [extra flags to be used when compiling jdk c-files])])
+
+  AC_ARG_WITH(extra-cxxflags, [AS_HELP_STRING([--with-extra-cxxflags],
+      [extra flags to be used when compiling jdk c++-files])])
+
+  AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
+      [extra flags to be used when linking jdk])])
+
+  EXTRA_CFLAGS="$with_extra_cflags"
+  EXTRA_CXXFLAGS="$with_extra_cxxflags"
+  EXTRA_LDFLAGS="$with_extra_ldflags"
+
+  # Hotspot needs these set in their legacy form
+  LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $EXTRA_CFLAGS"
+  LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $EXTRA_CXXFLAGS"
+  LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $EXTRA_LDFLAGS"
+
+  AC_SUBST(LEGACY_EXTRA_CFLAGS)
+  AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
+  AC_SUBST(LEGACY_EXTRA_LDFLAGS)
+
+  # The global CFLAGS and LDLAGS variables are used by configure tests and
+  # should include the extra parameters
+  CFLAGS="$EXTRA_CFLAGS"
+  CXXFLAGS="$EXTRA_CXXFLAGS"
+  LDFLAGS="$EXTRA_LDFLAGS"
+  CPPFLAGS=""
+])
+
+# Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so
+# that configure can use them while detecting compilers.
+# TOOLCHAIN_TYPE is available here.
+AC_DEFUN_ONCE([FLAGS_SETUP_SYSROOT_FLAGS],
+[
+  if test "x$SYSROOT" != "x"; then
+    if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+      if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+        # Solaris Studio does not have a concept of sysroot. Instead we must
+        # make sure the default include and lib dirs are appended to each
+        # compile and link command line.
+        SYSROOT_CFLAGS="-I$SYSROOT/usr/include"
+        SYSROOT_LDFLAGS="-L$SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
+            -L$SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
+            -L$SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
+      fi
+    elif test "x$TOOLCHAIN_TYPE" = xgcc; then
+      SYSROOT_CFLAGS="--sysroot=$SYSROOT"
+      SYSROOT_LDFLAGS="--sysroot=$SYSROOT"
+    elif test "x$TOOLCHAIN_TYPE" = xclang; then
+      SYSROOT_CFLAGS="-isysroot $SYSROOT"
+      SYSROOT_LDFLAGS="-isysroot $SYSROOT"
+    fi
+    # Propagate the sysroot args to hotspot
+    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
+    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
+    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
+    # The global CFLAGS and LDFLAGS variables need these for configure to function
+    CFLAGS="$CFLAGS $SYSROOT_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $SYSROOT_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $SYSROOT_CFLAGS"
+    LDFLAGS="$LDFLAGS $SYSROOT_LDFLAGS"
+  fi
+
+  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+    # We also need -iframework<path>/System/Library/Frameworks
+    SYSROOT_CFLAGS="$SYSROOT_CFLAGS -iframework $SYSROOT/System/Library/Frameworks"
+    SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -iframework $SYSROOT/System/Library/Frameworks"
+    # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
+    # set this here so it doesn't have to be peppered throughout the forest
+    SYSROOT_CFLAGS="$SYSROOT_CFLAGS -F $SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
+    SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -F $SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
+  fi
+
+  AC_SUBST(SYSROOT_CFLAGS)
+  AC_SUBST(SYSROOT_LDFLAGS)
+])
+
 AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
 [
   # Option used to tell the compiler whether to create 32- or 64-bit executables
@@ -60,10 +154,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
     STRIPFLAGS="-X32_64"
   fi
 
-  if test "x$OPENJDK_TARGET_OS" != xwindows; then
+  AC_SUBST(STRIPFLAGS)
-    POST_STRIP_CMD="$STRIP $STRIPFLAGS"
-  fi
-  AC_SUBST(POST_STRIP_CMD)
 
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     CC_OUT_OPTION=-Fo
@@ -113,44 +204,6 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
     # silence copyright notice and other headers.
     COMMON_CCXXFLAGS="$COMMON_CCXXFLAGS -nologo"
   fi
-
-  if test "x$SYSROOT" != "x"; then
-    if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
-      if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-        # Solaris Studio does not have a concept of sysroot. Instead we must
-        # make sure the default include and lib dirs are appended to each
-        # compile and link command line.
-        SYSROOT_CFLAGS="-I$SYSROOT/usr/include"
-        SYSROOT_LDFLAGS="-L$SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
-            -L$SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
-            -L$SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
-      fi
-    elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
-      # Apple only wants -isysroot <path>, but we also need -iframework<path>/System/Library/Frameworks
-      SYSROOT_CFLAGS="-isysroot \"$SYSROOT\" -iframework\"$SYSROOT/System/Library/Frameworks\""
-      SYSROOT_LDFLAGS=$SYSROOT_CFLAGS
-    elif test "x$TOOLCHAIN_TYPE" = xgcc; then
-      SYSROOT_CFLAGS="--sysroot=$SYSROOT"
-      SYSROOT_LDFLAGS="--sysroot=$SYSROOT"
-    elif test "x$TOOLCHAIN_TYPE" = xclang; then
-      SYSROOT_CFLAGS="-isysroot \"$SYSROOT\""
-      SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\""
-    fi
-    # Propagate the sysroot args to hotspot
-    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
-    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
-    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
-  fi
-
-  # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
-  # set this here so it doesn't have to be peppered throughout the forest
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    SYSROOT_CFLAGS="$SYSROOT_CFLAGS -F\"$SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-    SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -F\"$SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks\""
-  fi
-
-  AC_SUBST(SYSROOT_CFLAGS)
-  AC_SUBST(SYSROOT_LDFLAGS)
 ])
 
 AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS],
@@ -480,39 +533,9 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
     CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt"
   fi
 
-  if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
+  CFLAGS_JDK="${CFLAGS_JDK} $EXTRA_CFLAGS"
-    AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
+  CXXFLAGS_JDK="${CXXFLAGS_JDK} $EXTRA_CXXFLAGS"
-  fi
+  LDFLAGS_JDK="${LDFLAGS_JDK} $EXTRA_LDFLAGS"
-
-  if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
-    AC_MSG_WARN([Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags])
-  fi
-
-  if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
-    AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
-  fi
-
-  AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
-      [extra flags to be used when compiling jdk c-files])])
-
-  AC_ARG_WITH(extra-cxxflags, [AS_HELP_STRING([--with-extra-cxxflags],
-      [extra flags to be used when compiling jdk c++-files])])
-
-  AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
-      [extra flags to be used when linking jdk])])
-
-  CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
-  CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
-  LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
-
-  # Hotspot needs these set in their legacy form
-  LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
-  LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
-  LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
-
-  AC_SUBST(LEGACY_EXTRA_CFLAGS)
-  AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
-  AC_SUBST(LEGACY_EXTRA_LDFLAGS)
 
   ###############################################################################
   #

common/autoconf/help.m4

@@ -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
@@ -31,7 +31,7 @@ AC_DEFUN_ONCE([HELP_SETUP_DEPENDENCY_HELP],
 AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
 [
   # Print a helpful message on how to acquire the necessary build dependency.
-  # $1 is the help tag: freetype, cups, pulse, alsa etc
+  # $1 is the help tag: freetype, cups, alsa etc
   MISSING_DEPENDENCY=$1
 
   if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
@@ -97,6 +97,8 @@ msys_help() {
 
 apt_help() {
   case $1 in
+    reduced)
+      PKGHANDLER_COMMAND="sudo apt-get install gcc-multilib g++-multilib" ;;
     devkit)
       PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
     openjdk)
@@ -107,8 +109,8 @@ apt_help() {
       PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
     freetype)
       PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
-    pulse)
+    ffi)
-      PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
+      PKGHANDLER_COMMAND="sudo apt-get install libffi-dev" ;;
     x11)
       PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
     ccache)
@@ -128,8 +130,6 @@ yum_help() {
       PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
     freetype)
       PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
-    pulse)
-      PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
     x11)
       PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
     ccache)

common/autoconf/hotspot-spec.gmk.in

@@ -48,8 +48,8 @@ ALT_CUPS_HEADERS_PATH:=$(patsubst -I%,%,$(filter -I%,@CUPS_CFLAGS@))
 
 # The HOSTCC/HOSTCXX is Hotspot terminology for the BUILD_CC/BUILD_CXX, i.e. the
 # compiler that produces code that can be run on the build platform.
-HOSTCC:=@FIXPATH@ @BUILD_CC@
+HOSTCC:=@FIXPATH@ @BUILD_CC@ $(BUILD_SYSROOT_CFLAGS)
-HOSTCXX:=@FIXPATH@ @BUILD_CXX@
+HOSTCXX:=@FIXPATH@ @BUILD_CXX@ $(BUILD_SYSROOT_CFLAGS)
 
 ####################################################
 #

common/autoconf/jdk-options.m4

@@ -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
@@ -453,19 +453,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
     AC_SUBST(ENABLE_INTREE_EC)
   ])
 
-  ###############################################################################
-  #
-  # --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

common/autoconf/lib-alsa.m4

@@ -0,0 +1,90 @@
+#
+# 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+# Setup alsa (Advanced Linux Sound Architecture)
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_ALSA],
+[
+  AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa],
+      [specify prefix directory for the alsa package
+      (expecting the libraries under PATH/lib and the headers under PATH/include)])])
+  AC_ARG_WITH(alsa-include, [AS_HELP_STRING([--with-alsa-include],
+      [specify directory for the alsa include files])])
+  AC_ARG_WITH(alsa-lib, [AS_HELP_STRING([--with-alsa-lib],
+      [specify directory for the alsa library])])
+
+  if test "x$NEEDS_LIB_ALSA" = xfalse; then
+    if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then
+      AC_MSG_WARN([alsa not used, so --with-alsa is ignored])
+    fi
+    ALSA_CFLAGS=
+    ALSA_LIBS=
+  else
+    ALSA_FOUND=no
+
+    if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then
+      AC_MSG_ERROR([It is not possible to disable the use of alsa. Remove the --without-alsa option.])
+    fi
+
+    if test "x${with_alsa}" != x; then
+      ALSA_LIBS="-L${with_alsa}/lib -lasound"
+      ALSA_CFLAGS="-I${with_alsa}/include"
+      ALSA_FOUND=yes
+    fi
+    if test "x${with_alsa_include}" != x; then
+      ALSA_CFLAGS="-I${with_alsa_include}"
+      ALSA_FOUND=yes
+    fi
+    if test "x${with_alsa_lib}" != x; then
+      ALSA_LIBS="-L${with_alsa_lib} -lasound"
+      ALSA_FOUND=yes
+    fi
+    # Do not try pkg-config if we have a sysroot set.
+    if test "x$SYSROOT" = x; then
+      if test "x$ALSA_FOUND" = xno; then
+        PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
+      fi
+    fi
+    if test "x$ALSA_FOUND" = xno; then
+      AC_CHECK_HEADERS([alsa/asoundlib.h],
+          [
+            ALSA_FOUND=yes
+            ALSA_CFLAGS=-Iignoreme
+            ALSA_LIBS=-lasound
+            DEFAULT_ALSA=yes
+          ],
+          [ALSA_FOUND=no]
+      )
+    fi
+    if test "x$ALSA_FOUND" = xno; then
+      HELP_MSG_MISSING_DEPENDENCY([alsa])
+      AC_MSG_ERROR([Could not find alsa! $HELP_MSG])
+    fi
+  fi
+
+  AC_SUBST(ALSA_CFLAGS)
+  AC_SUBST(ALSA_LIBS)
+])

common/autoconf/lib-bundled.m4

@@ -0,0 +1,226 @@
+#
+# 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+# Setup bundled libraries.
+#
+# For libjpeg, giflib, libpng, lcms2 and zlib, the source is present in the
+# OpenJDK repository. Default is to use these libraries as bundled, but they
+# might be replaced by en external version by the user.
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_BUNDLED_LIBS],
+[
+  LIB_SETUP_LIBJPEG
+  LIB_SETUP_GIFLIB
+  LIB_SETUP_LIBPNG
+  LIB_SETUP_ZLIB
+  LIB_SETUP_LCMS
+])
+
+################################################################################
+# Setup libjpeg
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_LIBJPEG],
+[
+  AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
+      [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+
+  AC_MSG_CHECKING([for which libjpeg to use])
+  # default is bundled
+  DEFAULT_LIBJPEG=bundled
+  # if user didn't specify, use DEFAULT_LIBJPEG
+  if test "x${with_libjpeg}" = "x"; then
+    with_libjpeg=${DEFAULT_LIBJPEG}
+  fi
+  AC_MSG_RESULT(${with_libjpeg})
+
+  if test "x${with_libjpeg}" = "xbundled"; then
+    USE_EXTERNAL_LIBJPEG=false
+  elif test "x${with_libjpeg}" = "xsystem"; then
+    AC_CHECK_HEADER(jpeglib.h, [],
+        [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])])
+    AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [],
+        [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])])
+
+    USE_EXTERNAL_LIBJPEG=true
+  else
+    AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
+  fi
+
+  AC_SUBST(USE_EXTERNAL_LIBJPEG)
+])
+
+################################################################################
+# Setup giflib
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_GIFLIB],
+[
+  AC_ARG_WITH(giflib, [AS_HELP_STRING([--with-giflib],
+      [use giflib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+
+  AC_MSG_CHECKING([for which giflib to use])
+  # default is bundled
+  DEFAULT_GIFLIB=bundled
+  # if user didn't specify, use DEFAULT_GIFLIB
+  if test "x${with_giflib}" = "x"; then
+    with_giflib=${DEFAULT_GIFLIB}
+  fi
+  AC_MSG_RESULT(${with_giflib})
+
+  if test "x${with_giflib}" = "xbundled"; then
+    USE_EXTERNAL_LIBGIF=false
+  elif test "x${with_giflib}" = "xsystem"; then
+    AC_CHECK_HEADER(gif_lib.h, [],
+        [ AC_MSG_ERROR([--with-giflib=system specified, but gif_lib.h not found!])])
+    AC_CHECK_LIB(gif, DGifGetCode, [],
+        [ AC_MSG_ERROR([--with-giflib=system specified, but no giflib found!])])
+
+    USE_EXTERNAL_LIBGIF=true
+  else
+    AC_MSG_ERROR([Invalid value of --with-giflib: ${with_giflib}, use 'system' or 'bundled'])
+  fi
+
+  AC_SUBST(USE_EXTERNAL_LIBGIF)
+])
+
+################################################################################
+# Setup libpng
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_LIBPNG],
+[
+  AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
+     [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+
+  AC_MSG_CHECKING([for which libpng to use])
+
+  # default is bundled
+  DEFAULT_LIBPNG=bundled
+  # if user didn't specify, use DEFAULT_LIBPNG
+  if test "x${with_libpng}" = "x"; then
+      with_libpng=${DEFAULT_LIBPNG}
+  fi
+
+  if test "x${with_libpng}" = "xbundled"; then
+      USE_EXTERNAL_LIBPNG=false
+      AC_MSG_RESULT([bundled])
+  elif test "x${with_libpng}" = "xsystem"; then
+      PKG_CHECK_MODULES(PNG, libpng,
+                   [ LIBPNG_FOUND=yes ],
+                   [ LIBPNG_FOUND=no ])
+      if test "x${LIBPNG_FOUND}" = "xyes"; then
+          USE_EXTERNAL_LIBPNG=true
+          AC_MSG_RESULT([system])
+      else
+          AC_MSG_RESULT([system not found])
+          AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
+      fi
+  else
+      AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
+  fi
+
+  AC_SUBST(USE_EXTERNAL_LIBPNG)
+])
+
+################################################################################
+# Setup zlib
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
+[
+  AC_ARG_WITH(zlib, [AS_HELP_STRING([--with-zlib],
+      [use zlib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+
+  AC_CHECK_LIB(z, compress,
+      [ ZLIB_FOUND=yes ],
+      [ ZLIB_FOUND=no ])
+
+  AC_MSG_CHECKING([for which zlib to use])
+
+  DEFAULT_ZLIB=bundled
+  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+    # On macosx default is system...on others default is bundled
+    DEFAULT_ZLIB=system
+  fi
+
+  if test "x${ZLIB_FOUND}" != "xyes"; then
+    # If we don't find any system...set default to bundled
+    DEFAULT_ZLIB=bundled
+  fi
+
+  # If user didn't specify, use DEFAULT_ZLIB
+  if test "x${with_zlib}" = "x"; then
+    with_zlib=${DEFAULT_ZLIB}
+  fi
+
+  if test "x${with_zlib}" = "xbundled"; then
+    USE_EXTERNAL_LIBZ=false
+    AC_MSG_RESULT([bundled])
+  elif test "x${with_zlib}" = "xsystem"; then
+    if test "x${ZLIB_FOUND}" = "xyes"; then
+      USE_EXTERNAL_LIBZ=true
+      AC_MSG_RESULT([system])
+    else
+      AC_MSG_RESULT([system not found])
+      AC_MSG_ERROR([--with-zlib=system specified, but no zlib found!])
+    fi
+  else
+    AC_MSG_ERROR([Invalid value for --with-zlib: ${with_zlib}, use 'system' or 'bundled'])
+  fi
+
+  AC_SUBST(USE_EXTERNAL_LIBZ)
+])
+
+################################################################################
+# Setup lcms (Little CMS)
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_LCMS],
+[
+  AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms],
+      [use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+
+  AC_MSG_CHECKING([for which lcms to use])
+
+  DEFAULT_LCMS=bundled
+  # If user didn't specify, use DEFAULT_LCMS
+  if test "x${with_lcms}" = "x"; then
+      with_lcms=${DEFAULT_LCMS}
+  fi
+
+  if test "x${with_lcms}" = "xbundled"; then
+    USE_EXTERNAL_LCMS=false
+    AC_MSG_RESULT([bundled])
+  elif test "x${with_lcms}" = "xsystem"; then
+    AC_MSG_RESULT([system])
+    PKG_CHECK_MODULES([LCMS], [lcms2], [LCMS_FOUND=yes], [LCMS_FOUND=no])
+    if test "x${LCMS_FOUND}" = "xyes"; then
+      USE_EXTERNAL_LCMS=true
+    else
+      AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!])
+    fi
+  else
+    AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled'])
+  fi
+
+  AC_SUBST(USE_EXTERNAL_LCMS)
+])

common/autoconf/lib-cups.m4

@@ -0,0 +1,87 @@
+#
+# 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+# Setup cups (Common Unix Printing System)
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_CUPS],
+[
+  AC_ARG_WITH(cups, [AS_HELP_STRING([--with-cups],
+      [specify prefix directory for the cups package
+      (expecting the headers under PATH/include)])])
+  AC_ARG_WITH(cups-include, [AS_HELP_STRING([--with-cups-include],
+      [specify directory for the cups include files])])
+
+  if test "x$NEEDS_LIB_CUPS" = xfalse; then
+    if test "x${with_cups}" != x || test "x${with_cups_include}" != x; then
+      AC_MSG_WARN([cups not used, so --with-cups is ignored])
+    fi
+    CUPS_CFLAGS=
+  else
+    CUPS_FOUND=no
+
+    if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno; then
+      AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.])
+    fi
+
+    if test "x${with_cups}" != x; then
+      CUPS_CFLAGS="-I${with_cups}/include"
+      CUPS_FOUND=yes
+    fi
+    if test "x${with_cups_include}" != x; then
+      CUPS_CFLAGS="-I${with_cups_include}"
+      CUPS_FOUND=yes
+    fi
+    if test "x$CUPS_FOUND" = xno; then
+      # Are the cups headers installed in the default /usr/include location?
+      AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [
+          CUPS_FOUND=yes
+          CUPS_CFLAGS=
+          DEFAULT_CUPS=yes
+      ])
+    fi
+    if test "x$CUPS_FOUND" = xno; then
+      # Getting nervous now? Lets poke around for standard Solaris third-party
+      # package installation locations.
+      AC_MSG_CHECKING([for cups headers])
+      if test -s $SYSROOT/opt/sfw/cups/include/cups/cups.h; then
+        # An SFW package seems to be installed!
+        CUPS_FOUND=yes
+        CUPS_CFLAGS="-I$SYSROOT/opt/sfw/cups/include"
+      elif test -s $SYSROOT/opt/csw/include/cups/cups.h; then
+        # A CSW package seems to be installed!
+        CUPS_FOUND=yes
+        CUPS_CFLAGS="-I$SYSROOT/opt/csw/include"
+      fi
+      AC_MSG_RESULT([$CUPS_FOUND])
+    fi
+    if test "x$CUPS_FOUND" = xno; then
+      HELP_MSG_MISSING_DEPENDENCY([cups])
+      AC_MSG_ERROR([Could not find cups! $HELP_MSG ])
+    fi
+  fi
+
+  AC_SUBST(CUPS_CFLAGS)
+])

common/autoconf/lib-ffi.m4

@@ -0,0 +1,114 @@
+#
+# Copyright (c) 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+# Setup libffi (Foreign Function Interface)
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
+[
+  AC_ARG_WITH(libffi, [AS_HELP_STRING([--with-libffi],
+      [specify prefix directory for the libffi package
+      (expecting the libraries under PATH/lib and the headers under PATH/include)])])
+  AC_ARG_WITH(libffi-include, [AS_HELP_STRING([--with-libffi-include],
+      [specify directory for the libffi include files])])
+  AC_ARG_WITH(libffi-lib, [AS_HELP_STRING([--with-libffi-lib],
+      [specify directory for the libffi library])])
+
+  if test "x$NEEDS_LIB_FFI" = xfalse; then
+    if test "x${with_libffi}" != x || test "x${with_libffi_include}" != x || test "x${with_libffi_lib}" != x; then
+      AC_MSG_WARN([libffi not used, so --with-libffi is ignored])
+    fi
+    LIBFFI_CFLAGS=
+    LIBFFI_LIBS=
+  else
+    LIBFFI_FOUND=no
+
+    if test "x${with_libffi}" = xno || test "x${with_libffi_include}" = xno || test "x${with_libffi_lib}" = xno; then
+      AC_MSG_ERROR([It is not possible to disable the use of libffi. Remove the --without-libffi option.])
+    fi
+
+    if test "x${with_libffi}" != x; then
+      LIBFFI_LIBS="-L${with_libffi}/lib -lffi"
+      LIBFFI_CFLAGS="-I${with_libffi}/include"
+      LIBFFI_FOUND=yes
+    fi
+    if test "x${with_libffi_include}" != x; then
+      LIBFFI_CFLAGS="-I${with_libffi_include}"
+      LIBFFI_FOUND=yes
+    fi
+    if test "x${with_libffi_lib}" != x; then
+      LIBFFI_LIBS="-L${with_libffi_lib} -lffi"
+      LIBFFI_FOUND=yes
+    fi
+    # Do not try pkg-config if we have a sysroot set.
+    if test "x$SYSROOT" = x; then
+      if test "x$LIBFFI_FOUND" = xno; then
+        # Figure out LIBFFI_CFLAGS and LIBFFI_LIBS
+        PKG_CHECK_MODULES([LIBFFI], [libffi], [LIBFFI_FOUND=yes], [LIBFFI_FOUND=no])
+      fi
+    fi
+    if test "x$LIBFFI_FOUND" = xno; then
+      AC_CHECK_HEADERS([ffi.h],
+          [
+            LIBFFI_FOUND=yes
+            LIBFFI_CFLAGS=
+            LIBFFI_LIBS=-lffi
+          ],
+          [LIBFFI_FOUND=no]
+      )
+    fi
+    if test "x$LIBFFI_FOUND" = xno; then
+      HELP_MSG_MISSING_DEPENDENCY([ffi])
+      AC_MSG_ERROR([Could not find libffi! $HELP_MSG])
+    fi
+
+    AC_MSG_CHECKING([if libffi works])
+    AC_LANG_PUSH(C)
+    OLD_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $LIBFFI_CFLAGS"
+    OLD_LIBS="$LIBS"
+    LIBS="$LIBS $LIBFFI_LIBS"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ffi.h>],
+        [
+          ffi_call(NULL, NULL, NULL, NULL);
+          return 0;
+        ])],
+        [LIBFFI_WORKS=yes],
+        [LIBFFI_WORKS=no]
+    )
+    CFLAGS="$OLD_CFLAGS"
+    LIBS="$OLD_LIBS"
+    AC_LANG_POP(C)
+    AC_MSG_RESULT([$LIBFFI_WORKS])
+
+    if test "x$LIBFFI_WORKS" = xno; then
+      HELP_MSG_MISSING_DEPENDENCY([ffi])
+      AC_MSG_ERROR([Found libffi but could not link and compile with it. $HELP_MSG])
+    fi
+  fi
+
+  AC_SUBST(LIBFFI_CFLAGS)
+  AC_SUBST(LIBFFI_LIBS)
+])

common/autoconf/lib-freetype.m4

@@ -0,0 +1,420 @@
+#
+# 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+# Build the freetype lib from source
+################################################################################
+AC_DEFUN([LIB_BUILD_FREETYPE],
+[
+  FREETYPE_SRC_PATH="$1"
+  BUILD_FREETYPE=yes
+
+  # Check if the freetype sources are acessible..
+  if ! test -d $FREETYPE_SRC_PATH; then
+    AC_MSG_WARN([--with-freetype-src specified, but can not find path "$FREETYPE_SRC_PATH" - ignoring --with-freetype-src])
+    BUILD_FREETYPE=no
+  fi
+  # ..and contain a vc2010 project file
+  vcxproj_path="$FREETYPE_SRC_PATH/builds/windows/vc2010/freetype.vcxproj"
+  if test "x$BUILD_FREETYPE" = xyes && ! test -s $vcxproj_path; then
+    AC_MSG_WARN([Can not find project file $vcxproj_path (you may try a newer freetype version) - ignoring --with-freetype-src])
+    BUILD_FREETYPE=no
+  fi
+  # Now check if configure found a version of 'msbuild.exe'
+  if test "x$BUILD_FREETYPE" = xyes && test "x$MSBUILD" == x ; then
+    AC_MSG_WARN([Can not find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src])
+    BUILD_FREETYPE=no
+  fi
+
+  # Ready to go..
+  if test "x$BUILD_FREETYPE" = xyes; then
+    # msbuild requires trailing slashes for output directories
+    freetype_lib_path="$FREETYPE_SRC_PATH/lib$OPENJDK_TARGET_CPU_BITS/"
+    freetype_lib_path_unix="$freetype_lib_path"
+    freetype_obj_path="$FREETYPE_SRC_PATH/obj$OPENJDK_TARGET_CPU_BITS/"
+    BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(vcxproj_path)
+    BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(freetype_lib_path)
+    BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(freetype_obj_path)
+    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+      freetype_platform=x64
+    else
+      freetype_platform=win32
+    fi
+
+    # The original freetype project file is for VS 2010 (i.e. 'v100'),
+    # so we have to adapt the toolset if building with any other toolsed (i.e. SDK).
+    # Currently 'PLATFORM_TOOLSET' is set in 'TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT'/
+    # 'TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT' in toolchain_windows.m4
+    AC_MSG_NOTICE([Trying to compile freetype sources with PlatformToolset=$PLATFORM_TOOLSET to $freetype_lib_path_unix ...])
+
+    # First we try to build the freetype.dll
+    $ECHO -e "@echo off\n"\
+        "$MSBUILD $vcxproj_path "\
+        "/p:PlatformToolset=$PLATFORM_TOOLSET "\
+        "/p:Configuration=\"Release Multithreaded\" "\
+        "/p:Platform=$freetype_platform "\
+        "/p:ConfigurationType=DynamicLibrary "\
+        "/p:TargetName=freetype "\
+        "/p:OutDir=\"$freetype_lib_path\" "\
+        "/p:IntDir=\"$freetype_obj_path\" > freetype.log" > freetype.bat
+    cmd /c freetype.bat
+
+    if test -s "$freetype_lib_path_unix/freetype.dll"; then
+      # If that succeeds we also build freetype.lib
+      $ECHO -e "@echo off\n"\
+          "$MSBUILD $vcxproj_path "\
+          "/p:PlatformToolset=$PLATFORM_TOOLSET "\
+          "/p:Configuration=\"Release Multithreaded\" "\
+          "/p:Platform=$freetype_platform "\
+          "/p:ConfigurationType=StaticLibrary "\
+          "/p:TargetName=freetype "\
+          "/p:OutDir=\"$freetype_lib_path\" "\
+          "/p:IntDir=\"$freetype_obj_path\" >> freetype.log" > freetype.bat
+      cmd /c freetype.bat
+
+      if test -s "$freetype_lib_path_unix/freetype.lib"; then
+        # Once we build both, lib and dll, set freetype lib and include path appropriately
+        POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_SRC_PATH/include"
+        POTENTIAL_FREETYPE_LIB_PATH="$freetype_lib_path_unix"
+        AC_MSG_NOTICE([Compiling freetype sources succeeded! (see freetype.log for build results)])
+      else
+        BUILD_FREETYPE=no
+      fi
+    else
+      BUILD_FREETYPE=no
+    fi
+  fi
+])
+
+################################################################################
+# Check if a potential freeype library match is correct and usable
+################################################################################
+AC_DEFUN([LIB_CHECK_POTENTIAL_FREETYPE],
+[
+  POTENTIAL_FREETYPE_INCLUDE_PATH="$1"
+  POTENTIAL_FREETYPE_LIB_PATH="$2"
+  METHOD="$3"
+
+  # Let's start with an optimistic view of the world :-)
+  FOUND_FREETYPE=yes
+
+  # First look for the canonical freetype main include file ft2build.h.
+  if ! test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+    # Oh no! Let's try in the freetype2 directory. This is needed at least at Mac OS X Yosemite.
+    POTENTIAL_FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH/freetype2"
+    if ! test -s "$POTENTIAL_FREETYPE_INCLUDE_PATH/ft2build.h"; then
+      # Fail.
+      FOUND_FREETYPE=no
+    fi
+  fi
+
+  if test "x$FOUND_FREETYPE" = xyes; then
+    # Include file found, let's continue the sanity check.
+    AC_MSG_NOTICE([Found freetype include files at $POTENTIAL_FREETYPE_INCLUDE_PATH using $METHOD])
+
+    # Reset to default value
+    FREETYPE_BASE_NAME=freetype
+    FREETYPE_LIB_NAME="${LIBRARY_PREFIX}${FREETYPE_BASE_NAME}${SHARED_LIBRARY_SUFFIX}"
+    if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME"; then
+      if test "x$OPENJDK_TARGET_OS" = xmacosx \
+          && test -s "$POTENTIAL_FREETYPE_LIB_PATH/${LIBRARY_PREFIX}freetype.6${SHARED_LIBRARY_SUFFIX}"; then
+        # On Mac OS X Yosemite, the symlink from libfreetype.dylib to libfreetype.6.dylib disappeared. Check
+        # for the .6 version explicitly.
+        FREETYPE_BASE_NAME=freetype.6
+        FREETYPE_LIB_NAME="${LIBRARY_PREFIX}${FREETYPE_BASE_NAME}${SHARED_LIBRARY_SUFFIX}"
+        AC_MSG_NOTICE([Compensating for missing symlink by using version 6 explicitly])
+      else
+        AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/$FREETYPE_LIB_NAME. Ignoring location.])
+        FOUND_FREETYPE=no
+      fi
+    else
+      if test "x$OPENJDK_TARGET_OS" = xwindows; then
+        # On Windows, we will need both .lib and .dll file.
+        if ! test -s "$POTENTIAL_FREETYPE_LIB_PATH/${FREETYPE_BASE_NAME}.lib"; then
+          AC_MSG_NOTICE([Could not find $POTENTIAL_FREETYPE_LIB_PATH/${FREETYPE_BASE_NAME}.lib. Ignoring location.])
+          FOUND_FREETYPE=no
+        fi
+      elif test "x$OPENJDK_TARGET_OS" = xsolaris \
+          && test -s "$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR/$FREETYPE_LIB_NAME"; then
+        # Found lib in isa dir, use that instead.
+        POTENTIAL_FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH$OPENJDK_TARGET_CPU_ISADIR"
+        AC_MSG_NOTICE([Rewriting to use $POTENTIAL_FREETYPE_LIB_PATH instead])
+      fi
+    fi
+  fi
+
+  if test "x$FOUND_FREETYPE" = xyes; then
+    BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_INCLUDE_PATH)
+    BASIC_FIXUP_PATH(POTENTIAL_FREETYPE_LIB_PATH)
+
+    FREETYPE_INCLUDE_PATH="$POTENTIAL_FREETYPE_INCLUDE_PATH"
+    AC_MSG_CHECKING([for freetype includes])
+    AC_MSG_RESULT([$FREETYPE_INCLUDE_PATH])
+    FREETYPE_LIB_PATH="$POTENTIAL_FREETYPE_LIB_PATH"
+    AC_MSG_CHECKING([for freetype libraries])
+    AC_MSG_RESULT([$FREETYPE_LIB_PATH])
+  fi
+])
+
+################################################################################
+# Setup freetype (The FreeType2 font rendering library)
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
+[
+  AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype],
+      [specify prefix directory for the freetype package
+      (expecting the libraries under PATH/lib and the headers under PATH/include)])])
+  AC_ARG_WITH(freetype-include, [AS_HELP_STRING([--with-freetype-include],
+      [specify directory for the freetype include files])])
+  AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib],
+      [specify directory for the freetype library])])
+  AC_ARG_WITH(freetype-src, [AS_HELP_STRING([--with-freetype-src],
+      [specify directory with freetype sources to automatically build the library (experimental, Windows-only)])])
+  AC_ARG_ENABLE(freetype-bundling, [AS_HELP_STRING([--disable-freetype-bundling],
+      [disable bundling of the freetype library with the build result @<:@enabled on Windows or when using --with-freetype, disabled otherwise@:>@])])
+
+  # Need to specify explicitly since it needs to be overridden on some versions of macosx
+  FREETYPE_BASE_NAME=freetype
+  FREETYPE_CFLAGS=
+  FREETYPE_LIBS=
+  FREETYPE_BUNDLE_LIB_PATH=
+
+  if test "x$NEEDS_LIB_FREETYPE" = xfalse; then
+    if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x || test "x$with_freetype_src" != x; then
+      AC_MSG_WARN([freetype not used, so --with-freetype is ignored])
+    fi
+    if test "x$enable_freetype_bundling" != x; then
+      AC_MSG_WARN([freetype not used, so --enable-freetype-bundling is ignored])
+    fi
+  else
+    # freetype is needed to build; go get it!
+
+    BUNDLE_FREETYPE="$enable_freetype_bundling"
+
+    if  test "x$with_freetype_src" != x; then
+      if test "x$OPENJDK_TARGET_OS" = xwindows; then
+        # Try to build freetype if --with-freetype-src was given on Windows
+        LIB_BUILD_FREETYPE([$with_freetype_src])
+        if test "x$BUILD_FREETYPE" = xyes; then
+          # Okay, we built it. Check that it works.
+          LIB_CHECK_POTENTIAL_FREETYPE($POTENTIAL_FREETYPE_INCLUDE_PATH, $POTENTIAL_FREETYPE_LIB_PATH, [--with-freetype-src])
+          if test "x$FOUND_FREETYPE" != xyes; then
+            AC_MSG_ERROR([Can not use the built freetype at location given by --with-freetype-src])
+          fi
+        else
+          AC_MSG_NOTICE([User specified --with-freetype-src but building freetype failed. (see freetype.log for build results)])
+          AC_MSG_ERROR([Consider building freetype manually and using --with-freetype instead.])
+        fi
+      else
+        AC_MSG_WARN([--with-freetype-src is currently only supported on Windows - ignoring])
+      fi
+    fi
+
+    if test "x$with_freetype" != x || test "x$with_freetype_include" != x || test "x$with_freetype_lib" != x; then
+      # User has specified settings
+
+      if test "x$BUNDLE_FREETYPE" = x; then
+        # If not specified, default is to bundle freetype
+        BUNDLE_FREETYPE=yes
+      fi
+
+      if test "x$with_freetype" != x; then
+        POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype/include"
+        POTENTIAL_FREETYPE_LIB_PATH="$with_freetype/lib"
+      fi
+
+      # Allow --with-freetype-lib and --with-freetype-include to override
+      if test "x$with_freetype_include" != x; then
+        POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
+      fi
+      if test "x$with_freetype_lib" != x; then
+        POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
+      fi
+
+      if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" != x && test "x$POTENTIAL_FREETYPE_LIB_PATH" != x; then
+        # Okay, we got it. Check that it works.
+        LIB_CHECK_POTENTIAL_FREETYPE($POTENTIAL_FREETYPE_INCLUDE_PATH, $POTENTIAL_FREETYPE_LIB_PATH, [--with-freetype])
+        if test "x$FOUND_FREETYPE" != xyes; then
+          AC_MSG_ERROR([Can not find or use freetype at location given by --with-freetype])
+        fi
+      else
+        # User specified only one of lib or include. This is an error.
+        if test "x$POTENTIAL_FREETYPE_INCLUDE_PATH" = x ; then
+          AC_MSG_NOTICE([User specified --with-freetype-lib but not --with-freetype-include])
+          AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
+        else
+          AC_MSG_NOTICE([User specified --with-freetype-include but not --with-freetype-lib])
+          AC_MSG_ERROR([Need both freetype lib and include paths. Consider using --with-freetype instead.])
+        fi
+      fi
+    else
+      # User did not specify settings, but we need freetype. Try to locate it.
+
+      if test "x$BUNDLE_FREETYPE" = x; then
+        # If not specified, default is to bundle freetype only on windows
+        if test "x$OPENJDK_TARGET_OS" = xwindows; then
+          BUNDLE_FREETYPE=yes
+        else
+          BUNDLE_FREETYPE=no
+        fi
+      fi
+
+      # If we have a sysroot, assume that's where we are supposed to look and skip pkg-config.
+      if test "x$SYSROOT" = x; then
+        if test "x$FOUND_FREETYPE" != xyes; then
+          # Check modules using pkg-config, but only if we have it (ugly output results otherwise)
+          if test "x$PKG_CONFIG" != x; then
+            PKG_CHECK_MODULES(FREETYPE, freetype2, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
+            if test "x$FOUND_FREETYPE" = xyes; then
+              # On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
+              FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'`
+              # 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
+              if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+                FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'`
+              fi
+              # PKG_CHECK_MODULES will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
+              if test "x$BUNDLE_FREETYPE" = xyes; then
+                AC_MSG_NOTICE([Found freetype using pkg-config, but ignoring since we can not bundle that])
+                FOUND_FREETYPE=no
+              else
+                AC_MSG_CHECKING([for freetype])
+                AC_MSG_RESULT([yes (using pkg-config)])
+              fi
+            fi
+          fi
+        fi
+      fi
+
+      if test "x$FOUND_FREETYPE" != xyes; then
+        # Check in well-known locations
+        if test "x$OPENJDK_TARGET_OS" = xwindows; then
+          FREETYPE_BASE_DIR="$PROGRAMFILES/GnuWin32"
+          BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
+          LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+          if test "x$FOUND_FREETYPE" != xyes; then
+            FREETYPE_BASE_DIR="$ProgramW6432/GnuWin32"
+            BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
+            LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+          fi
+        else
+          FREETYPE_BASE_DIR="$SYSROOT/usr"
+          LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+
+          if test "x$FOUND_FREETYPE" != xyes; then
+            FREETYPE_BASE_DIR="$SYSROOT/usr/X11"
+            LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+          fi
+
+          if test "x$FOUND_FREETYPE" != xyes; then
+            FREETYPE_BASE_DIR="$SYSROOT/usr/sfw"
+            LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+          fi
+
+          if test "x$FOUND_FREETYPE" != xyes; then
+            FREETYPE_BASE_DIR="$SYSROOT/usr"
+            if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu], [well-known location])
+            else
+              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
+              if test "x$FOUND_FREETYPE" != xyes; then
+                LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib32], [well-known location])
+              fi
+            fi
+          fi
+        fi
+      fi # end check in well-known locations
+
+      if test "x$FOUND_FREETYPE" != xyes; then
+        HELP_MSG_MISSING_DEPENDENCY([freetype])
+        AC_MSG_ERROR([Could not find freetype! $HELP_MSG ])
+      fi
+    fi # end user specified settings
+
+    # Set FREETYPE_CFLAGS, _LIBS and _LIB_PATH from include and lib dir.
+    if test "x$FREETYPE_CFLAGS" = x; then
+      BASIC_FIXUP_PATH(FREETYPE_INCLUDE_PATH)
+      if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
+        FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
+      else
+        FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
+      fi
+    fi
+
+    if test "x$FREETYPE_LIBS" = x; then
+      BASIC_FIXUP_PATH(FREETYPE_LIB_PATH)
+      if test "x$OPENJDK_TARGET_OS" = xwindows; then
+        FREETYPE_LIBS="$FREETYPE_LIB_PATH/$FREETYPE_BASE_NAME.lib"
+      else
+        FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -l$FREETYPE_BASE_NAME"
+      fi
+    fi
+
+    # Try to compile it
+    AC_MSG_CHECKING([if we can compile and link with freetype])
+    AC_LANG_PUSH(C++)
+    PREV_CXXCFLAGS="$CXXFLAGS"
+    PREV_LIBS="$LIBS"
+    PREV_CXX="$CXX"
+    CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
+    LIBS="$LIBS $FREETYPE_LIBS"
+    CXX="$FIXPATH $CXX"
+    AC_LINK_IFELSE([AC_LANG_SOURCE([[
+          #include<ft2build.h>
+          #include FT_FREETYPE_H
+          int main () {
+            FT_Init_FreeType(NULL);
+            return 0;
+          }
+        ]])],
+        [
+          AC_MSG_RESULT([yes])
+        ],
+        [
+          AC_MSG_RESULT([no])
+          AC_MSG_NOTICE([Could not compile and link with freetype. This might be a 32/64-bit mismatch.])
+          AC_MSG_NOTICE([Using FREETYPE_CFLAGS=$FREETYPE_CFLAGS and FREETYPE_LIBS=$FREETYPE_LIBS])
+
+          HELP_MSG_MISSING_DEPENDENCY([freetype])
+
+          AC_MSG_ERROR([Can not continue without freetype. $HELP_MSG])
+        ]
+    )
+    CXXCFLAGS="$PREV_CXXFLAGS"
+    LIBS="$PREV_LIBS"
+    CXX="$PREV_CXX"
+    AC_LANG_POP(C++)
+
+    AC_MSG_CHECKING([if we should bundle freetype])
+    if test "x$BUNDLE_FREETYPE" = xyes; then
+      FREETYPE_BUNDLE_LIB_PATH="$FREETYPE_LIB_PATH"
+    fi
+    AC_MSG_RESULT([$BUNDLE_FREETYPE])
+
+  fi # end freetype needed
+
+  AC_SUBST(FREETYPE_BUNDLE_LIB_PATH)
+  AC_SUBST(FREETYPE_CFLAGS)
+  AC_SUBST(FREETYPE_LIBS)
+])

common/autoconf/lib-std.m4

@@ -0,0 +1,120 @@
+#
+# 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+# Setup the standard C/C++ runtime libraries.
+#
+# Most importantly, determine if stdc++ should be linked statically or
+# dynamically.
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_STD_LIBS],
+[
+  # statically link libstdc++ before C++ ABI is stablized on Linux unless
+  # dynamic build is configured on command line.
+  AC_ARG_WITH([stdc++lib], [AS_HELP_STRING([--with-stdc++lib=<static>,<dynamic>,<default>],
+      [force linking of the C++ runtime on Linux to either static or dynamic, default is static with dynamic as fallback])],
+      [
+        if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \
+                && test "x$with_stdc__lib" != xdefault; then
+          AC_MSG_ERROR([Bad parameter value --with-stdc++lib=$with_stdc__lib!])
+        fi
+      ],
+      [with_stdc__lib=default]
+  )
+
+  if test "x$OPENJDK_TARGET_OS" = xlinux; then
+    # Test if -lstdc++ works.
+    AC_MSG_CHECKING([if dynamic link of stdc++ is possible])
+    AC_LANG_PUSH(C++)
+    OLD_CXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -lstdc++"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
+        [has_dynamic_libstdcxx=yes],
+        [has_dynamic_libstdcxx=no])
+    CXXFLAGS="$OLD_CXXFLAGS"
+    AC_LANG_POP(C++)
+    AC_MSG_RESULT([$has_dynamic_libstdcxx])
+
+    # Test if stdc++ can be linked statically.
+    AC_MSG_CHECKING([if static link of stdc++ is possible])
+    STATIC_STDCXX_FLAGS="-Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic"
+    AC_LANG_PUSH(C++)
+    OLD_LIBS="$LIBS"
+    OLD_CXX="$CXX"
+    LIBS="$STATIC_STDCXX_FLAGS"
+    CXX="$CC"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
+        [has_static_libstdcxx=yes],
+        [has_static_libstdcxx=no])
+    LIBS="$OLD_LIBS"
+    CXX="$OLD_CXX"
+    AC_LANG_POP(C++)
+    AC_MSG_RESULT([$has_static_libstdcxx])
+
+    if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then
+      AC_MSG_ERROR([Cannot link to stdc++, neither dynamically nor statically!])
+    fi
+
+    if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then
+      AC_MSG_ERROR([Static linking of libstdc++ was not possible!])
+    fi
+
+    if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then
+      AC_MSG_ERROR([Dynamic linking of libstdc++ was not possible!])
+    fi
+
+    # If dynamic was requested, it's available since it would fail above otherwise.
+    # If dynamic wasn't requested, go with static unless it isn't available.
+    AC_MSG_CHECKING([how to link with libstdc++])
+    if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno || test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
+      LIBCXX="$LIBCXX -lstdc++"
+      LDCXX="$CXX"
+      STATIC_CXX_SETTING="STATIC_CXX=false"
+      AC_MSG_RESULT([dynamic])
+    else
+      LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
+      LDCXX="$CC"
+      STATIC_CXX_SETTING="STATIC_CXX=true"
+      AC_MSG_RESULT([static])
+    fi
+  fi
+  AC_SUBST(STATIC_CXX_SETTING)
+
+  # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
+  if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then
+    LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
+  fi
+
+  # TODO better (platform agnostic) test
+  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$TOOLCHAIN_TYPE" = xgcc; then
+    LIBCXX="-lstdc++"
+  fi
+  AC_SUBST(LIBCXX)
+
+  # Setup Windows runtime dlls
+  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+    TOOLCHAIN_SETUP_VS_RUNTIME_DLLS
+  fi
+])

common/autoconf/lib-x11.m4

@@ -0,0 +1,121 @@
+#
+# 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+# Setup X11 Windows system
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_X11],
+[
+  if test "x$NEEDS_LIB_X11" = xfalse; then
+    if test "x${with_x}" != x; then
+      AC_MSG_WARN([X11 is not used, so --with-x is ignored])
+    fi
+    X_CFLAGS=
+    X_LIBS=
+  else
+    # Check if the user has specified sysroot, but not --x-includes or --x-libraries.
+    # Make a simple check for the libraries at the sysroot, and setup --x-includes and
+    # --x-libraries for the sysroot, if that seems to be correct.
+    if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
+      if test "x$SYSROOT" != "x"; then
+        if test "x$x_includes" = xNONE; then
+          if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
+            x_includes="$SYSROOT/usr/X11R6/include"
+          elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
+            x_includes="$SYSROOT/usr/include"
+          fi
+        fi
+        if test "x$x_libraries" = xNONE; then
+          if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
+            x_libraries="$SYSROOT/usr/X11R6/lib"
+          elif test -f "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+            x_libraries="$SYSROOT/usr/lib64"
+          elif test -f "$SYSROOT/usr/lib/libX11.so"; then
+            x_libraries="$SYSROOT/usr/lib"
+          fi
+        fi
+      fi
+    fi
+
+    # Now let autoconf do it's magic
+    AC_PATH_X
+    AC_PATH_XTRA
+
+    # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
+    # this doesn't make sense so we remove it.
+    if test "x$COMPILE_TYPE" = xcross; then
+      X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
+    fi
+
+    if test "x$no_x" = xyes; then
+      HELP_MSG_MISSING_DEPENDENCY([x11])
+      AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
+    fi
+
+    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+      OPENWIN_HOME="/usr/openwin"
+      X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
+      X_LIBS="-L$SYSROOT$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
+          -L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
+          -R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
+          -R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
+    fi
+
+    AC_LANG_PUSH(C)
+    OLD_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
+
+    # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
+    AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
+        [X11_HEADERS_OK=yes],
+        [X11_HEADERS_OK=no; break],
+        [
+          # include <X11/Xlib.h>
+          # include <X11/Xutil.h>
+        ]
+    )
+
+    if test "x$X11_HEADERS_OK" = xno; then
+      HELP_MSG_MISSING_DEPENDENCY([x11])
+      AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
+    fi
+
+    # If XLinearGradient isn't available in Xrender.h, signal that it needs to be
+    # defined in libawt_xawt.
+    AC_MSG_CHECKING([if XlinearGradient is defined in Xrender.h])
+    AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]],
+            [[XLinearGradient x;]])],
+        [AC_MSG_RESULT([yes])],
+        [AC_MSG_RESULT([no])
+         X_CFLAGS="$X_CFLAGS -DSOLARIS10_NO_XRENDER_STRUCTS"])
+
+    CFLAGS="$OLD_CFLAGS"
+    AC_LANG_POP(C)
+  fi # NEEDS_LIB_X11
+
+  AC_SUBST(X_CFLAGS)
+  AC_SUBST(X_LIBS)
+])

common/autoconf/platform.m4

@@ -489,7 +489,8 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
   AC_CHECK_HEADERS([stdio.h], , [
     AC_MSG_NOTICE([Failed to compile stdio.h. This likely implies missing compile dependencies.])
     if test "x$COMPILE_TYPE" = xreduced; then
-      AC_MSG_NOTICE([You are doing a reduced build. Check that you have 32-bit libraries installed.])
+      HELP_MSG_MISSING_DEPENDENCY([reduced])
+      AC_MSG_NOTICE([You are doing a reduced build. Check that you have 32-bit libraries installed. $HELP_MSG])
     elif test "x$COMPILE_TYPE" = xcross; then
       AC_MSG_NOTICE([You are doing a cross-compilation. Check that you have all target platform libraries installed.])
     fi
@@ -509,7 +510,7 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
       # This situation may happen on 64-bit platforms where the compiler by default only generates 32-bit objects
       # Let's try to implicitely set the compilers target architecture and retry the test
       AC_MSG_NOTICE([The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS).])
-      AC_MSG_NOTICE([I'll retry after setting the platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}])
+      AC_MSG_NOTICE([Retrying with platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}])
       PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS
 
       # We have to unset 'ac_cv_sizeof_int_p' first, otherwise AC_CHECK_SIZEOF will use the previously cached value!
@@ -524,7 +525,14 @@ _ACEOF
       TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p`
 
       if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
-        AC_MSG_ERROR([The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)])
+        AC_MSG_NOTICE([The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)])
+        if test "x$COMPILE_TYPE" = xreduced; then
+          HELP_MSG_MISSING_DEPENDENCY([reduced])
+          AC_MSG_NOTICE([You are doing a reduced build. Check that you have 32-bit libraries installed. $HELP_MSG])
+        elif test "x$COMPILE_TYPE" = xcross; then
+          AC_MSG_NOTICE([You are doing a cross-compilation. Check that you have all target platform libraries installed.])
+        fi
+        AC_MSG_ERROR([Cannot continue.])
       fi
     fi
   fi

common/autoconf/spec.gmk.in

@@ -30,31 +30,17 @@
 #   (called @OPENJDK_BUILD_AUTOCONF_NAME@ by autoconf)
 # using 'configure @CONFIGURE_COMMAND_LINE@'
 
-# When calling macros, the spaces between arguments are
-# often semantically important! Sometimes we need to subst
-# spaces and commas, therefore we need the following macros.
-X:=
-SPACE:=$(X) $(X)
-COMMA:=,
-DOLLAR:=$$
-HASH:=\#
-LEFT_PAREN:=(
-RIGHT_PAREN:=)
-SQUOTE:='
-#'
-DQUOTE:="
-#"
-define NEWLINE
-
-
-endef
-
 # The command line given to configure.
 CONFIGURE_COMMAND_LINE:=@CONFIGURE_COMMAND_LINE@
 
 # 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@
 
@@ -110,7 +96,7 @@ REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@
 REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@
 
 @SET_OPENJDK@
-LIBM:=-lm
+LIBM:=@LIBM@
 LIBDL:=@LIBDL@
 
 # colon or semicolon
@@ -281,9 +267,6 @@ CACERTS_FILE=@CACERTS_FILE@
 # 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
@@ -384,6 +367,8 @@ LDFLAGS_TESTEXE_SUFFIX:=@LDFLAGS_TESTEXE_SUFFIX@
 # build platform.
 BUILD_CC:=@FIXPATH@ @BUILD_CC@
 BUILD_LD:=@FIXPATH@ @BUILD_LD@
+BUILD_SYSROOT_CFLAGS:=@BUILD_SYSROOT_CFLAGS@
+BUILD_SYSROOT_LDFLAGS:=@BUILD_SYSROOT_LDFLAGS@
 
 AS:=@FIXPATH@ @AS@
 
@@ -438,7 +423,7 @@ STATIC_LIBRARY_SUFFIX:=@STATIC_LIBRARY_SUFFIX@
 EXE_SUFFIX:=@EXE_SUFFIX@
 OBJ_SUFFIX:=@OBJ_SUFFIX@
 
-POST_STRIP_CMD:=@POST_STRIP_CMD@
+STRIPFLAGS:=@STRIPFLAGS@
 
 JAVA_FLAGS:=@JAVA_FLAGS@
 JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
@@ -478,9 +463,6 @@ INTERIM_LANGTOOLS_ARGS = "-Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR)" -cp $(INTE
 NEW_JAVAC   = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javac.Main
 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javadoc.Main
 
-# The interim corba jar is needed for running rmic
-INTERIM_CORBA_JAR = $(BUILDTOOLS_OUTPUTDIR)/interim_corba.jar
-
 # Base flags for RC
 # Guarding this against resetting value. Legacy make files include spec multiple
 # times.
@@ -517,6 +499,8 @@ LN:=@LN@
 MKDIR:=@MKDIR@
 MV:=@MV@
 NAWK:=@NAWK@
+NICE:=@NICE@
+PATCH:=@PATCH@
 PRINTF:=@PRINTF@
 PWD:=@THEPWDCMD@
 RM:=@RM@

common/autoconf/toolchain.m4

@@ -586,6 +586,43 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
     # Only call fixup if objcopy was found.
     if test -n "$OBJCOPY"; then
       BASIC_FIXUP_EXECUTABLE(OBJCOPY)
+      if test "x$OPENJDK_BUILD_OS" = xsolaris; then
+        # objcopy prior to 2.21.1 on solaris is broken and is not usable.
+        # Rewrite objcopy version output to VALID_VERSION or BAD_VERSION.
+        # - version number is last blank separate word on first line
+        # - version number formats that have been seen:
+        #   - <major>.<minor>
+        #   - <major>.<minor>.<micro>
+        OBJCOPY_VERSION=`$OBJCOPY --version | $HEAD -n 1`
+        # The outer [ ] is to prevent m4 from eating the [] in the sed expression.
+        [ OBJCOPY_VERSION_CHECK=`$ECHO $OBJCOPY_VERSION | $SED -n \
+              -e 's/.* //' \
+              -e '/^[01]\./b bad' \
+              -e '/^2\./{' \
+              -e '  s/^2\.//' \
+              -e '  /^[0-9]$/b bad' \
+              -e '  /^[0-9]\./b bad' \
+              -e '  /^1[0-9]$/b bad' \
+              -e '  /^1[0-9]\./b bad' \
+              -e '  /^20\./b bad' \
+              -e '  /^21\.0$/b bad' \
+              -e '  /^21\.0\./b bad' \
+              -e '}' \
+              -e ':good' \
+              -e 's/.*/VALID_VERSION/p' \
+              -e 'q' \
+              -e ':bad' \
+              -e 's/.*/BAD_VERSION/p' \
+              -e 'q'` ]
+        if test "x$OBJCOPY_VERSION_CHECK" = xBAD_VERSION; then
+          OBJCOPY=
+          AC_MSG_WARN([Ignoring found objcopy since it is broken (prior to 2.21.1). No debug symbols will be generated.])
+          AC_MSG_NOTICE([objcopy reports version $OBJCOPY_VERSION])
+          AC_MSG_NOTICE([Note: patch 149063-01 or newer contains the correct Solaris 10 SPARC version])
+          AC_MSG_NOTICE([Note: patch 149064-01 or newer contains the correct Solaris 10 X86 version])
+          AC_MSG_NOTICE([Note: Solaris 11 Update 1 contains the correct version])
+        fi
+      fi
     fi
   fi
 
@@ -619,17 +656,23 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
     BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
     BASIC_PATH_PROGS(BUILD_LD, ld)
     BASIC_FIXUP_EXECUTABLE(BUILD_LD)
+    BUILD_SYSROOT_CFLAGS=""
+    BUILD_SYSROOT_LDFLAGS=""
   else
     # If we are not cross compiling, use the normal target compilers for
     # building the build platform executables.
     BUILD_CC="$CC"
     BUILD_CXX="$CXX"
     BUILD_LD="$LD"
+    BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS"
+    BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS"
   fi
 
   AC_SUBST(BUILD_CC)
   AC_SUBST(BUILD_CXX)
   AC_SUBST(BUILD_LD)
+  AC_SUBST(BUILD_SYSROOT_CFLAGS)
+  AC_SUBST(BUILD_SYSROOT_LDFLAGS)
 ])
 
 # Setup legacy variables that are still needed as alternative ways to refer to

common/bin/blessed-modifier-order.sh

@@ -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

common/bin/compare.sh

@@ -88,23 +88,19 @@ diff_text() {
         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 @@ diff_text() {
                 $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 @@ compare_general_files() {
         ! -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 @@ compare_bin_file() {
     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 @@ compare_bin_file() {
         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 @@ compare_bin_file() {
         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 $OTHER_FILE | eval "$FULLDUMP_DIFF_FILTER" \
-        $FULLDUMP_CMD $THIS_FILE  | eval "$FULLDUMP_DIFF_FILTER" > $WORK_FILE_BASE.fulldump.this  2>&1
+            > $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}')
+            FULLDUMP_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
-            ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE)
+            FULLDUMP_MSG=$($PRINTF "%8d" $FULLDUMP_DIFF_SIZE)
-            if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then
+            if [[ "$ACCEPTED_FULLDUMP_DIFF" != *"$BIN_FILE"* ]]; then
-                DIFF_ELF=true
+                DIFF_FULLDUMP=true
-                if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then
+                if [[ "$KNOWN_FULLDUMP_DIFF" != *"$BIN_FILE"* ]]; then
-                    ELF_MSG="*$ELF_MSG*"
+                    FULLDUMP_MSG="*$FULLDUMP_MSG*"
                     REGRESSIONS=true
                 else
-                    ELF_MSG=" $ELF_MSG "
+                    FULLDUMP_MSG=" $FULLDUMP_MSG "
                 fi
             else
-                ELF_MSG="($ELF_MSG)"
+                FULLDUMP_MSG="($FULLDUMP_MSG)"
-                DIFF_ELF=
+                DIFF_FULLDUMP=
             fi
         else
-            ELF_MSG="          "
+            FULLDUMP_MSG="          "
-            DIFF_ELF=
+            DIFF_FULLDUMP=
-            if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
+            if [[ "$KNOWN_FULLDUMP_DIFF $ACCEPTED_FULLDUMP_DIFF" = *"$BIN_FILE"* ]]; then
-                ELF_MSG="    !    "
+                FULLDUMP_MSG="    !    "
             fi
         fi
     fi
@@ -845,7 +841,7 @@ compare_bin_file() {
         # 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 @@ compare_bin_file() {
     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 @@ if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1
     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 @@ while [ -n "$1" ]; do
             shift
             shift
             ;;
+        --sort-symbols)
+            SORT_ALL_SYMBOLS=true
+            ;;
+        --strip)
+            STRIP_ALL=true
+            ;;
         *)
             CMP_NAMES=false
             CMP_PERMS=false
@@ -1188,28 +1193,11 @@ if [ "$SKIP_DEFAULT" != "true" ]; then
         OTHER_JDK="$OTHER/install/jdk"
         OTHER_JRE="$OTHER/install/jre"
         echo "Selecting install images for compare"
-    elif [ -d "$THIS/deploy/jdk" -o -d "$THIS/deploy/images/jdk" ] \
+    elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/deploy/images/jdk" ]; then
-	     && [ -d "$OTHER/deploy/jdk" -o -d "$OTHER/deploy/images/jdk" ]; then
+        THIS_JDK="$THIS/images/jdk"
-	if [ -d "$THIS/deploy/images/jdk" ]; then
+        THIS_JRE="$THIS/images/jre"
-            THIS_JDK="$THIS/deploy/images/jdk"
+        OTHER_JDK="$OTHER/deploy/images/jdk"
-            THIS_JRE="$THIS/deploy/images/jre"
+        OTHER_JRE="$OTHER/deploy/images/jre"
-	else
-            THIS_JDK="$THIS/deploy/jdk"
-            THIS_JRE="$THIS/deploy/jre"
-	fi
-	if [ -d "$OTHER/deploy/images/jdk" ]; then
-            OTHER_JDK="$OTHER/deploy/images/jdk"
-            OTHER_JRE="$OTHER/deploy/images/jre"
-	else
-            OTHER_JDK="$OTHER/deploy/jdk"
-            OTHER_JRE="$OTHER/deploy/jre"
-	fi
-        echo "Selecting deploy images for compare"
-    elif [ -d "$THIS/deploy/images/jdk" ] && [ -d "$OTHER/deploy/jdk" ]; then
-        THIS_JDK="$THIS/deploy/jdk"
-        THIS_JRE="$THIS/deploy/jre"
-        OTHER_JDK="$OTHER/deploy/jdk"
-        OTHER_JRE="$OTHER/deploy/jre"
         echo "Selecting deploy images for compare"
     elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then
         THIS_JDK="$THIS/images/jdk"
@@ -1221,30 +1209,28 @@ if [ "$SKIP_DEFAULT" != "true" ]; then
         echo "No common images found."
         exit 1
     fi
+    echo "  $THIS_JDK"
+    echo "  $OTHER_JDK"
 
-    if [ -d "$THIS/deploy/jdk-bundle" -o -d "$THIS/deploy/images/jdk-bundle" ] \
+    if [ -d "$THIS/images/jdk-bundle" -o -d "$THIS/deploy/images/jdk-bundle" ] \
-	     && [ -d "$OTHER/deploy/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then
+	     && [ -d "$OTHER/images/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then
 	if [ -d "$THIS/deploy/images/jdk-bundle" ]; then
             THIS_JDK_BUNDLE="$THIS/deploy/images/jdk-bundle"
             THIS_JRE_BUNDLE="$THIS/deploy/images/jre-bundle"
 	else
-            THIS_JDK_BUNDLE="$THIS/deploy/jdk-bundle"
+            THIS_JDK_BUNDLE="$THIS/images/jdk-bundle"
-            THIS_JRE_BUNDLE="$THIS/deploy/jre-bundle"
+            THIS_JRE_BUNDLE="$THIS/images/jre-bundle"
 	fi
 	if [ -d "$OTHER/deploy/images/jdk-bundle" ]; then
             OTHER_JDK_BUNDLE="$OTHER/deploy/images/jdk-bundle"
             OTHER_JRE_BUNDLE="$OTHER/deploy/images/jre-bundle"
 	else
-            OTHER_JDK_BUNDLE="$OTHER/deploy/jdk-bundle"
+            OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle"
-            OTHER_JRE_BUNDLE="$OTHER/deploy/jre-bundle"
+            OTHER_JRE_BUNDLE="$OTHER/images/jre-bundle"
 	fi
-        echo "Also comparing deploy macosx bundles"
+        echo "Also comparing jdk macosx bundles"
-    elif [ -d "$THIS/images/jdk-bundle" ] && [ -d "$OTHER/images/jdk-bundle" ]; then
+        echo "  $THIS_JDK_BUNDLE"
-        THIS_JDK_BUNDLE="$THIS/images/jdk-bundle"
+        echo "  $OTHER_JDK_BUNDLE"
-        THIS_JRE_BUNDLE="$THIS/images/jre-bundle"
-        OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle"
-        OTHER_JRE_BUNDLE="$OTHER/images/jre-bundle"
-        echo "Also comparing macosx bundles"
     fi
 
     if [ -d "$THIS/deploy/bundles" -o -d "$THIS/deploy/images/bundles" ] \
@@ -1262,19 +1248,21 @@ if [ "$SKIP_DEFAULT" != "true" ]; then
         echo "Also comparing deploy javadoc bundles"
     fi
 
-    if [ -d "$THIS/deploy/JavaAppletPlugin.plugin" -o -d "$THIS/deploy/images/JavaAppletPlugin.plugin" ] \
+    if [ -d "$THIS/images/JavaAppletPlugin.plugin" ] \
-	     && [ -d "$OTHER/deploy/JavaAppletPlugin.plugin" -o -d "$OTHER/deploy/images/JavaAppletPlugin.plugin" ]; then
+	     && [ -d "$OTHER/images/JavaAppletPlugin.plugin" -o -d "$OTHER/deploy/images/JavaAppletPlugin.plugin" ]; then
-	if [ -d "$THIS/deploy/images/bundles" ]; then
+	if [ -d "$THIS/images/JavaAppletPlugin.plugin" ]; then
+            THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/images/JavaAppletPlugin.plugin"
+	else
             THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/images/JavaAppletPlugin.plugin"
-	else
-            THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/JavaAppletPlugin.plugin"
 	fi
-	if [ -d "$OTHER/deploy/images/bundles" ]; then
+	if [ -d "$OTHER/images/JavaAppletPlugin.plugin" ]; then
-            OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/images/JavaAppletPlugin.plugin"
+            OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/images/JavaAppletPlugin.plugin"
 	else
-            OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/JavaAppletPlugin.plugin"
+            OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/images/JavaAppletPlugin.plugin"
 	fi
         echo "Also comparing deploy applet image"
+        echo "  $THIS_DEPLOY_APPLET_PLUGIN_DIR"
+        echo "  $OTHER_DEPLOY_APPLET_PLUGIN_DIR"
     fi
 
     if [ -d "$OTHER/images" ]; then

common/bin/compare_exceptions.sh.incl

@@ -42,7 +42,6 @@ STRIP_BEFORE_COMPARE="
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -54,7 +53,6 @@ ACCEPTED_BIN_DIFF="
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -62,9 +60,7 @@ ACCEPTED_BIN_DIFF="
 ./lib/i386/client/libjvm.so
 ./lib/i386/libattach.so
 ./lib/i386/libdt_socket.so
-./lib/i386/libhprof.so
 ./lib/i386/libinstrument.so
-./lib/i386/libjava_crw_demo.so
 ./lib/i386/libjsdt.so
 ./lib/i386/libmanagement.so
 ./lib/i386/libnpt.so
@@ -118,7 +114,6 @@ STRIP_BEFORE_COMPARE="
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -130,16 +125,13 @@ ACCEPTED_BIN_DIFF="
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
 ./demo/jvmti/waiters/lib/libwaiters.so
 ./lib/amd64/libattach.so
 ./lib/amd64/libdt_socket.so
-./lib/amd64/libhprof.so
 ./lib/amd64/libinstrument.so
-./lib/amd64/libjava_crw_demo.so
 ./lib/amd64/libjsdt.so
 ./lib/amd64/libjsig.so
 ./lib/amd64/libmanagement.so
@@ -197,7 +189,6 @@ STRIP_BEFORE_COMPARE="
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -217,7 +208,6 @@ ACCEPTED_SMALL_SIZE_DIFF="
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -232,7 +222,6 @@ ACCEPTED_SMALL_SIZE_DIFF="
 ./lib/amd64/libdcpr.so
 ./lib/amd64/libdt_socket.so
 ./lib/amd64/libfontmanager.so
-./lib/amd64/libhprof.so
 ./lib/amd64/libinstrument.so
 ./lib/amd64/libj2gss.so
 ./lib/amd64/libj2pcsc.so
@@ -240,7 +229,6 @@ ACCEPTED_SMALL_SIZE_DIFF="
 ./lib/amd64/libj2ucrypto.so
 ./lib/amd64/libjaas_unix.so
 ./lib/amd64/libjava.so
-./lib/amd64/libjava_crw_demo.so
 ./lib/amd64/libjawt.so
 ./lib/amd64/libjdwp.so
 ./lib/amd64/libjfr.so
@@ -330,7 +318,6 @@ STRIP_BEFORE_COMPARE="
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -353,7 +340,6 @@ ACCEPTED_SMALL_SIZE_DIFF="
 ./demo/jvmti/gctest/lib/libgctest.so
 ./demo/jvmti/heapTracker/lib/libheapTracker.so
 ./demo/jvmti/heapViewer/lib/libheapViewer.so
-./demo/jvmti/hprof/lib/libhprof.so
 ./demo/jvmti/minst/lib/libminst.so
 ./demo/jvmti/mtrace/lib/libmtrace.so
 ./demo/jvmti/versionCheck/lib/libversionCheck.so
@@ -369,7 +355,6 @@ ACCEPTED_SMALL_SIZE_DIFF="
 ./lib/sparcv9/libdcpr.so
 ./lib/sparcv9/libdt_socket.so
 ./lib/sparcv9/libfontmanager.so
-./lib/sparcv9/libhprof.so
 ./lib/sparcv9/libinstrument.so
 ./lib/sparcv9/libj2gss.so
 ./lib/sparcv9/libj2pcsc.so
@@ -377,7 +362,6 @@ ACCEPTED_SMALL_SIZE_DIFF="
 ./lib/sparcv9/libj2ucrypto.so
 ./lib/sparcv9/libjaas_unix.so
 ./lib/sparcv9/libjava.so
-./lib/sparcv9/libjava_crw_demo.so
 ./lib/sparcv9/libjawt.so
 ./lib/sparcv9/libjdwp.so
 ./lib/sparcv9/libjfr.so
@@ -473,7 +457,6 @@ ACCEPTED_SMALL_SIZE_DIFF="
 ./demo/jvmti/heapTracker/lib/heapTracker.dll
 ./demo/jvmti/minst/lib/minst.dll
 ./bin/attach.dll
-./bin/java_crw_demo.dll
 ./bin/jsoundds.dll
 ./bin/server/jvm.dll
 ./bin/appletviewer.exe
@@ -611,9 +594,7 @@ ACCEPTED_BIN_DIFF="
 ./Contents/Home/lib/libawt_lwawt.dylib
 ./Contents/Home/lib/libdeploy.dylib
 ./Contents/Home/lib/libdt_socket.dylib
-./Contents/Home/lib/libhprof.dylib
 ./Contents/Home/lib/libinstrument.dylib
-./Contents/Home/lib/libjava_crw_demo.dylib
 ./Contents/Home/lib/libjdwp.dylib
 ./Contents/Home/lib/libjsdt.dylib
 ./Contents/Home/lib/libjsig.dylib
@@ -635,9 +616,7 @@ ACCEPTED_BIN_DIFF="
 ./lib/libawt_lwawt.dylib
 ./lib/libdeploy.dylib
 ./lib/libdt_socket.dylib
-./lib/libhprof.dylib
 ./lib/libinstrument.dylib
-./lib/libjava_crw_demo.dylib
 ./lib/libjdwp.dylib
 ./lib/libjsdt.dylib
 ./lib/libjsig.dylib

common/bin/logger.sh

@@ -41,5 +41,19 @@ RCDIR=`mktemp -dt jdk-build-logger.tmp.XXXXXX` || exit $?
 trap "rm -rf \"$RCDIR\"" EXIT
 LOGFILE=$1
 shift
+
+# We need to handle command likes like "VAR1=val1 /usr/bin/cmd VAR2=val2".
+# Do this by shifting away prepended variable assignments, and export them
+# instead.
+is_prefix=true
+for opt; do
+  if [[ "$is_prefix" = true && "$opt" =~ ^.*=.*$ ]]; then
+    export $opt
+    shift
+  else
+    is_prefix=false
+  fi
+done
+
 (exec 3>&1 ; ("$@" 2>&1 1>&3; echo $? > "$RCDIR/rc") | tee -a $LOGFILE 1>&2 ; exec 3>&-) | tee -a $LOGFILE
 exit `cat "$RCDIR/rc"`

corba/.hgtags

@@ -310,3 +310,21 @@ d27f7e0a7aca129969de23e9934408a31b4abf4c jdk9-b62
 afc1e295c4bf83f9a5dd539c29914edd4a754a3f jdk9-b65
 44ee68f7dbacab24a45115fd6a8ccdc7eb6e8f0b jdk9-b66
 4418697e56f1f43597f55c7cb6573549c6117868 jdk9-b67
+8efad64f40eb8cd4df376c0a5275892eeb396bbd jdk9-b68
+de8acedcb5b5870f1dc54cba575aaa5d33897ea2 jdk9-b69
+e7cf01990ed366bd493080663259281e91ce223b jdk9-b70
+cd39ed501fb0504554a7f58ac6cf3dd2b64afec0 jdk9-b71
+f9f3706bd24c42c07cb260fe05730a749b8e52f4 jdk9-b72
+29096b78d93b01a2f8882509cd40755e3d6b8cd9 jdk9-b73
+622fe934e351e89107edf3c667d6b57f543f58f1 jdk9-b74
+960b56805abd8460598897481820bd6a75f979e7 jdk9-b75
+d8126bc88fa5cd1ae4e44d86a4b1280ca1c9e2aa jdk9-b76
+8bb2441c0fec8b28f7bf11a0ca3ec1642e7ef457 jdk9-b77
+182bb7accc5253bcfefd8edc1d4997ec8f9f8694 jdk9-b78
+4ab250b8fac66ef8cd15ee78c40f0c651c96e16a jdk9-b79
+821a0373ef2d1642a9824facb938b901ad010413 jdk9-b80
+45c35b7f5b40d5af0085e4a7b3a4d6e3e0347c35 jdk9-b81
+c20d8ebddaa6fb09cc81d3edf3d1d05f4232700a jdk9-b82
+ca8a1719588424f6e04e943790c7fcb7cb0b8c8f jdk9-b83
+df70bb200356fec686681f0295c50cc3ed43c3b3 jdk9-b84
+3ec06af1368924469f7ce60a00324bac55eaeecc jdk9-b85

corba/make/CompileInterim.gmk

@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
-
-################################################################################
-
-$(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \
-    SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/jdk.rmic/share/classes \
-      $(CORBA_TOPDIR)/src/java.corba/share/classes \
-      $(CORBA_TOPDIR)/src/jdk.rmic/share/classes \
-      $(SUPPORT_OUTPUTDIR)/gensrc/java.corba, \
-    EXCLUDES := com/sun/corba/se/PortableActivationIDL, \
-    EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
-        com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
-        org/omg/PortableInterceptor/UNKNOWN.java \
-        com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
-        com/sun/corba/se/impl/presentation/rmi/jndi.properties, \
-    COPY := .prp, \
-    CLEAN := .properties, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/corba_interim_classes, \
-    JAR := $(INTERIM_CORBA_JAR)))
-
-################################################################################
-
-all: $(BUILD_INTERIM_CORBA)

corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java

@@ -2430,8 +2430,8 @@ public class IIOPInputStream
     private void throwAwayData(ValueMember[] fields,
                                com.sun.org.omg.SendingContext.CodeBase sender)
         throws InvalidClassException, StreamCorruptedException,
-               ClassNotFoundException, IOException
+               ClassNotFoundException, IOException {
-    {
+
         for (int i = 0; i < fields.length; ++i) {
 
             try {
@@ -2566,8 +2566,7 @@ public class IIOPInputStream
 
     }
 
-    private static void setObjectField(Object o, Class c, String fieldName, Object v)
+    private static void setObjectField(Object o, Class c, String fieldName, Object v) {
-    {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
             Class fieldCl = fld.getType();
@@ -2577,9 +2576,15 @@ public class IIOPInputStream
             long key = bridge.objectFieldOffset( fld ) ;
             bridge.putObject( o, key, v ) ;
         } catch (Exception e) {
-            throw utilWrapper.errorSetObjectField( e, fieldName,
+            if (o != null) {
-                o.toString(),
+                throw utilWrapper.errorSetObjectField( e, fieldName,
-                v.toString() ) ;
+                    o.toString(),
+                    v.toString() ) ;
+            } else {
+                throw utilWrapper.errorSetObjectField( e, fieldName,
+                    "null " + c.getName() + " object",
+                    v.toString() ) ;
+            }
         }
     }
 
@@ -2587,12 +2592,22 @@ public class IIOPInputStream
     {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
-            long key = bridge.objectFieldOffset( fld ) ;
+            if ((fld != null) && (fld.getType() == Boolean.TYPE)) {
-            bridge.putBoolean( o, key, v ) ;
+                long key = bridge.objectFieldOffset( fld ) ;
+                bridge.putBoolean( o, key, v ) ;
+            } else {
+                throw new InvalidObjectException("Field Type mismatch");
+            }
         } catch (Exception e) {
+            if (o != null) {
             throw utilWrapper.errorSetBooleanField( e, fieldName,
                 o.toString(),
                 new Boolean(v) ) ;
+            } else {
+                throw utilWrapper.errorSetBooleanField( e, fieldName,
+                    "null " + c.getName() + " object",
+                    new Boolean(v) ) ;
+            }
         }
     }
 
@@ -2600,12 +2615,22 @@ public class IIOPInputStream
     {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
-            long key = bridge.objectFieldOffset( fld ) ;
+            if ((fld != null) && (fld.getType() == Byte.TYPE)) {
-            bridge.putByte( o, key, v ) ;
+                long key = bridge.objectFieldOffset( fld ) ;
+                bridge.putByte( o, key, v ) ;
+            } else {
+                throw new InvalidObjectException("Field Type mismatch");
+            }
         } catch (Exception e) {
-            throw utilWrapper.errorSetByteField( e, fieldName,
+            if (o != null) {
-                o.toString(),
+                throw utilWrapper.errorSetByteField( e, fieldName,
-                new Byte(v) ) ;
+                    o.toString(),
+                    new Byte(v) ) ;
+            } else {
+                throw utilWrapper.errorSetByteField( e, fieldName,
+                    "null " + c.getName() + " object",
+                    new Byte(v) ) ;
+            }
         }
     }
 
@@ -2613,12 +2638,22 @@ public class IIOPInputStream
     {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
-            long key = bridge.objectFieldOffset( fld ) ;
+            if ((fld != null) && (fld.getType() == Character.TYPE)) {
-            bridge.putChar( o, key, v ) ;
+                long key = bridge.objectFieldOffset( fld ) ;
+                bridge.putChar( o, key, v ) ;
+            } else {
+                throw new InvalidObjectException("Field Type mismatch");
+            }
         } catch (Exception e) {
-            throw utilWrapper.errorSetCharField( e, fieldName,
+            if (o != null) {
-                o.toString(),
+                throw utilWrapper.errorSetCharField( e, fieldName,
-                new Character(v) ) ;
+                    o.toString(),
+                    new Character(v) ) ;
+            } else {
+                throw utilWrapper.errorSetCharField( e, fieldName,
+                    "null " + c.getName() + " object",
+                    new Character(v) ) ;
+            }
         }
     }
 
@@ -2626,12 +2661,22 @@ public class IIOPInputStream
     {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
-            long key = bridge.objectFieldOffset( fld ) ;
+            if ((fld != null) && (fld.getType() == Short.TYPE)) {
-            bridge.putShort( o, key, v ) ;
+                long key = bridge.objectFieldOffset( fld ) ;
+                bridge.putShort( o, key, v ) ;
+            } else {
+                throw new InvalidObjectException("Field Type mismatch");
+            }
         } catch (Exception e) {
+            if (o != null) {
             throw utilWrapper.errorSetShortField( e, fieldName,
                 o.toString(),
                 new Short(v) ) ;
+            } else {
+                throw utilWrapper.errorSetShortField( e, fieldName,
+                    "null " + c.getName() + " object",
+                    new Short(v) ) ;
+            }
         }
     }
 
@@ -2639,12 +2684,22 @@ public class IIOPInputStream
     {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
-            long key = bridge.objectFieldOffset( fld ) ;
+            if ((fld != null) && (fld.getType() == Integer.TYPE)) {
-            bridge.putInt( o, key, v ) ;
+                long key = bridge.objectFieldOffset( fld ) ;
+                bridge.putInt( o, key, v ) ;
+            } else {
+                throw new InvalidObjectException("Field Type mismatch");
+            }
         } catch (Exception e) {
-            throw utilWrapper.errorSetIntField( e, fieldName,
+            if (o != null) {
-                o.toString(),
+                throw utilWrapper.errorSetIntField( e, fieldName,
-                new Integer(v) ) ;
+                    o.toString(),
+                    new Integer(v) ) ;
+            } else {
+                throw utilWrapper.errorSetIntField( e, fieldName,
+                    "null " + c.getName() + " object",
+                    new Integer(v) ) ;
+            }
         }
     }
 
@@ -2652,12 +2707,22 @@ public class IIOPInputStream
     {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
-            long key = bridge.objectFieldOffset( fld ) ;
+            if ((fld != null) && (fld.getType() == Long.TYPE)) {
-            bridge.putLong( o, key, v ) ;
+                long key = bridge.objectFieldOffset( fld ) ;
+                bridge.putLong( o, key, v ) ;
+            } else {
+                throw new InvalidObjectException("Field Type mismatch");
+            }
         } catch (Exception e) {
-            throw utilWrapper.errorSetLongField( e, fieldName,
+            if (o != null) {
-                o.toString(),
+                throw utilWrapper.errorSetLongField( e, fieldName,
-                new Long(v) ) ;
+                    o.toString(),
+                    new Long(v) ) ;
+            } else {
+                throw utilWrapper.errorSetLongField( e, fieldName,
+                    "null " + c.getName() + " object",
+                    new Long(v) ) ;
+            }
         }
     }
 
@@ -2665,12 +2730,22 @@ public class IIOPInputStream
     {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
-            long key = bridge.objectFieldOffset( fld ) ;
+            if ((fld != null) && (fld.getType() == Float.TYPE)) {
-            bridge.putFloat( o, key, v ) ;
+                long key = bridge.objectFieldOffset( fld ) ;
+                bridge.putFloat( o, key, v ) ;
+            } else {
+                throw new InvalidObjectException("Field Type mismatch");
+            }
         } catch (Exception e) {
-            throw utilWrapper.errorSetFloatField( e, fieldName,
+            if (o != null) {
-                o.toString(),
+                throw utilWrapper.errorSetFloatField( e, fieldName,
-                new Float(v) ) ;
+                    o.toString(),
+                    new Float(v) ) ;
+            } else {
+                throw utilWrapper.errorSetFloatField( e, fieldName,
+                    "null " + c.getName() + " object",
+                    new Float(v) ) ;
+            }
         }
     }
 
@@ -2678,12 +2753,22 @@ public class IIOPInputStream
     {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
-            long key = bridge.objectFieldOffset( fld ) ;
+            if ((fld != null) && (fld.getType() == Double.TYPE)) {
-            bridge.putDouble( o, key, v ) ;
+                long key = bridge.objectFieldOffset( fld ) ;
+                bridge.putDouble( o, key, v ) ;
+            } else {
+                throw new InvalidObjectException("Field Type mismatch");
+            }
         } catch (Exception e) {
-            throw utilWrapper.errorSetDoubleField( e, fieldName,
+            if (o != null) {
-                o.toString(),
+                throw utilWrapper.errorSetDoubleField( e, fieldName,
-                new Double(v) ) ;
+                    o.toString(),
+                    new Double(v) ) ;
+            } else {
+                throw utilWrapper.errorSetDoubleField( e, fieldName,
+                    "null " + c.getName() + " object",
+                    new Double(v) ) ;
+            }
         }
     }
 

corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java

@@ -65,7 +65,7 @@ import org.omg.CORBA.ValueMember;
 import sun.corba.Bridge;
 
 /**
- * A ObjectStreamClass describes a class that can be serialized to a stream
+ * An ObjectStreamClass describes a class that can be serialized to a stream
  * or a class that was serialized to a stream.  It contains the name
  * and the serialVersionUID of the class.
  * <br>
@@ -788,9 +788,9 @@ public class ObjectStreamClass implements java.io.Serializable {
     /* Compare the base class names of streamName and localName.
      *
      * @return  Return true iff the base class name compare.
-     * @parameter streamName    Fully qualified class name.
+     * @param streamName    Fully qualified class name.
-     * @parameter localName     Fully qualified class name.
+     * @param localName     Fully qualified class name.
-     * @parameter pkgSeparator  class names use either '.' or '/'.
+     * @param pkgSeparator  class names use either '.' or '/'.
      *
      * Only compare base class name to allow package renaming.
      */

corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java

@@ -37,9 +37,9 @@ public class ByteBuffer {
     protected byte elementData[];
 
     /**
-     * The number of valid components in this <tt>ByteBuffer</tt> object.
+     * The number of valid components in this {@code ByteBuffer} object.
-     * Components <tt>elementData[0]</tt> through
+     * Components {@code elementData[0]} through
-     * <tt>elementData[elementCount-1]</tt> are the actual items.
+     * {@code elementData[elementCount-1]} are the actual items.
      *
      * @serial
      */
@@ -88,7 +88,7 @@ public class ByteBuffer {
 
     /**
      * 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 @@ public class ByteBuffer {
      * 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 @@ public class ByteBuffer {
      * 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 @@ public class ByteBuffer {
     /**
      * 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;

corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java

@@ -438,11 +438,11 @@ public class Util implements javax.rmi.CORBA.UtilDelegate
     }
 
     /**
-     * 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>.
+     * and wired to {@code obj}, then written to {@code out.write_Object(org.omg.CORBA.Object)}.
-     * If <code>obj</code> is a CORBA Object, it is written to
+     * If {@code obj} is a CORBA Object, it is written to
-     * <code>out.write_Object(org.omg.CORBA.Object)</code>.
+     * {@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 @@ public class Util implements javax.rmi.CORBA.UtilDelegate
 
     /**
      * 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
+     * If {@code obj} 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
+     * {@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</code>,
+     * RMI-IIOP server object, the tie is found and wired to {@code obj},
-     * then written to <code>out.write_abstract_interface(java.lang.Object)</code>.
+     * 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 @@ public class Util implements javax.rmi.CORBA.UtilDelegate
      * 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 @@ public class Util implements javax.rmi.CORBA.UtilDelegate
     }
 
     /**
-     * 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>
+     * the stub and they both share the same ORB instance.  The {@code _is_local()}
-     * method returns false otherwise. The default behavior of <tt>_is_local()</tt> is
+     * method returns false otherwise. The default behavior of {@code _is_local()} is
      * to return false.
      *
      * @throws RemoteException The Java to IDL specification does to

corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java

@@ -656,9 +656,9 @@ public class ObjectStreamClass_1_3_1 implements java.io.Serializable {
     /* Compare the base class names of streamName and localName.
      *
      * @return  Return true iff the base class name compare.
-     * @parameter streamName    Fully qualified class name.
+     * @param streamName    Fully qualified class name.
-     * @parameter localName     Fully qualified class name.
+     * @param localName     Fully qualified class name.
-     * @parameter pkgSeparator  class names use either '.' or '/'.
+     * @param pkgSeparator  class names use either '.' or '/'.
      *
      * Only compare base class name to allow package renaming.
      */

corba/src/java.corba/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java

@@ -93,7 +93,7 @@ public class JNDIStateFactoryImpl implements StateFactory
      * @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

corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java

@@ -165,7 +165,7 @@ public interface ORBSocketFactory
      * 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

corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/ORB.java

@@ -89,6 +89,9 @@ import com.sun.corba.se.impl.logging.OMGSystemException ;
 
 import com.sun.corba.se.impl.presentation.rmi.PresentationManagerImpl ;
 
+import jdk.internal.misc.JavaAWTAccess;
+import jdk.internal.misc.SharedSecrets;
+
 public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
     implements Broker, TypeCodeFactory
 {
@@ -202,7 +205,7 @@ public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
     public static PresentationManager getPresentationManager()
     {
         SecurityManager sm = System.getSecurityManager();
-        sun.misc.JavaAWTAccess javaAwtAccess = sun.misc.SharedSecrets.getJavaAWTAccess();
+        JavaAWTAccess javaAwtAccess = SharedSecrets.getJavaAWTAccess();
         if (sm != null && javaAwtAccess != null) {
             final Object appletContext = javaAwtAccess.getAppletContext();
             if (appletContext != null) {

corba/src/java.corba/share/classes/javax/rmi/CORBA/Util.java

@@ -108,12 +108,12 @@ public class Util {
     }
 
     /**
-     * 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
+     * and wired to {@code obj}, then written to
-<code>out.write_Object(org.omg.CORBA.Object)</code>.
+     * {@code out.write_Object(org.omg.CORBA.Object)}.
-     * If <code>obj</code> is a CORBA Object, it is written to
+     * If {@code obj} is a CORBA Object, it is written to
-     * <code>out.write_Object(org.omg.CORBA.Object)</code>.
+     * {@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 @@ public class Util {
 
     /**
      * 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
+     * If {@code obj} 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>
+     * {@code out.write_abstract_interface(java.lang.Object)}.
-is
+     * If {@code obj} is an exported
-an exported
+     * RMI-IIOP server object, the tie is found and wired to {@code obj},
-     * 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)}.
-     * then written to <code>out.write_abstract_interface(java.lang.Object)</code>.
      * @param out the stream in which to write the object.
      * @param obj the object to write.
      */
@@ -161,8 +160,8 @@ an exported
     }
 
     /**
-     * Removes the associated tie from an internal table and calls {@link
+     * Removes the associated tie from an internal table
-Tie#deactivate}
+     * and calls {@link Tie#deactivate}
      * to deactivate the object.
      * @param target the object to unexport.
      */
@@ -219,27 +218,27 @@ Tie#deactivate}
      * <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>.
+     * {@code ClassLoader}.
-     * <LI>If the first step fails, and if <tt>remoteCodebase</tt>
+     * <LI>If the first step fails, and if {@code remoteCodebase}
      * is non-null and
-     * <tt>useCodebaseOnly</tt> is false, then call
+     * {@code useCodebaseOnly} is false, then call
-     * <tt>java.rmi.server.RMIClassLoader.loadClass(remoteCodebase, className)</tt>.
+     * {@code java.rmi.server.RMIClassLoader.loadClass(remoteCodebase, className)}.
-     * <LI>If <tt>remoteCodebase</tt> is null or <tt>useCodebaseOnly</tt>
+     * <LI>If {@code remoteCodebase} is null or {@code useCodebaseOnly}
-     * is true, then call <tt>java.rmi.server.RMIClassLoader.loadClass(className)</tt>.
+     * 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 @@ Tie#deactivate}
 
 
     /**
-     * The <tt>isLocal</tt> method has the same semantics as the
+     * The {@code isLocal} method has the same semantics as the
-     * <tt>ObjectImpl._is_local</tt>
+     * {@code ObjectImpl._is_local}
-     * method, except that it can throw a <tt>RemoteException</tt>.
+     * 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>
+     * the stub and they both share the same ORB instance.  The {@code _is_local()}
-     * method returns false otherwise. The default behavior of <tt>_is_local()</tt> is
+     * 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 {
 

corba/src/java.corba/share/classes/org/omg/CORBA/AnyHolder.java

@@ -30,52 +30,52 @@ import org.omg.CORBA.portable.InputStream;
 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>,
+ * If {@code myAnyHolder} is an instance of {@code AnyHolder},
- * the value stored in its <code>value</code> field can be accessed with
+ * the value stored in its {@code value} field can be accessed with
- * <code>myAnyHolder.value</code>.
+ * {@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
+     * Constructs a new {@code AnyHolder} object with its
-     * <code>value</code> field initialized to <code>null</code>.
+     * {@code value} field initialized to {@code null}.
      */
     public AnyHolder() {
     }
 
     /**
-     * Constructs a new <code>AnyHolder</code> object for the given
+     * Constructs a new {@code AnyHolder} object for the given
-     * <code>Any</code> object.
+     * {@code Any} object.
-     * @param initial the <code>Any</code> object with which to initialize
+     * @param initial the {@code Any} object with which to initialize
-     *                the <code>value</code> field of the new
+     *                the {@code value} field of the new
-     *                <code>AnyHolder</code> object
+     *                {@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 @@ public final class AnyHolder implements  Streamable {
     }
 
     /**
-     * Marshals to <code>output</code> the value in
+     * Marshals to {@code output} the value in
-     * this <code>AnyHolder</code> object.
+     * this {@code AnyHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data.
      */
@@ -95,11 +95,11 @@ public final class AnyHolder implements  Streamable {
     }
 
     /**
-     * Returns the <code>TypeCode</code> object corresponding to the value
+     * Returns the {@code TypeCode} object corresponding to the value
-     * held in this <code>AnyHolder</code> object.
+     * 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);

corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHelper.java

@@ -26,26 +26,26 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>AnySeq</tt>.  For more information on
+ * The Helper for {@code AnySeq}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/AnySeqHelper.java
+ * org/omg/CORBA/AnySeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*
+ *
-* The class definition has been modified to conform to the following
+ * The class definition has been modified to conform to the following
-* OMG specifications :
+ * OMG specifications :
-*   <ul>
+ *   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
+ *       <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>)
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
+ *       </li>
-*
+ *
-*       <li> IDL/Java Language Mapping as defined in
+ *       <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>
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
+ *       </li>
-*   </ul>
+ *   </ul>
-*/
+ */
 
 public abstract class AnySeqHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/AnySeqHolder.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Holder for <tt>AnySeq</tt>.  For more information on
+ * The Holder for {@code AnySeq}. For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
+ * "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/AnySeqHolder.java
+ * org/omg/CORBA/AnySeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ */
 
 public final class AnySeqHolder implements org.omg.CORBA.portable.Streamable
 {

corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY.java

@@ -25,8 +25,8 @@
 
 package org.omg.CORBA;
 /**
- * A <tt>PolicyErrorCode</tt> which would be filled in
+ * A {@code PolicyErrorCode} which would be filled in
- * the <tt>PolicyError</tt> exception.
+ * the {@code PolicyError} exception.
  *
  * @author rip-dev
  */

corba/src/java.corba/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java

@@ -26,8 +26,8 @@
 package org.omg.CORBA;
 
 /**
- * A <tt>PolicyErrorCode</tt> which would be filled in
+ * A {@code PolicyErrorCode} which would be filled in
- * the <tt>PolicyError</tt> exception.
+ * the {@code PolicyError} exception.
  *
  * @author rip-dev
  */

corba/src/java.corba/share/classes/org/omg/CORBA/BAD_TYPECODE.java

@@ -27,7 +27,7 @@ package org.omg.CORBA;
 
 /**
  * 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 @@ package org.omg.CORBA;
 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 @@ public final class BAD_TYPECODE extends SystemException {
     }
 
     /**
-     * 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 @@ public final class BAD_TYPECODE extends SystemException {
     }
 
     /**
-     * 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 @@ public final class BAD_TYPECODE extends SystemException {
     }
 
     /**
-     * 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) {

corba/src/java.corba/share/classes/org/omg/CORBA/BooleanHolder.java

@@ -30,56 +30,56 @@ import org.omg.CORBA.portable.OutputStream;
 
 
 /**
- * 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>,
+ * If {@code myBooleanHolder} is an instance of {@code BooleanHolder},
- * the value stored in its <code>value</code> field can be accessed with
+ * the value stored in its {@code value} field can be accessed with
- * <code>myBooleanHolder.value</code>.
+ * {@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
+     * Constructs a new {@code BooleanHolder} object with its
-     * <code>value</code> field initialized to <code>false</code>.
+     * {@code value} field initialized to {@code false}.
      */
     public BooleanHolder() {
     }
 
     /**
-     * Constructs a new <code>BooleanHolder</code> object with its
+     * Constructs a new {@code BooleanHolder} object with its
-     * <code>value</code> field initialized with the given <code>boolean</code>.
+     * {@code value} field initialized with the given {@code boolean}.
-     * @param initial the <code>boolean</code> with which to initialize
+     * @param initial the {@code boolean} with which to initialize
-     *                the <code>value</code> field of the newly-created
+     *                the {@code value} field of the newly-created
-     *                <code>BooleanHolder</code> object
+     *                {@code BooleanHolder} object
      */
     public BooleanHolder(boolean initial) {
         value = initial;
     }
 
     /**
-     * Reads unmarshalled data from <code>input</code> and assigns it to this
+     * Reads unmarshalled data from {@code input} and assigns it to this
-     * <code>BooleanHolder</code> object's <code>value</code> field.
+     * {@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 @@ public final class BooleanHolder implements Streamable {
     }
 
     /**
-     * Marshals the value in this <code>BooleanHolder</code> object's
+     * Marshals the value in this {@code BooleanHolder} object's
-     * <code>value</code> field to the output stream <code>output</code>.
+     * {@code value} field to the output stream {@code output}.
      *
      * @param output the OutputStream which will contain the CDR formatted data
      */
@@ -97,11 +97,11 @@ public final class BooleanHolder implements Streamable {
     }
 
     /**
-     * Retrieves the <code>TypeCode</code> object that corresponds to the
+     * Retrieves the {@code TypeCode} object that corresponds to the
-     * value held in this <code>BooleanHolder</code> object.
+     * value held in this {@code BooleanHolder} object.
      *
-     * @return    the <code>TypeCode</code> for the value held
+     * @return    the {@code TypeCode} for the value held
-     *            in this <code>BooleanHolder</code> object
+     *            in this {@code BooleanHolder} object
      */
     public TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_boolean);

corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHelper.java

@@ -26,26 +26,26 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>BooleanSeq</tt>.  For more information on
+ * The Helper for {@code BooleanSeq}.  For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/BooleanSeqHelper.java
+ * org/omg/CORBA/BooleanSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*
+ *
-* The class definition has been modified to conform to the following
+ * The class definition has been modified to conform to the following
-* OMG specifications :
+ * OMG specifications :
-*   <ul>
+ *   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
+ *       <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>)
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
+ *       </li>
-*
+ *
-*       <li> IDL/Java Language Mapping as defined in
+ *       <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>
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
+ *       </li>
-*   </ul>
+ *   </ul>
-*/
+ */
 
 public abstract class BooleanSeqHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/BooleanSeqHolder.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Holder for <tt>BooleanSeq</tt>.  For more information on
+ * The Holder for {@code BooleanSeq}. For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
+ * "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/BooleanSeqHolder.java
+ * org/omg/CORBA/BooleanSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ */
 
 public final class BooleanSeqHolder implements org.omg.CORBA.portable.Streamable
 {

corba/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package org.omg.CORBA;
+
+
+/**
+ * This Helper class is used to facilitate the marshalling of {@code Bounds}.
+ * For more information on Helper files, see
+ * <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.
+ */
+
+abstract public class BoundsHelper
+{
+  private static String  _id = "IDL:omg.org/CORBA/Bounds:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.omg.CORBA.Bounds that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.omg.CORBA.Bounds extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  private static boolean __active = false;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      synchronized (org.omg.CORBA.TypeCode.class)
+      {
+        if (__typeCode == null)
+        {
+          if (__active)
+          {
+            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
+          }
+          __active = true;
+          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [0];
+          org.omg.CORBA.TypeCode _tcOf_members0 = null;
+          __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.omg.CORBA.BoundsHelper.id (), "Bounds", _members0);
+          __active = false;
+        }
+      }
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.omg.CORBA.Bounds read (org.omg.CORBA.portable.InputStream istream)
+  {
+    org.omg.CORBA.Bounds value = new org.omg.CORBA.Bounds ();
+    // read and discard the repository ID
+    istream.read_string ();
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.omg.CORBA.Bounds value)
+  {
+    // write the repository ID
+    ostream.write_string (id ());
+  }
+
+}

corba/src/java.corba/share/classes/org/omg/CORBA/ByteHolder.java

@@ -31,54 +31,54 @@ import org.omg.CORBA.portable.InputStream;
 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>,
+ * If {@code myByteHolder} is an instance of {@code ByteHolder},
- * the value stored in its <code>value</code> field can be accessed with
+ * the value stored in its {@code value} field can be accessed with
- * <code>myByteHolder.value</code>.
+ * {@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
+     * Constructs a new {@code ByteHolder} object with its
-     * <code>value</code> field initialized to 0.
+     * {@code value} field initialized to 0.
      */
     public ByteHolder() {
     }
 
     /**
-     * Constructs a new <code>ByteHolder</code> object for the given
+     * Constructs a new {@code ByteHolder} object for the given
-     * <code>byte</code>.
+     * {@code byte}.
-     * @param initial the <code>byte</code> with which to initialize
+     * @param initial the {@code byte} with which to initialize
-     *                the <code>value</code> field of the new
+     *                the {@code value} field of the new
-     *                <code>ByteHolder</code> object
+     *                {@code ByteHolder} object
      */
     public ByteHolder(byte initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in
+     * Reads from {@code input} and initalizes the value in
-     * this <code>ByteHolder</code> object
+     * this {@code ByteHolder} object
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire.
@@ -88,8 +88,8 @@ public final class ByteHolder implements Streamable {
     }
 
     /**
-     * Marshals to <code>output</code> the value in
+     * Marshals to {@code output} the value in
-     * this <code>ByteHolder</code> object.
+     * this {@code ByteHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data.
      */
@@ -99,10 +99,10 @@ public final class ByteHolder implements Streamable {
 
     /**
      * 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
+     * @return  the TypeCode of the value held in
-     *               this <code>ByteHolder</code> object
+     *          this {@code ByteHolder} object
      */
     public org.omg.CORBA.TypeCode _type() {
         return ORB.init().get_primitive_tc(TCKind.tk_octet);

corba/src/java.corba/share/classes/org/omg/CORBA/CharHolder.java

@@ -31,54 +31,54 @@ import org.omg.CORBA.portable.InputStream;
 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>,
+ * If {@code myCharHolder} is an instance of {@code CharHolder},
- * the value stored in its <code>value</code> field can be accessed with
+ * the value stored in its {@code value} field can be accessed with
- * <code>myCharHolder.value</code>.
+ * {@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
+     * Constructs a new {@code CharHolder} object with its
-     * <code>value</code> field initialized to <code>0</code>.
+     * {@code value} field initialized to {@code 0}.
      */
     public CharHolder() {
     }
 
     /**
-     * Constructs a new <code>CharHolder</code> object for the given
+     * Constructs a new {@code CharHolder} object for the given
-     * <code>char</code>.
+     * {@code char}.
-     * @param initial the <code>char</code> with which to initialize
+     * @param initial the {@code char} with which to initialize
-     *                the <code>value</code> field of the new
+     *                the {@code value} field of the new
-     *                <code>CharHolder</code> object
+     *                {@code CharHolder} object
      */
     public CharHolder(char initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in
+     * Reads from {@code input} and initalizes the value in
-     * this <code>CharHolder</code> object
+     * this {@code CharHolder} object
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire
@@ -88,8 +88,8 @@ public final class CharHolder implements Streamable {
     }
 
     /**
-     * Marshals to <code>output</code> the value in
+     * Marshals to {@code output} the value in
-     * this <code>CharHolder</code> object.
+     * this {@code CharHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data
      */
@@ -98,12 +98,12 @@ public final class CharHolder implements Streamable {
     }
 
     /**
-     * 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);

corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHelper.java

@@ -26,26 +26,26 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>CharSeq</tt>.  For more information on
+ * The Helper for {@code CharSeq}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/CharSeqHelper.java
+ * org/omg/CORBA/CharSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*
+ *
-* The class definition has been modified to conform to the following
+ * The class definition has been modified to conform to the following
-* OMG specifications :
+ * OMG specifications :
-*   <ul>
+ *   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
+ *       <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>)
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
+ *       </li>
-*
+ *
-*       <li> IDL/Java Language Mapping as defined in
+ *       <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>
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
+ *       </li>
-*   </ul>
+ *   </ul>
-*/
+ */
 
 public abstract class CharSeqHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/CharSeqHolder.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Holder for <tt>CharSeq</tt>.  For more information on
+ * The Holder for {@code CharSeq}. For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
+ * "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/CharSeqHolder.java
+ * org/omg/CORBA/CharSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ */
 
 public final class CharSeqHolder implements org.omg.CORBA.portable.Streamable
 {

corba/src/java.corba/share/classes/org/omg/CORBA/CompletionStatusHelper.java

@@ -26,13 +26,13 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>CompletionStatus</tt>.  For more information on
+ * The Helper for {@code CompletionStatus}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/CompletionStatusHelper.java
+ * org/omg/CORBA/CompletionStatusHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* 03 June 1999 11:52:03 o'clock GMT+00:00
+ * 03 June 1999 11:52:03 o'clock GMT+00:00
-*/
+ */
 
 abstract public class CompletionStatusHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/Current.java

@@ -26,16 +26,16 @@ package org.omg.CORBA;
 
 
 /**
-* 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
+* interface from the CORBA module's {@code Current}. Users of the
-* service can obtain an instance of the appropriate <tt>Current</tt>
+* service can obtain an instance of the appropriate {@code Current}
-* interface by invoking <tt>ORB::resolve_initial_references</tt>.<P>
+* 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"

corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHelper.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>Current</tt>.  For more information on
+ * The Helper for {@code Current}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/CurrentHelper.java
+ * org/omg/CORBA/CurrentHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT
+ * Saturday, July 17, 1999 12:26:21 AM PDT
-*/
+ */
 
 abstract public class CurrentHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/CurrentHolder.java

@@ -25,14 +25,14 @@
 package org.omg.CORBA;
 
 /**
-* The Holder for <tt>Current</tt>.  For more information on
+ * The Holder for {@code Current}. For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
+ * "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/CurrentHolder.java
+ * org/omg/CORBA/CurrentHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT
+ * Saturday, July 17, 1999 12:26:21 AM PDT
-*/
+ */
 
 public final class CurrentHolder implements org.omg.CORBA.portable.Streamable
 {

corba/src/java.corba/share/classes/org/omg/CORBA/CurrentOperations.java

@@ -26,15 +26,15 @@ package org.omg.CORBA;
 
 
 /**
-* The interface for <tt>Current</tt>.  For more information on
+ * The interface for {@code Current}. For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html">
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html">
-* "Generated Files"</a>.
+ * "Generated Files"</a>.
-*
+ *
-* org/omg/CORBA/CurrentOperations.java
+ * org/omg/CORBA/CurrentOperations.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:21 AM PDT.
+ * Saturday, July 17, 1999 12:26:21 AM PDT.
-*/
+ */
 
 public interface CurrentOperations
 {

corba/src/java.corba/share/classes/org/omg/CORBA/CustomMarshal.java

@@ -34,7 +34,7 @@ import org.omg.CORBA.DataInputStream;
  * 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

corba/src/java.corba/share/classes/org/omg/CORBA/DefinitionKindHelper.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>DefinitionKind</tt>.  For more information on
+ * The Helper for {@code DefinitionKind}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/DefinitionKindHelper.java
+ * org/omg/CORBA/DefinitionKindHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
+ * from ir.idl
-* 03 June 1999 11:33:43 o'clock GMT+00:00
+ * 03 June 1999 11:33:43 o'clock GMT+00:00
-*/
+ */
 
 abstract public class DefinitionKindHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/DomainManager.java

@@ -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
+ *  policies. The {@code DomainManager} has associated with it the policy
- *  objects for a
+ *  objects for a particular domain.
- *  particular domain. The domain manager also records the membership of
+ *  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

corba/src/java.corba/share/classes/org/omg/CORBA/DomainManagerOperations.java

@@ -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 @@ package org.omg.CORBA;
 
 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);
 }

corba/src/java.corba/share/classes/org/omg/CORBA/DoubleHolder.java

@@ -30,47 +30,47 @@ import org.omg.CORBA.portable.InputStream;
 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>,
+ * If {@code myDoubleHolder} is an instance of {@code DoubleHolder},
- * the value stored in its <code>value</code> field can be accessed with
+ * the value stored in its {@code value} field can be accessed with
- * <code>myDoubleHolder.value</code>.
+ * {@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
+     * Constructs a new {@code DoubleHolder} object with its
-     * <code>value</code> field initialized to 0.0.
+     * {@code value} field initialized to 0.0.
      */
     public DoubleHolder() {
     }
 
     /**
-     * Constructs a new <code>DoubleHolder</code> object for the given
+     * Constructs a new {@code DoubleHolder} object for the given
-     * <code>double</code>.
+     * {@code double}.
-     * @param initial the <code>double</code> with which to initialize
+     * @param initial the {@code double} with which to initialize
-     *                the <code>value</code> field of the new
+     *                the {@code value} field of the new
-     *                <code>DoubleHolder</code> object
+     *                {@code DoubleHolder} object
      */
     public DoubleHolder(double initial) {
         value = initial;
@@ -80,7 +80,7 @@ public final class DoubleHolder implements Streamable {
      * 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 @@ public final class DoubleHolder implements Streamable {
 
     /**
      * 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);

corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHelper.java

@@ -26,26 +26,26 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>DoubleSeq</tt>.  For more information on
+ * The Helper for {@code DoubleSeq}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/DoubleSeqHelper.java
+ * org/omg/CORBA/DoubleSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
-*
+ *
-* The class definition has been modified to conform to the following
+ * The class definition has been modified to conform to the following
-* OMG specifications :
+ * OMG specifications :
-*   <ul>
+ *   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
+ *       <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>)
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
+ *       </li>
-*
+ *
-*       <li> IDL/Java Language Mapping as defined in
+ *       <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>
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
+ *       </li>
-*   </ul>
+ *   </ul>
-*/
+ */
 
 public abstract class DoubleSeqHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/DoubleSeqHolder.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Holder for <tt>DoubleSeq</tt>.  For more information on
+ * The Holder for {@code DoubleSeq}. For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
+ * "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/DoubleSeqHolder.java
+ * org/omg/CORBA/DoubleSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
-*/
+ */
 
 public final class DoubleSeqHolder implements org.omg.CORBA.portable.Streamable
 {

corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -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
+ * constructed. A {@code DynAny} object is associated with a data value
- *  which may correspond to a copy of the value inserted into an <tt>Any</tt>.
+ * which may correspond to a copy of the value inserted into an {@code Any}.
- *  The <tt>DynAny</tt> APIs enable traversal of the data value associated with an
+ * The {@code DynAny} APIs enable traversal of the data value associated with an
- *  Any at runtime and extraction of the primitive constituents of the
+ * Any at runtime and extraction of the primitive constituents of the
- *  data value.
+ * 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
+     * Returns the {@code TypeCode} of the object inserted into
-     * this <code>DynAny</code>.
+     * 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
+     * @param dyn_any the {@code DynAny} object whose contents
-     *                are assigned to this <code>DynAny</code>.
+     *                are assigned to this {@code DynAny}.
-     * @throws Invalid if the source <code>DynAny</code> is
+     * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source
-     *            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 Invalid if the source <code>Any</code> object is
+     * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source
-     *                    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 Invalid if this <code>DynAny</code> is empty or
+     * @throws org.omg.CORBA.DynAnyPackage.Invalid if this
-     *                    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
+     * data values associated with {@code DynAny} objects.  A programmer
-     * who wants to destroy a <code>DynAny</code> object but still be able
+     * 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
+     * should first create a {@code DynAny} object for the component
-     * and then make a copy of the created <code>DynAny</code> object.
+     * 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
+     * Inserts the given {@code boolean} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code boolean} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code byte} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code byte} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code char} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code char} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code short} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code short} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code short} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code short} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code int} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code int} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code int} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code int} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code float} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code float} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code double} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code double} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code String} object as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code String} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code org.omg.CORBA.Object} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code org.omg.CORBA.Object} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code org.omg.CORBA.TypeCode} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code org.omg.CORBA.TypeCode} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code long} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code long} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code long} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code long} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code char} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code char} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code String} as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code String} to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Inserts the given {@code org.omg.CORBA.Any} object as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code org.omg.CORBA.Any} object to insert into this
-     *              <code>DynAny</code> object
+     *              {@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 @@ public interface DynAny extends org.omg.CORBA.Object
     // orbos 98-01-18: Objects By Value -- begin
 
     /**
-     * Inserts the given <code>java.io.Serializable</code> object as the value for this
+     * Inserts the given {@code java.io.Serializable} object as the value for this
-     * <code>DynAny</code> object.
+     * {@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
+     * @param value the {@code java.io.Serializable} object to insert into this
-     *              <code>DynAny</code> object
+     *              {@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
+     * Retrieves the {@code java.io.Serializable} object contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>java.io.Serializable</code> object that is the
+     * @return the {@code java.io.Serializable} object that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>java.io.Serializable</code> object
+     *               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 @@ public interface DynAny extends org.omg.CORBA.Object
     // orbos 98-01-18: Objects By Value -- end
 
     /**
-     * Retrieves the <code>boolean</code> contained
+     * Retrieves the {@code boolean} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>boolean</code> that is the
+     * @return the {@code boolean} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>boolean</code>
+     *               the type code for a {@code boolean}
      */
     public boolean get_boolean()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>byte</code> contained
+     * Retrieves the {@code byte} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>byte</code> that is the
+     * @return the {@code byte} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>byte</code>
+     *               the type code for a {@code byte}
      */
     public byte get_octet()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
     /**
-     * Retrieves the <code>char</code> contained
+     * Retrieves the {@code char} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>char</code> that is the
+     * @return the {@code char} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>char</code>
+     *               the type code for a {@code char}
      */
     public char get_char()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>short</code> contained
+     * Retrieves the {@code short} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>short</code> that is the
+     * @return the {@code short} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>short</code>
+     *               the type code for a {@code short}
      */
     public short get_short()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>short</code> contained
+     * Retrieves the {@code short} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>short</code> that is the
+     * @return the {@code short} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>short</code>
+     *               the type code for a {@code short}
      */
     public short get_ushort()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>int</code> contained
+     * Retrieves the {@code int} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>int</code> that is the
+     * @return the {@code int} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>int</code>
+     *               the type code for a {@code int}
      */
     public int get_long()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>int</code> contained
+     * Retrieves the {@code int} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>int</code> that is the
+     * @return the {@code int} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>int</code>
+     *               the type code for a {@code int}
      */
     public int get_ulong()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>float</code> contained
+     * Retrieves the {@code float} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>float</code> that is the
+     * @return the {@code float} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>float</code>
+     *               the type code for a {@code float}
      */
     public float get_float()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>double</code> contained
+     * Retrieves the {@code double} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>double</code> that is the
+     * @return the {@code double} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>double</code>
+     *               the type code for a {@code double}
      */
     public double get_double()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>String</code> contained
+     * Retrieves the {@code String} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>String</code> that is the
+     * @return the {@code String} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>String</code>
+     *               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
+     * Retrieves the {@code org.omg.CORBA.Other} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>org.omg.CORBA.Other</code> that is the
+     * @return the {@code org.omg.CORBA.Other} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for an <code>org.omg.CORBA.Other</code>
+     *               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
+     * Retrieves the {@code org.omg.CORBA.TypeCode} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>org.omg.CORBA.TypeCode</code> that is the
+     * @return the {@code org.omg.CORBA.TypeCode} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>org.omg.CORBA.TypeCode</code>
+     *               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
+     * Retrieves the {@code long} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>long</code> that is the
+     * @return the {@code long} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>long</code>
+     *               the type code for a {@code long}
      */
     public long get_longlong()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>long</code> contained
+     * Retrieves the {@code long} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>long</code> that is the
+     * @return the {@code long} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>long</code>
+     *               the type code for a {@code long}
      */
     public long get_ulonglong()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>char</code> contained
+     * Retrieves the {@code char} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>char</code> that is the
+     * @return the {@code char} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>char</code>
+     *               the type code for a {@code char}
      */
     public char get_wchar()
         throws org.omg.CORBA.DynAnyPackage.TypeMismatch;
 
 
     /**
-     * Retrieves the <code>String</code> contained
+     * Retrieves the {@code String} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>String</code> that is the
+     * @return the {@code String} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for a <code>String</code>
+     *               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
+     * Retrieves the {@code org.omg.CORBA.Any} contained
-     * in this <code>DynAny</code> object.
+     * in this {@code DynAny} object.
      *
-     * @return the <code>org.omg.CORBA.Any</code> that is the
+     * @return the {@code org.omg.CORBA.Any} that is the
-     *         value for this <code>DynAny</code> object
+     *         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
+     *               {@code DynAny} object is not equivalent to
-     *               the type code for an <code>org.omg.CORBA.Any</code>
+     *               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
+     * The appropriate {@code insert} method
-     * can be called on the resulting <code>DynAny</code> object
+     * can be called on the resulting {@code DynAny} object
      * to initialize the component.
-     * The appropriate <code>get</code> method
+     * The appropriate {@code get} method
-     * can be called on the resulting <code>DynAny</code> object
+     * 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;
+     * @return {@code true} if the pointer points to a component;
-     * <code>false</code> if there are no more components or this
+     * {@code false} if there are no more components or this
-     * <code>DynAny</code> is associated with a basic type rather than
+     * {@code DynAny} is associated with a basic type rather than
      * a constructed type
      */
     public boolean next() ;
@@ -714,12 +715,12 @@ public interface DynAny extends org.omg.CORBA.Object
      * 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;
+     * @return {@code true} if the pointer points to a component;
-     * <code>false</code> if there is no component at the designated
+     * {@code false} if there is no component at the designated
-     * index.  If this <code>DynAny</code> object is associated with a
+     * index.  If this {@code DynAny} object is associated with a
-     * basic type, this method returns <code>false</code> for any index
+     * basic type, this method returns {@code false} for any index
      * other than 0.
      */
     public boolean seek(int index) ;

corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -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
@@ -48,7 +49,8 @@ public interface DynArray extends org.omg.CORBA.Object, org.omg.CORBA.DynAny
      * <code>DynArray</code> object to the given array.
      *
      * @param value the array of <code>Any</code> objects
-     * @exception InvalidSeq if the sequence is bad
+     * @exception org.omg.CORBA.DynAnyPackage.InvalidSeq if the
+     * sequence is bad
          * @see #get_elements
      */
     public void set_elements(org.omg.CORBA.Any[] value)

corba/src/java.corba/share/classes/org/omg/CORBA/DynEnum.java

@@ -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 @@ public interface DynEnum extends org.omg.CORBA.Object, org.omg.CORBA.DynAny
 {
     /**
      * 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.
      */

corba/src/java.corba/share/classes/org/omg/CORBA/DynSequence.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -65,7 +65,8 @@ public interface DynSequence extends org.omg.CORBA.Object, org.omg.CORBA.DynAny
          * array.
      *
      * @param value the array of <code>Any</code> objects to be set
-     * @exception InvalidSeq if the array of values is bad
+     * @exception org.omg.CORBA.DynAnyPackage.InvalidSeq if the array
+     * of values is bad
          * @see #get_elements
      */
     public void set_elements(org.omg.CORBA.Any[] value)

corba/src/java.corba/share/classes/org/omg/CORBA/FieldNameHelper.java

@@ -26,13 +26,13 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>FieldName</tt>.  For more information on
+ * The Helper for {@code FieldName}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/FieldNameHelper.java
+ * org/omg/CORBA/FieldNameHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* 03 June 1999 11:52:03 o'clock GMT+00:00
+ * 03 June 1999 11:52:03 o'clock GMT+00:00
-*/
+ */
 
 abstract public class FieldNameHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/FixedHolder.java

@@ -31,7 +31,7 @@ import org.omg.CORBA.portable.OutputStream;
 
 
 /**
- * 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 @@ public final class FixedHolder implements Streamable {
      * 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 @@ public final class FixedHolder implements Streamable {
 
     /**
      * 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 @@ public final class FixedHolder implements Streamable {
 
 
     /**
-     * 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);

corba/src/java.corba/share/classes/org/omg/CORBA/FloatHolder.java

@@ -31,45 +31,45 @@ import org.omg.CORBA.portable.OutputStream;
 
 
 /**
- * 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>,
+ * If {@code myFloatHolder} is an instance of {@code FloatHolder},
- * the value stored in its <code>value</code> field can be accessed with
+ * the value stored in its {@code value} field can be accessed with
- * <code>myFloatHolder.value</code>.
+ * {@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
+     * Constructs a new {@code FloatHolder} object with its
-     * <code>value</code> field initialized to 0.0.
+     * {@code value} field initialized to 0.0.
      */
     public FloatHolder() {
     }
 
     /**
-     * Constructs a new <code>FloatHolder</code> object for the given
+     * Constructs a new {@code FloatHolder} object for the given
-     * <code>float</code>.
+     * {@code float}.
-     * @param initial the <code>float</code> with which to initialize
+     * @param initial the {@code float} with which to initialize
-     *                the <code>value</code> field of the new
+     *                the {@code value} field of the new
-     *                <code>FloatHolder</code> object
+     *                {@code FloatHolder} object
      */
     public FloatHolder(float initial) {
         value = initial;
@@ -79,7 +79,7 @@ public final class FloatHolder implements Streamable {
      * 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 @@ public final class FloatHolder implements Streamable {
     /**
      * 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);

corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHelper.java

@@ -26,26 +26,26 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>FloatSeq</tt>.  For more information on
+ * The Helper for {@code FloatSeq}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/FloatSeqHelper.java
+ * org/omg/CORBA/FloatSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
-*
+ *
-* The class definition has been modified to conform to the following
+ * The class definition has been modified to conform to the following
-* OMG specifications :
+ * OMG specifications :
-*   <ul>
+ *   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
+ *       <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>)
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
+ *       </li>
-*
+ *
-*       <li> IDL/Java Language Mapping as defined in
+ *       <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>
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
+ *       </li>
-*   </ul>
+ *   </ul>
-*/
+ */
 
 public abstract class FloatSeqHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/FloatSeqHolder.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Holder for <tt>FloatSeq</tt>.  For more information on
+ * The Holder for {@code FloatSeq}. For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
+ * "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/FloatSeqHolder.java
+ * org/omg/CORBA/FloatSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
-*/
+ */
 
 public final class FloatSeqHolder implements org.omg.CORBA.portable.Streamable
 {

corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeHelper.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>IDLType</tt>.  For more information on
+ * The Helper for {@code IDLType}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/IDLTypeHelper.java
+ * org/omg/CORBA/IDLTypeHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
+ * from ir.idl
-* 03 June 1999 11:33:44 o'clock GMT+00:00
+ * 03 June 1999 11:33:44 o'clock GMT+00:00
-*/
+ */
 
 abstract public class IDLTypeHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/IDLTypeOperations.java

@@ -25,10 +25,10 @@
 package org.omg.CORBA;
 
 /**
-* The interface for <tt>IDLType</tt>.  For more information on
+ * The interface for {@code IDLType}. For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
-* "Generated Files: Operations files"</a>.
+ * "Generated Files: Operations files"</a>.
-*/
+ */
 
 /*
  tempout/org/omg/CORBA/IDLTypeOperations.java
@@ -51,8 +51,8 @@ public interface IDLTypeOperations  extends org.omg.CORBA.IRObjectOperations
 {
     /**
      * The type attribute describes the type defined by an object
-     * derived from <code>IDLType</code>.
+     * derived from {@code IDLType}.
-     * @return the <code>TypeCode</code> defined by this object.
+     * @return the {@code TypeCode} defined by this object.
      */
     org.omg.CORBA.TypeCode type ();
 } // interface IDLTypeOperations

corba/src/java.corba/share/classes/org/omg/CORBA/INV_OBJREF.java

@@ -32,7 +32,7 @@ package org.omg.CORBA;
  * 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 @@ package org.omg.CORBA;
 
 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 @@ public final class INV_OBJREF extends SystemException {
     }
 
     /**
-     * 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 @@ public final class INV_OBJREF extends SystemException {
     }
 
     /**
-     * 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 @@ public final class INV_OBJREF extends SystemException {
     }
 
     /**
-     * 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) {

corba/src/java.corba/share/classes/org/omg/CORBA/INV_POLICY.java

@@ -28,7 +28,7 @@ package org.omg.CORBA;
 /**
  * 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 @@ package org.omg.CORBA;
 
 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 @@ public final class INV_POLICY extends SystemException {
     }
 
     /**
-     * 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 @@ public final class INV_POLICY extends SystemException {
     }
 
     /**
-     * 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 @@ public final class INV_POLICY extends SystemException {
     }
 
     /**
-     * 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

corba/src/java.corba/share/classes/org/omg/CORBA/IRObjectOperations.java

@@ -26,10 +26,10 @@ package org.omg.CORBA;
 
 
 /**
-* The interface for <tt>IRObject</tt>.  For more information on
+ * The interface for {@code IRObject}.  For more information on
-* Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
+ * Operations interfaces, see <a href="doc-files/generatedfiles.html#operations">
-* "Generated Files: Operations files"</a>.
+ * "Generated Files: Operations files"</a>.
-*/
+ */
 
 /*
  tempout/org/omg/CORBA/IRObjectOperations.java
@@ -39,7 +39,7 @@ package org.omg.CORBA;
 */
 
 /**
- * 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 @@ public interface IRObjectOperations
 
     // read interface
     /**
-     * Returns the <code>DefinitionKind</code> corresponding to this Interface Repository object.
+     * Returns the {@code DefinitionKind} corresponding to this Interface Repository object.
-     * @return the <code>DefinitionKind</code> 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 @@ public interface IRObjectOperations
      * 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>
+     * If the method is invoked on a {@code Repository} or on a {@code PrimitiveDef}
-     * then the <code>BAD_INV_ORDER</code> exception is raised with minor value 2.
+     * 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 ();

corba/src/java.corba/share/classes/org/omg/CORBA/IdentifierHelper.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>Identifier</tt>.  For more information on
+ * The Helper for {@code Identifier}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/IdentifierHelper.java
+ * org/omg/CORBA/IdentifierHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ir.idl
+ * from ir.idl
-* 03 June 1999 11:33:42 o'clock GMT+00:00
+ * 03 June 1999 11:33:42 o'clock GMT+00:00
-*/
+ */
 
 abstract public class IdentifierHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/IntHolder.java

@@ -30,57 +30,57 @@ import org.omg.CORBA.portable.InputStream;
 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>,
+ * If {@code myIntHolder} is an instance of {@code IntHolder},
- * the value stored in its <code>value</code> field can be accessed with
+ * the value stored in its {@code value} field can be accessed with
- * <code>myIntHolder.value</code>.
+ * {@code myIntHolder.value}.
  *
  * @since       JDK1.2
  */
 public final class IntHolder implements Streamable {
 
     /**
-     * The <code>int</code> value held by this <code>IntHolder</code>
+     * The {@code int} value held by this {@code IntHolder}
-     * object in its <code>value</code> field.
+     * object in its {@code value} field.
      */
     public int value;
 
     /**
-     * Constructs a new <code>IntHolder</code> object with its
+     * Constructs a new {@code IntHolder} object with its
-     * <code>value</code> field initialized to <code>0</code>.
+     * {@code value} field initialized to {@code 0}.
      */
     public IntHolder() {
     }
 
     /**
-     * Constructs a new <code>IntHolder</code> object with its
+     * Constructs a new {@code IntHolder} object with its
-     * <code>value</code> field initialized to the given
+     * {@code value} field initialized to the given
-     * <code>int</code>.
+     * {@code int}.
-     * @param initial the <code>int</code> with which to initialize
+     * @param initial the {@code int} with which to initialize
-     *                the <code>value</code> field of the newly-created
+     *                the {@code value} field of the newly-created
-     *                <code>IntHolder</code> object
+     *                {@code IntHolder} object
      */
     public IntHolder(int initial) {
         value = initial;
     }
 
     /**
-     * Reads unmarshalled data from <code>input</code> and assigns it to
+     * Reads unmarshalled data from {@code input} and assigns it to
-     * the <code>value</code> field in this <code>IntHolder</code> object.
+     * 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 @@ public final class IntHolder implements Streamable {
     }
 
     /**
-     * Marshals the value in this <code>IntHolder</code> object's
+     * Marshals the value in this {@code IntHolder} object's
-     * <code>value</code> field to the output stream <code>output</code>.
+     * {@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 @@ public final class IntHolder implements Streamable {
     }
 
     /**
-     * Retrieves the <code>TypeCode</code> object that corresponds
+     * Retrieves the {@code TypeCode} object that corresponds
-     * to the value held in this <code>IntHolder</code> object's
+     * to the value held in this {@code IntHolder} object's
-     * <code>value</code> field.
+     * {@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() {

corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java

@@ -30,26 +30,26 @@ import org.omg.CORBA.portable.*;
 /**
  * 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
+ * to provide implementations of {@code Object} pseudo
- *  operations and any other ORB-specific support mechanisms that are
+ * operations and any other ORB-specific support mechanisms that are
- *  appropriate for such objects.  Object implementation techniques are
+ * appropriate for such objects.  Object implementation techniques are
- *  inherently language-mapping specific.  Therefore, the
+ * inherently language-mapping specific.  Therefore, the
- *  <code>LocalObject</code> type is not defined in IDL, but is specified
+ * {@code LocalObject} type is not defined in IDL, but is specified
- *  in each language mapping.
+ * in each language mapping.
- *  <P>Methods that do not apply to local objects throw
+ * <P>Methods that do not apply to local objects throw
- *  an <code>org.omg.CORBA.NO_IMPLEMENT</code> exception with the message,
+ * an {@code org.omg.CORBA.NO_IMPLEMENT} exception with the message,
- *  "This is a locally contrained object."  Attempting to use a
+ * "This is a locally contrained object."  Attempting to use a
- *  <TT>LocalObject</TT> to create a DII request results in NO_IMPLEMENT
+ * {@code LocalObject} to create a DII request results in NO_IMPLEMENT
- *  system exception.  Attempting to marshal or stringify a
+ * system exception.  Attempting to marshal or stringify a
- *  <TT>LocalObject</TT> results in a MARSHAL system exception.  Narrowing
+ * {@code LocalObject} results in a MARSHAL system exception.  Narrowing
- *  and widening references to <TT>LocalObjects</TT> must work as for regular
+ * and widening references to {@code LocalObjects} must work as for regular
- *  object references.
+ * object references.
- *  <P><code>LocalObject</code> is to be used as the base class of locally
+ * <P>{@code LocalObject} is to be used as the base class of locally
- *  constrained objects, such as those in the PortableServer module.
+ * constrained objects, such as those in the PortableServer module.
- *  The specification here is based on the CORBA Components
+ * The specification here is based on the CORBA Components
- *  Volume I - orbos/99-07-01
+ * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     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 @@ public class LocalObject implements org.omg.CORBA.Object
      * <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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
      * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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
+     *                     {@code Request} instance
-     * @return the new <code>Request</code> object initialized with the given
+     * @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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
 
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
 
 
     /**
-     * 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>
+     * {@code org.omg.CORBA.Object} method.<P>
-     * Returns <code>true</code> for this <code>LocalObject</code> instance.
+     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
      */
 
     /**
-     * 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,
+     * @param responseExpected {@code true} if a response is expected,
-     *                         <code>false</code> if it is a one-way call
+     *                         {@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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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 OutputStream} that was previously returned by a
-     * <code>_request()</code>
+     * {@code _request()}
-     * call. <code>_invoke</code> returns an <code>InputStream</code> which
+     * call. {@code _invoke} returns an {@code InputStream} which
      * contains the
-     * marshaled reply. If an exception occurs, <code>_invoke</code> may throw an
+     * marshaled reply. If an exception occurs, {@code _invoke} may throw an
-     * <code>ApplicationException</code> object which contains an
+     * {@code ApplicationException} object which contains an
-     * <code>InputStream</code> from
+     * {@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 _invoke} may throw an
-     * <code>ApplicationException</code> object which contains
+     * {@code ApplicationException} object which contains
-     * an <code>InputStream</code> from
+     * 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 _invoke} may throw an
-     * <code>ApplicationException</code> object which contains
+     * {@code ApplicationException} object which contains
-     * an <code>InputStream</code> from
+     * 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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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
+     * completed. The stub passes the {@code InputStream} returned by
-     * <code>_invoke()</code> or
+     * {@code _invoke()} or
-     * <code>ApplicationException.getInputStream()</code>.
+     * {@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 @@ public class LocalObject implements org.omg.CORBA.Object
     }
 
     /**
-     * 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

corba/src/java.corba/share/classes/org/omg/CORBA/LongHolder.java

@@ -30,54 +30,54 @@ import org.omg.CORBA.portable.InputStream;
 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>,
+ * If {@code myLongHolder} is an instance of {@code LongHolder},
- * the value stored in its <code>value</code> field can be accessed with
+ * the value stored in its {@code value} field can be accessed with
- * <code>myLongHolder.value</code>.
+ * {@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
+     * Constructs a new {@code LongHolder} object with its
-     * <code>value</code> field initialized to <code>0</code>.
+     * {@code value} field initialized to {@code 0}.
      */
     public LongHolder() {
     }
 
     /**
-     * Constructs a new <code>LongHolder</code> object with its
+     * Constructs a new {@code LongHolder} object with its
-     * <code>value</code> field initialized to the given
+     * {@code value} field initialized to the given
-     * <code>long</code>.
+     * {@code long}.
-     * @param initial the <code>long</code> with which to initialize
+     * @param initial the {@code long} with which to initialize
-     *                the <code>value</code> field of the newly-created
+     *                the {@code value} field of the newly-created
-     *                <code>LongHolder</code> object
+     *                {@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 @@ public final class LongHolder implements Streamable {
     }
 
     /**
-     * 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 @@ public final class LongHolder implements Streamable {
     }
 
     /**
-     * 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

corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHelper.java

@@ -26,26 +26,26 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>LongLongSeq</tt>.  For more information on
+ * The Helper for {@code LongLongSeq}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/LongLongSeqHelper.java
+ * org/omg/CORBA/LongLongSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:37 o'clock GMT+00:00
+ * 13 May 1999 22:41:37 o'clock GMT+00:00
-*
+ *
-* The class definition has been modified to conform to the following
+ * The class definition has been modified to conform to the following
-* OMG specifications :
+ * OMG specifications :
-*   <ul>
+ *   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
+ *       <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>)
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
+ *       </li>
-*
+ *
-*       <li> IDL/Java Language Mapping as defined in
+ *       <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>
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
+ *       </li>
-*   </ul>
+ *   </ul>
-*/
+ */
 
 public abstract class LongLongSeqHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/LongLongSeqHolder.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Holder for <tt>LongLongSeq</tt>.  For more information on
+ * The Holder for {@code LongLongSeq}. For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
+ * "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/LongLongSeqHolder.java
+ * org/omg/CORBA/LongLongSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ */
 
 public final class LongLongSeqHolder implements org.omg.CORBA.portable.Streamable
 {

corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHelper.java

@@ -26,26 +26,26 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>LongSeqHelper</tt>.  For more information on
+ * The Helper for {@code LongSeqHelper}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/LongSeqHelper.java
+ * org/omg/CORBA/LongSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*
+ *
-* The class definition has been modified to conform to the following
+ * The class definition has been modified to conform to the following
-* OMG specifications :
+ * OMG specifications :
-*   <ul>
+ *   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
+ *       <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>)
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
+ *       </li>
-*
+ *
-*       <li> IDL/Java Language Mapping as defined in
+ *       <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>
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
+ *       </li>
-*   </ul>
+ *   </ul>
-*/
+ */
 
 public abstract class LongSeqHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/LongSeqHolder.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Holder for <tt>LongSeq</tt>.  For more information on
+ * The Holder for {@code LongSeq}. For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
+ * "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/LongSeqHolder.java
+ * org/omg/CORBA/LongSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ */
 
 public final class LongSeqHolder implements org.omg.CORBA.portable.Streamable
 {

corba/src/java.corba/share/classes/org/omg/CORBA/MARSHAL.java

@@ -31,7 +31,7 @@ package org.omg.CORBA;
  * 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 @@ package org.omg.CORBA;
 
 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 @@ public final class MARSHAL extends SystemException {
     }
 
     /**
-     * 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 @@ public final class MARSHAL extends SystemException {
     }
 
     /**
-     * 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 @@ public final class MARSHAL extends SystemException {
     }
 
     /**
-     * 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

corba/src/java.corba/share/classes/org/omg/CORBA/NO_IMPLEMENT.java

@@ -28,7 +28,7 @@ package org.omg.CORBA;
 /**
  * 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 @@ package org.omg.CORBA;
 
 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 @@ public final class NO_IMPLEMENT extends SystemException {
     }
 
     /**
-     * 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 @@ public final class NO_IMPLEMENT extends SystemException {
     }
 
     /**
-     * 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 minor an {@code int} specifying the minor code
-     * @param completed a <code>CompletionStatus</code> instance indicating
+     * @param completed a {@code CompletionStatus} instance indicating
      *                  the completion status
      */
     public NO_IMPLEMENT(int minor, CompletionStatus completed) {
@@ -73,11 +73,11 @@ public final class NO_IMPLEMENT extends SystemException {
     }
 
     /**
-     * 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 minor an {@code int} specifying the minor code
-     * @param completed a <code>CompletionStatus</code> instance indicating
+     * @param completed a {@code CompletionStatus} instance indicating
      *                  the completion status
      */
     public NO_IMPLEMENT(String s, int minor, CompletionStatus completed) {

corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePair.java

@@ -28,33 +28,33 @@ package org.omg.CORBA;
 
 /**
  * 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
+     * Constructs a {@code NameValuePair} object that associates
-     * the given name with the given <code>org.omg.CORBA.Any</code> object.
+     * the given name with the given {@code org.omg.CORBA.Any} object.
-     * @param __id the name to be associated with the given <code>Any</code> object
+     * @param __id the name to be associated with the given {@code Any} object
-     * @param __value the <code>Any</code> object to be associated with the given name
+     * @param __value the {@code Any} object to be associated with the given name
      */
     public NameValuePair(String __id, org.omg.CORBA.Any __value) {
         id = __id;

corba/src/java.corba/share/classes/org/omg/CORBA/NameValuePairHelper.java

@@ -26,13 +26,13 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>NameValuePair</tt>.  For more information on
+ * The Helper for {@code NameValuePair}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/NameValuePairHelper.java
+ * org/omg/CORBA/NameValuePairHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* 03 June 1999 11:52:03 o'clock GMT+00:00
+ * 03 June 1999 11:52:03 o'clock GMT+00:00
-*/
+ */
 
 abstract public class NameValuePairHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package org.omg.CORBA.ORBPackage;
+
+
+/**
+ * This Helper class is used to facilitate the marshalling of
+ * {@code ORBPackage/InvalidName}.
+ * For more information on Helper files, see
+ * <a href="doc-files/generatedfiles.html#helper">
+ * "Generated Files: Helper Files"</a>.
+ */
+
+abstract public class InvalidNameHelper
+{
+  private static String  _id = "IDL:omg.org.CORBA/ORB/InvalidName:1.0";
+
+  public static void insert (org.omg.CORBA.Any a, org.omg.CORBA.ORBPackage.InvalidName that)
+  {
+    org.omg.CORBA.portable.OutputStream out = a.create_output_stream ();
+    a.type (type ());
+    write (out, that);
+    a.read_value (out.create_input_stream (), type ());
+  }
+
+  public static org.omg.CORBA.ORBPackage.InvalidName extract (org.omg.CORBA.Any a)
+  {
+    return read (a.create_input_stream ());
+  }
+
+  private static org.omg.CORBA.TypeCode __typeCode = null;
+  private static boolean __active = false;
+  synchronized public static org.omg.CORBA.TypeCode type ()
+  {
+    if (__typeCode == null)
+    {
+      synchronized (org.omg.CORBA.TypeCode.class)
+      {
+        if (__typeCode == null)
+        {
+          if (__active)
+          {
+            return org.omg.CORBA.ORB.init().create_recursive_tc ( _id );
+          }
+          __active = true;
+          org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [0];
+          org.omg.CORBA.TypeCode _tcOf_members0 = null;
+          __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.omg.CORBA.ORBPackage.InvalidNameHelper.id (), "InvalidName", _members0);
+          __active = false;
+        }
+      }
+    }
+    return __typeCode;
+  }
+
+  public static String id ()
+  {
+    return _id;
+  }
+
+  public static org.omg.CORBA.ORBPackage.InvalidName read (org.omg.CORBA.portable.InputStream istream)
+  {
+    org.omg.CORBA.ORBPackage.InvalidName value = new org.omg.CORBA.ORBPackage.InvalidName ();
+    // read and discard the repository ID
+    istream.read_string ();
+    return value;
+  }
+
+  public static void write (org.omg.CORBA.portable.OutputStream ostream, org.omg.CORBA.ORBPackage.InvalidName value)
+  {
+    // write the repository ID
+    ostream.write_string (id ());
+  }
+
+}

corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHelper.java

@@ -24,10 +24,10 @@
  */
 
 /**
-* The Helper for <tt>Object</tt>.  For more information on
+ * The Helper for {@code Object}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-*/
+ */
 
 /*
  * Licensed Materials - Property of IBM

corba/src/java.corba/share/classes/org/omg/CORBA/ObjectHolder.java

@@ -31,55 +31,55 @@ import org.omg.CORBA.portable.OutputStream;
 
 
 /**
- * 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>,
+ * If {@code myObjectHolder} is an instance of {@code ObjectHolder},
- * the value stored in its <code>value</code> field can be accessed with
+ * the value stored in its {@code value} field can be accessed with
- * <code>myObjectHolder.value</code>.
+ * {@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
+     * Constructs a new {@code ObjectHolder} object with its
-     * <code>value</code> field initialized to <code>null</code>.
+     * {@code value} field initialized to {@code null}.
      */
     public ObjectHolder() {
     }
 
     /**
-     * Constructs a new <code>ObjectHolder</code> object with its
+     * Constructs a new {@code ObjectHolder} object with its
-     * <code>value</code> field initialized to the given
+     * {@code value} field initialized to the given
-     * <code>Object</code>.
+     * {@code Object}.
-     * @param initial the <code>Object</code> with which to initialize
+     * @param initial the {@code Object} with which to initialize
-     *                the <code>value</code> field of the newly-created
+     *                the {@code value} field of the newly-created
-     *                <code>ObjectHolder</code> object
+     *                {@code ObjectHolder} object
      */
     public ObjectHolder(Object initial) {
         value = initial;
     }
 
     /**
-     * Reads from <code>input</code> and initalizes the value in
+     * Reads from {@code input} and initalizes the value in
-     * this <code>ObjectHolder</code> object
+     * this {@code ObjectHolder} object
      * with the unmarshalled data.
      *
      * @param input the InputStream containing CDR formatted data from the wire.
@@ -89,8 +89,8 @@ public final class ObjectHolder implements Streamable {
     }
 
     /**
-     * Marshals to <code>output</code> the value in
+     * Marshals to {@code output} the value in
-     * this <code>ObjectHolder</code> object.
+     * this {@code ObjectHolder} object.
      *
      * @param output the OutputStream which will contain the CDR formatted data.
      */
@@ -100,10 +100,10 @@ public final class ObjectHolder implements Streamable {
 
     /**
      * 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);

corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHelper.java

@@ -26,26 +26,26 @@ package org.omg.CORBA;
 
 
 /**
-* The Helper for <tt>OctetSeq</tt>.  For more information on
+ * The Helper for {@code OctetSeq}. For more information on
-* Helper files, see <a href="doc-files/generatedfiles.html#helper">
+ * Helper files, see <a href="doc-files/generatedfiles.html#helper">
-* "Generated Files: Helper Files"</a>.<P>
+ * "Generated Files: Helper Files"</a>.<P>
-* org/omg/CORBA/OctetSeqHelper.java
+ * org/omg/CORBA/OctetSeqHelper.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*
+ *
-* The class definition has been modified to conform to the following
+ * The class definition has been modified to conform to the following
-* OMG specifications :
+ * OMG specifications :
-*   <ul>
+ *   <ul>
-*       <li> ORB core as defined by CORBA 2.3.1
+ *       <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>)
+ *       (<a href="http://www.omg.org/cgi-bin/doc?formal/99-10-07">formal/99-10-07</a>)
-*       </li>
+ *       </li>
-*
+ *
-*       <li> IDL/Java Language Mapping as defined in
+ *       <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>
+ *       <a href="http://www.omg.org/cgi-bin/doc?ptc/00-01-08">ptc/00-01-08</a>
-*       </li>
+ *       </li>
-*   </ul>
+ *   </ul>
-*/
+ */
 
 public abstract class OctetSeqHelper
 {

corba/src/java.corba/share/classes/org/omg/CORBA/OctetSeqHolder.java

@@ -26,14 +26,14 @@ package org.omg.CORBA;
 
 
 /**
-* The Holder for <tt>OctetSeq</tt>.  For more information on
+ * The Holder for {@code OctetSeq}. For more information on
-* Holder files, see <a href="doc-files/generatedfiles.html#holder">
+ * Holder files, see <a href="doc-files/generatedfiles.html#holder">
-* "Generated Files: Holder Files"</a>.<P>
+ * "Generated Files: Holder Files"</a>.<P>
-* org/omg/CORBA/OctetSeqHolder.java
+ * org/omg/CORBA/OctetSeqHolder.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from streams.idl
+ * from streams.idl
-* 13 May 1999 22:41:36 o'clock GMT+00:00
+ * 13 May 1999 22:41:36 o'clock GMT+00:00
-*/
+ */
 
 public final class OctetSeqHolder implements org.omg.CORBA.portable.Streamable
 {

corba/src/java.corba/share/classes/org/omg/CORBA/Policy.java

@@ -26,21 +26,21 @@ package org.omg.CORBA;
 
 
 /**
-* Interfaces derived from the <tt>Policy</tt> interface allow an
+ * Interfaces derived from the {@code Policy} interface allow an
-* ORB or CORBA service  access to certain choices that affect
+ * ORB or CORBA service  access to certain choices that affect
-* its operation. This information is accessed in a structured
+ * its operation. This information is accessed in a structured
-* manner using interfaces derived from the <tt>Policy</tt>
+ * manner using interfaces derived from the {@code Policy}
-* interface defined in the CORBA module. A CORBA service does not
+ * interface defined in the CORBA module. A CORBA service does not
-* have to use this method of accessing operating options, but
+ * have to use this method of accessing operating options, but
-* may choose to do so. The Security Service in particular uses
+ * may choose to do so. The Security Service in particular uses
-* this technique for associating Security Policy with objects
+ * this technique for associating Security Policy with objects
-* in the system.
+ * in the system.
-* An interface generated by the IDL-to-Java compiler.
+ * An interface generated by the IDL-to-Java compiler.
-* org/omg/CORBA/Policy.java
+ * org/omg/CORBA/Policy.java
-* Generated by the IDL-to-Java compiler (portable), version "3.0"
+ * Generated by the IDL-to-Java compiler (portable), version "3.0"
-* from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
+ * from ../../../../../src/share/classes/org/omg/PortableServer/corba.idl
-* Saturday, July 17, 1999 12:26:20 AM PDT
+ * Saturday, July 17, 1999 12:26:20 AM PDT
-*/
+ */
 
 public interface Policy extends PolicyOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity
 {