Merge

.hgtags

@@ -305,3 +305,4 @@ da950f343762a856d69751570a4c07cfa68a415b jdk9-b59
 38f98cb6b33562a926ec3b79c7b34128be37647d jdk9-b60
 ac3f5a39d4ff14d70c365e12cf5ec8f2abd52a04 jdk9-b61
 e7dbbef69d12b6a74dfad331b7188e7f893e8d29 jdk9-b62
+989253a902c34dcb7564695161c9200a5fbb7412 jdk9-b63

.hgtags-top-repo

@@ -305,3 +305,4 @@ f25ee9f62427a9ba27418e5531a89754791a305b jdk9-b57
 9fa2185bee17462d1014538bff60af6e6f0b01e7 jdk9-b60
 ea38728b4f4bdd8fd0d7a89b18069f521cf05013 jdk9-b61
 105d045a69174d870b69bfe471b3f2d05a9f8ecc jdk9-b62
+0b32ed628fa60e4ab99fb0b5866d648e16231f17 jdk9-b63

common/autoconf/basics.m4

@@ -705,9 +705,9 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
       # is performed.
       filtered_files=`$ECHO "$files_present" \
           | $SED -e 's/config.log//g' \
-	      -e 's/confdefs.h//g' \
+              -e 's/configure.log//g' \
-	      -e 's/fixpath.exe//g' \
+              -e 's/confdefs.h//g' \
-	      -e 's/ //g' \
+              -e 's/ //g' \
           | $TR -d '\n'`
       if test "x$filtered_files" != x; then
         AC_MSG_NOTICE([Current directory is $CURDIR.])
@@ -1054,3 +1054,29 @@ AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS],
 
   AC_SUBST(BASH_ARGS)
 ])
+
+# Code to run after AC_OUTPUT
+AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
+[
+  # Try to move config.log (generated by autoconf) to the configure-support directory.
+  if test -e ./config.log; then
+    $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
+  fi
+
+  # Rotate our log file (configure.log)
+  if test -e "$OUTPUT_ROOT/configure.log.old"; then
+    $RM -f "$OUTPUT_ROOT/configure.log.old"
+  fi
+  if test -e "$OUTPUT_ROOT/configure.log"; then
+    $MV -f "$OUTPUT_ROOT/configure.log" "$OUTPUT_ROOT/configure.log.old" 2> /dev/null
+  fi
+
+  # Move configure.log from current directory to the build output root
+  if test -e ./configure.log; then
+    echo found it
+    $MV -f ./configure.log "$OUTPUT_ROOT/configure.log" 2> /dev/null
+  fi
+
+  # Make the compare script executable
+  $CHMOD +x $OUTPUT_ROOT/compare.sh
+])

common/autoconf/boot-jdk.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
@@ -306,7 +306,6 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac)
   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH, javah)
   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar)
-  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII, native2ascii)
   BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner)
 
   # Finally, set some other options...

common/autoconf/bootcycle-spec.gmk.in

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2012, 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
@@ -57,6 +57,5 @@ JAVA_CMD:=$(BOOT_JDK)/bin/java
 JAVAC_CMD:=$(BOOT_JDK)/bin/javac
 JAVAH_CMD:=$(BOOT_JDK)/bin/javah
 JAR_CMD:=$(BOOT_JDK)/bin/jar
-NATIVE2ASCII_CMD:=$(BOOT_JDK)/bin/native2ascii
 JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
 SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)

common/autoconf/configure

@@ -255,13 +255,10 @@ if test "x$conf_debug_configure" != x; then
   set -x
 fi
 
-if test "x$conf_debug_configure" = xtrue; then
+# Now transfer control to the script generated by autoconf. This is where the
-  # Turn on logging, but don't turn on twice when called recursive
+# main work is done.
-  conf_debug_logfile=./debug-configure.log
+conf_logfile=./configure.log
-  (exec 3>&1 ; (. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) | tee -a $conf_debug_logfile 1>&2 ; exec 3>&-) | tee -a $conf_debug_logfile
+(exec 3>&1 ; (. $conf_script_to_run "${conf_processed_arguments[@]}" 2>&1 1>&3 ) | tee -a $conf_logfile 1>&2 ; exec 3>&-) | tee -a $conf_logfile
-else
-  ( . $conf_script_to_run "${conf_processed_arguments[@]}" )
-fi
 
 conf_result_code=$?
 ###

common/autoconf/configure.ac

@@ -265,15 +265,10 @@ CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status"
 
 # Create the actual output files. Now the main work of configure is done.
 AC_OUTPUT
+
+# After AC_OUTPUT, we need to do final work
 CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK
-
+BASIC_POST_CONFIG_OUTPUT
-# Try to move the config.log file to the output directory.
-if test -e ./config.log; then
-  $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
-fi
-
-# Make the compare script executable
-$CHMOD +x $OUTPUT_ROOT/compare.sh
 
 # Finally output some useful information to the user
 HELP_PRINT_SUMMARY_AND_WARNINGS

common/autoconf/flags.m4

@@ -65,12 +65,6 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
   fi
   AC_SUBST(POST_STRIP_CMD)
 
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    # FIXME: break out into MCSFLAGS
-    POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
-  fi
-  AC_SUBST(POST_MCS_CMD)
-
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     CC_OUT_OPTION=-Fo
     EXE_OUT_OPTION=-out:
@@ -237,7 +231,6 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS],
 
   AC_SUBST(C_FLAG_REORDER)
   AC_SUBST(CXX_FLAG_REORDER)
-  AC_SUBST(SHARED_LIBRARY_FLAGS)
   AC_SUBST(SET_EXECUTABLE_ORIGIN)
   AC_SUBST(SET_SHARED_LIBRARY_ORIGIN)
   AC_SUBST(SET_SHARED_LIBRARY_NAME)
@@ -530,6 +523,10 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
   #    CXXFLAGS_JDK  - C++ Compiler flags
   #    COMMON_CCXXFLAGS_JDK - common to C and C++
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
+    if test "x$OPENJDK_TARGET_CPU" = xx86; then
+      # Force compatibility with i586 on 32 bit intel platforms.
+      COMMON_CCXXFLAGS="${COMMON_CCXXFLAGS} -march=i586"
+    fi
     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -Wall -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
         -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
     case $OPENJDK_TARGET_CPU_ARCH in
@@ -906,6 +903,24 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_MISC],
       [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
   AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
 
+  AC_ARG_ENABLE([warnings-as-errors], [AS_HELP_STRING([--disable-warnings-as-errors],
+      [do not consider native warnings to be an error @<:@enabled@:>@])])
+
+  AC_MSG_CHECKING([if native warnings are errors])
+  if test "x$enable_warnings_as_errors" = "xyes"; then
+    AC_MSG_RESULT([yes (explicitely set)])
+    WARNINGS_AS_ERRORS=true
+  elif test "x$enable_warnings_as_errors" = "xno"; then
+    AC_MSG_RESULT([no])
+    WARNINGS_AS_ERRORS=false
+  elif test "x$enable_warnings_as_errors" = "x"; then
+    AC_MSG_RESULT([yes (default)])
+    WARNINGS_AS_ERRORS=true
+  else
+    AC_MSG_ERROR([--enable-warnings-as-errors accepts no argument])
+  fi
+  AC_SUBST(WARNINGS_AS_ERRORS)
+
   case "${TOOLCHAIN_TYPE}" in
     microsoft)
       DISABLE_WARNING_PREFIX="-wd"

common/autoconf/generated-configure.sh

@@ -684,6 +684,7 @@ ZIP_DEBUGINFO_FILES
 ENABLE_DEBUG_SYMBOLS
 CFLAGS_WARNINGS_ARE_ERRORS
 DISABLE_WARNING_PREFIX
+WARNINGS_AS_ERRORS
 COMPILER_SUPPORTS_TARGET_BITS_FLAG
 ZERO_ARCHFLAG
 LDFLAGS_TESTEXE_SUFFIX
@@ -727,7 +728,6 @@ SET_SHARED_LIBRARY_MAPFILE
 SET_SHARED_LIBRARY_NAME
 SET_SHARED_LIBRARY_ORIGIN
 SET_EXECUTABLE_ORIGIN
-SHARED_LIBRARY_FLAGS
 CXX_FLAG_REORDER
 C_FLAG_REORDER
 SYSROOT_LDFLAGS
@@ -737,7 +737,6 @@ AR_OUT_OPTION
 LD_OUT_OPTION
 EXE_OUT_OPTION
 CC_OUT_OPTION
-POST_MCS_CMD
 POST_STRIP_CMD
 ARFLAGS
 COMPILER_TARGET_BITS_FLAG
@@ -759,7 +758,6 @@ ac_ct_OBJCOPY
 OBJCOPY
 ac_ct_NM
 ac_ct_STRIP
-MCS
 GNM
 NM
 STRIP
@@ -820,7 +818,6 @@ LANGTOOLS_TOPDIR
 JAVAC_FLAGS
 BOOT_JDK_SOURCETARGET
 JARSIGNER
-NATIVE2ASCII
 JAR
 JAVAH
 JAVAC
@@ -1089,6 +1086,7 @@ with_jtreg
 with_extra_cflags
 with_extra_cxxflags
 with_extra_ldflags
+enable_warnings_as_errors
 enable_debug_symbols
 enable_zip_debug_info
 enable_native_coverage
@@ -1189,7 +1187,6 @@ JAVA
 JAVAC
 JAVAH
 JAR
-NATIVE2ASCII
 JARSIGNER
 CC
 CFLAGS
@@ -1207,7 +1204,6 @@ LIPO
 STRIP
 NM
 GNM
-MCS
 OBJCOPY
 OBJDUMP
 BUILD_CC
@@ -1857,6 +1853,9 @@ Optional Features:
   --enable-rmiconnector-iiop
                           enable the JMX RMIConnector iiop transport
                           [disabled]
+  --disable-warnings-as-errors
+                          do not consider native warnings to be an error
+                          [enabled]
   --disable-debug-symbols disable generation of debug symbols [enabled]
   --disable-zip-debug-info
                           disable zipping of debug-info files [enabled]
@@ -2070,8 +2069,6 @@ Some influential environment variables:
   JAVAC       Override default value for JAVAC
   JAVAH       Override default value for JAVAH
   JAR         Override default value for JAR
-  NATIVE2ASCII
-              Override default value for NATIVE2ASCII
   JARSIGNER   Override default value for JARSIGNER
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -2090,7 +2087,6 @@ Some influential environment variables:
   STRIP       Override default value for STRIP
   NM          Override default value for NM
   GNM         Override default value for GNM
-  MCS         Override default value for MCS
   OBJCOPY     Override default value for OBJCOPY
   OBJDUMP     Override default value for OBJDUMP
   BUILD_CC    Override default value for BUILD_CC
@@ -3504,6 +3500,9 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # Check for support for specific options in bash
 
 
+# Code to run after AC_OUTPUT
+
+
 #
 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -3599,7 +3598,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # ... then the rest
 #
-# 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
@@ -4367,7 +4366,7 @@ VS_SDK_PLATFORM_NAME_2013=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1430822730
+DATE_WHEN_GENERATED=1431429776
 
 ###############################################################################
 #
@@ -15343,9 +15342,9 @@ $as_echo "in current directory" >&6; }
       # is performed.
       filtered_files=`$ECHO "$files_present" \
           | $SED -e 's/config.log//g' \
-	      -e 's/confdefs.h//g' \
+              -e 's/configure.log//g' \
-	      -e 's/fixpath.exe//g' \
+              -e 's/confdefs.h//g' \
-	      -e 's/ //g' \
+              -e 's/ //g' \
           | $TR -d '\n'`
       if test "x$filtered_files" != x; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5
@@ -26054,133 +26053,6 @@ $as_echo "$tool_specified" >&6; }
 
 
 
-  # Use user overridden value if available, otherwise locate tool in the Boot JDK.
-
-  # Publish this variable in the help.
-
-
-  if test "x$NATIVE2ASCII" = x; then
-    # The variable is not set by user, try to locate tool using the code snippet
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native2ascii in Boot JDK" >&5
-$as_echo_n "checking for native2ascii in Boot JDK... " >&6; }
-      NATIVE2ASCII=$BOOT_JDK/bin/native2ascii
-      if test ! -x $NATIVE2ASCII; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-        as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5
-      fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
-  else
-    # The variable is set, but is it from the command line or the environment?
-
-    # Try to remove the string !NATIVE2ASCII! from our list.
-    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!NATIVE2ASCII!/}
-    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
-      # If it failed, the variable was not from the command line. Ignore it,
-      # but warn the user (except for BASH, which is always set by the calling BASH).
-      if test "xNATIVE2ASCII" != xBASH; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of NATIVE2ASCII from the environment. Use command line variables instead." >&5
-$as_echo "$as_me: WARNING: Ignoring value of NATIVE2ASCII from the environment. Use command line variables instead." >&2;}
-      fi
-      # Try to locate tool using the code snippet
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native2ascii in Boot JDK" >&5
-$as_echo_n "checking for native2ascii in Boot JDK... " >&6; }
-      NATIVE2ASCII=$BOOT_JDK/bin/native2ascii
-      if test ! -x $NATIVE2ASCII; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
-        as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5
-      fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
-    else
-      # If it succeeded, then it was overridden by the user. We will use it
-      # for the tool.
-
-      # First remove it from the list of overridden variables, so we can test
-      # for unknown variables in the end.
-      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
-
-      # Check if the provided tool contains a complete path.
-      tool_specified="$NATIVE2ASCII"
-      tool_basename="${tool_specified##*/}"
-      if test "x$tool_basename" = "x$tool_specified"; then
-        # A command without a complete path is provided, search $PATH.
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool NATIVE2ASCII=$tool_basename" >&5
-$as_echo "$as_me: Will search for user supplied tool NATIVE2ASCII=$tool_basename" >&6;}
-        # Extract the first word of "$tool_basename", so it can be a program name with args.
-set dummy $tool_basename; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NATIVE2ASCII+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $NATIVE2ASCII in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_NATIVE2ASCII="$NATIVE2ASCII" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_NATIVE2ASCII="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-NATIVE2ASCII=$ac_cv_path_NATIVE2ASCII
-if test -n "$NATIVE2ASCII"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NATIVE2ASCII" >&5
-$as_echo "$NATIVE2ASCII" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-        if test "x$NATIVE2ASCII" = x; then
-          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
-        fi
-      else
-        # Otherwise we believe it is a complete path. Use it as it is.
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool NATIVE2ASCII=$tool_specified" >&5
-$as_echo "$as_me: Will use user supplied tool NATIVE2ASCII=$tool_specified" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NATIVE2ASCII" >&5
-$as_echo_n "checking for NATIVE2ASCII... " >&6; }
-        if test ! -x "$tool_specified"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-          as_fn_error $? "User supplied tool NATIVE2ASCII=$tool_specified does not exist or is not executable" "$LINENO" 5
-        fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
-$as_echo "$tool_specified" >&6; }
-      fi
-    fi
-  fi
-
-
-
   # Use user overridden value if available, otherwise locate tool in the Boot JDK.
 
   # Publish this variable in the help.
@@ -28232,7 +28104,7 @@ $as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run c
   # For solaris we really need solaris tools, and not the GNU equivalent.
   # The build tools on Solaris reside in /usr/ccs (C Compilation System),
   # so add that to path before starting to probe.
-  # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP.
+  # FIXME: This was originally only done for AS,NM,GNM,STRIP,OBJCOPY,OBJDUMP.
   if test "x$OPENJDK_BUILD_OS" = xsolaris; then
     PATH="/usr/ccs/bin:$PATH"
   fi
@@ -36672,479 +36544,6 @@ $as_echo "$as_me: Rewriting GNM to \"$new_complete\"" >&6;}
     fi
   fi
 
-
-
-
-  # Publish this variable in the help.
-
-
-  if test "x$MCS" = x; then
-    # The variable is not set by user, try to locate tool using the code snippet
-    for ac_prog in mcs
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MCS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MCS=$ac_cv_path_MCS
-if test -n "$MCS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
-$as_echo "$MCS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$MCS" && break
-done
-
-  else
-    # The variable is set, but is it from the command line or the environment?
-
-    # Try to remove the string !MCS! from our list.
-    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MCS!/}
-    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
-      # If it failed, the variable was not from the command line. Ignore it,
-      # but warn the user (except for BASH, which is always set by the calling BASH).
-      if test "xMCS" != xBASH; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&5
-$as_echo "$as_me: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&2;}
-      fi
-      # Try to locate tool using the code snippet
-      for ac_prog in mcs
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MCS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MCS=$ac_cv_path_MCS
-if test -n "$MCS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
-$as_echo "$MCS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$MCS" && break
-done
-
-    else
-      # If it succeeded, then it was overridden by the user. We will use it
-      # for the tool.
-
-      # First remove it from the list of overridden variables, so we can test
-      # for unknown variables in the end.
-      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
-
-      # Check if the provided tool contains a complete path.
-      tool_specified="$MCS"
-      tool_basename="${tool_specified##*/}"
-      if test "x$tool_basename" = "x$tool_specified"; then
-        # A command without a complete path is provided, search $PATH.
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MCS=$tool_basename" >&5
-$as_echo "$as_me: Will search for user supplied tool MCS=$tool_basename" >&6;}
-        # Extract the first word of "$tool_basename", so it can be a program name with args.
-set dummy $tool_basename; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MCS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MCS=$ac_cv_path_MCS
-if test -n "$MCS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
-$as_echo "$MCS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-        if test "x$MCS" = x; then
-          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
-        fi
-      else
-        # Otherwise we believe it is a complete path. Use it as it is.
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MCS=$tool_specified" >&5
-$as_echo "$as_me: Will use user supplied tool MCS=$tool_specified" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCS" >&5
-$as_echo_n "checking for MCS... " >&6; }
-        if test ! -x "$tool_specified"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-          as_fn_error $? "User supplied tool MCS=$tool_specified does not exist or is not executable" "$LINENO" 5
-        fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
-$as_echo "$tool_specified" >&6; }
-      fi
-    fi
-  fi
-
-
-
-  # Only process if variable expands to non-empty
-
-  if test "x$MCS" != x; then
-    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$MCS"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path=`$CYGPATH -u "$path"`
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-  # bat and cmd files are not always considered executable in cygwin causing which
-  # to not find them
-  if test "x$new_path" = x \
-      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-    new_path=`$CYGPATH -u "$path"`
-  fi
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path=`$CYGPATH -u "$path"`
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in cygwin causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path=`$CYGPATH -u "$path"`
-    fi
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
-    fi
-  fi
-
-  # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
-  # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
-  # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
-  # "foo.exe" is OK but "foo" is an error.
-  #
-  # This test is therefore slightly more accurate than "test -f" to check for file presence.
-  # It is also a way to make sure we got the proper file name for the real test later on.
-  test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
-  if test "x$test_shortpath" = x; then
-    # Short path failed, file does not exist as specified.
-    # Try adding .exe or .cmd
-    if test -f "${new_path}.exe"; then
-      input_to_shortpath="${new_path}.exe"
-    elif test -f "${new_path}.cmd"; then
-      input_to_shortpath="${new_path}.cmd"
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$new_path\", is invalid." >&5
-$as_echo "$as_me: The path of MCS, which resolves as \"$new_path\", is invalid." >&6;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
-$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
-      as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
-    fi
-  else
-    input_to_shortpath="$new_path"
-  fi
-
-  # Call helper function which possibly converts this using DOS-style short mode.
-  # If so, the updated path is stored in $new_path.
-  new_path="$input_to_shortpath"
-
-  input_path="$input_to_shortpath"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    shortmode_path=`$CYGPATH -s -m -a "$input_path"`
-    path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
-    if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
-      # Going to short mode and back again did indeed matter. Since short mode is
-      # case insensitive, let's make it lowercase to improve readability.
-      shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-      # Now convert it back to Unix-style (cygpath)
-      input_path=`$CYGPATH -u "$shortmode_path"`
-      new_path="$input_path"
-    fi
-  fi
-
-  test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
-  if test "x$test_cygdrive_prefix" = x; then
-    # As a simple fix, exclude /usr/bin since it's not a real path.
-    if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
-      # The path is in a Cygwin special directory (e.g. /home). We need this converted to
-      # a path prefixed by /cygdrive for fixpath to work.
-      new_path="$CYGWIN_ROOT_PATH$input_path"
-    fi
-  fi
-
-  # remove trailing .exe if any
-  new_path="${new_path/%.exe/}"
-
-    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-
-  # First separate the path from the arguments. This will split at the first
-  # space.
-  complete="$MCS"
-  path="${complete%% *}"
-  tmp="$complete EOL"
-  arguments="${tmp#* }"
-
-  # Input might be given as Windows format, start by converting to
-  # unix format.
-  new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-  # Now try to locate executable using which
-  new_path=`$WHICH "$new_path" 2> /dev/null`
-
-  if test "x$new_path" = x; then
-    # Oops. Which didn't find the executable.
-    # The splitting of arguments from the executable at a space might have been incorrect,
-    # since paths with space are more likely in Windows. Give it another try with the whole
-    # argument.
-    path="$complete"
-    arguments="EOL"
-    new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-
-    new_path=`$WHICH "$new_path" 2> /dev/null`
-    # bat and cmd files are not always considered executable in MSYS causing which
-    # to not find them
-    if test "x$new_path" = x \
-        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
-        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
-      new_path="$path"
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    fi
-
-    if test "x$new_path" = x; then
-      # It's still not found. Now this is an unrecoverable error.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
-      has_space=`$ECHO "$complete" | $GREP " "`
-      if test "x$has_space" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
-$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
-      fi
-      as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
-    fi
-  fi
-
-  # Now new_path has a complete unix path to the binary
-  if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
-    # Keep paths in /bin as-is, but remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-    # Do not save /bin paths to all_fixpath_prefixes!
-  else
-    # Not in mixed or Windows style, start by that.
-    new_path=`cmd //c echo $new_path`
-
-  input_path="$new_path"
-  # Check if we need to convert this using DOS-style short mode. If the path
-  # contains just simple characters, use it. Otherwise (spaces, weird characters),
-  # take no chances and rewrite it.
-  # Note: m4 eats our [], so we need to use [ and ] instead.
-  has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
-  if test "x$has_forbidden_chars" != x; then
-    # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
-    new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-  fi
-
-    # Output is in $new_path
-
-  windows_path="$new_path"
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    unix_path=`$CYGPATH -u "$windows_path"`
-    new_path="$unix_path"
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
-    new_path="$unix_path"
-  fi
-
-    # remove trailing .exe if any
-    new_path="${new_path/%.exe/}"
-
-    # Save the first 10 bytes of this path to the storage, so fixpath can work.
-    all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
-  fi
-
-    else
-      # We're on a unix platform. Hooray! :)
-      # First separate the path from the arguments. This will split at the first
-      # space.
-      complete="$MCS"
-      path="${complete%% *}"
-      tmp="$complete EOL"
-      arguments="${tmp#* }"
-
-      # Cannot rely on the command "which" here since it doesn't always work.
-      is_absolute_path=`$ECHO "$path" | $GREP ^/`
-      if test -z "$is_absolute_path"; then
-        # Path to executable is not absolute. Find it.
-        IFS_save="$IFS"
-        IFS=:
-        for p in $PATH; do
-          if test -f "$p/$path" && test -x "$p/$path"; then
-            new_path="$p/$path"
-            break
-          fi
-        done
-        IFS="$IFS_save"
-      else
-        # This is an absolute path, we can use it without further modifications.
-        new_path="$path"
-      fi
-
-      if test "x$new_path" = x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
-$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
-        has_space=`$ECHO "$complete" | $GREP " "`
-        if test "x$has_space" != x; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
-$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
-        fi
-        as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
-      fi
-    fi
-
-    # Now join together the path and the arguments once again
-    if test "x$arguments" != xEOL; then
-      new_complete="$new_path ${arguments% *}"
-    else
-      new_complete="$new_path"
-    fi
-
-    if test "x$complete" != "x$new_complete"; then
-      MCS="$new_complete"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5
-$as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;}
-    fi
-  fi
-
   elif test "x$OPENJDK_TARGET_OS" != xwindows; then
     # FIXME: we should unify this with the solaris case above.
 
@@ -41632,12 +41031,6 @@ $as_echo "$tool_specified" >&6; }
   fi
 
 
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    # FIXME: break out into MCSFLAGS
-    POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
-  fi
-
-
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     CC_OUT_OPTION=-Fo
     EXE_OUT_OPTION=-out:
@@ -42375,7 +41768,6 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
 
 
 
-
   if test "x$OPENJDK_TARGET_OS" = xsolaris; then
     CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
     CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
@@ -42643,6 +42035,10 @@ fi
   #    CXXFLAGS_JDK  - C++ Compiler flags
   #    COMMON_CCXXFLAGS_JDK - common to C and C++
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
+    if test "x$OPENJDK_TARGET_CPU" = xx86; then
+      # Force compatibility with i586 on 32 bit intel platforms.
+      COMMON_CCXXFLAGS="${COMMON_CCXXFLAGS} -march=i586"
+    fi
     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -Wall -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
         -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
     case $OPENJDK_TARGET_CPU_ARCH in
@@ -43085,6 +42481,31 @@ $as_echo "$supports" >&6; }
 
 
 
+  # Check whether --enable-warnings-as-errors was given.
+if test "${enable_warnings_as_errors+set}" = set; then :
+  enableval=$enable_warnings_as_errors;
+fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if native warnings are errors" >&5
+$as_echo_n "checking if native warnings are errors... " >&6; }
+  if test "x$enable_warnings_as_errors" = "xyes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (explicitely set)" >&5
+$as_echo "yes (explicitely set)" >&6; }
+    WARNINGS_AS_ERRORS=true
+  elif test "x$enable_warnings_as_errors" = "xno"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    WARNINGS_AS_ERRORS=false
+  elif test "x$enable_warnings_as_errors" = "x"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (default)" >&5
+$as_echo "yes (default)" >&6; }
+    WARNINGS_AS_ERRORS=true
+  else
+    as_fn_error $? "--enable-warnings-as-errors accepts no argument" "$LINENO" 5
+  fi
+
+
   case "${TOOLCHAIN_TYPE}" in
     microsoft)
       DISABLE_WARNING_PREFIX="-wd"
@@ -54793,14 +54214,31 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
+# After AC_OUTPUT, we need to do final work
 
-# Try to move the config.log file to the output directory.
-if test -e ./config.log; then
-  $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
-fi
 
-# Make the compare script executable
+  # Try to move config.log (generated by autoconf) to the configure-support directory.
-$CHMOD +x $OUTPUT_ROOT/compare.sh
+  if test -e ./config.log; then
+    $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
+  fi
+
+  # Rotate our log file (configure.log)
+  if test -e "$OUTPUT_ROOT/configure.log.old"; then
+    $RM -f "$OUTPUT_ROOT/configure.log.old"
+  fi
+  if test -e "$OUTPUT_ROOT/configure.log"; then
+    $MV -f "$OUTPUT_ROOT/configure.log" "$OUTPUT_ROOT/configure.log.old" 2> /dev/null
+  fi
+
+  # Move configure.log from current directory to the build output root
+  if test -e ./configure.log; then
+    echo found it
+    $MV -f ./configure.log "$OUTPUT_ROOT/configure.log" 2> /dev/null
+  fi
+
+  # Make the compare script executable
+  $CHMOD +x $OUTPUT_ROOT/compare.sh
+
 
 # Finally output some useful information to the user
 
@@ -54894,14 +54332,20 @@ $CHMOD +x $OUTPUT_ROOT/compare.sh
 
 
 
-if test -e "$OUTPUT_ROOT/config.log"; then
+  # Locate config.log.
-  $GREP '^configure:.*: WARNING:' "$OUTPUT_ROOT/config.log" > /dev/null 2>&1
+  if test -e "$CONFIGURESUPPORT_OUTPUTDIR/config.log"; then
-  if test $? -eq 0; then
+    CONFIG_LOG_PATH="$CONFIGURESUPPORT_OUTPUTDIR"
-    printf "The following warnings were produced. Repeated here for convenience:\n"
+  elif test -e "./config.log"; then
-    # We must quote sed expression (using []) to stop m4 from eating the [].
+    CONFIG_LOG_PATH="."
-    $GREP '^configure:.*: WARNING:' "$OUTPUT_ROOT/config.log" | $SED -e  's/^configure:[0-9]*: //'
-    printf "\n"
   fi
-fi
 
+  if test -e "$CONFIG_LOG_PATH/config.log"; then
+    $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" > /dev/null 2>&1
+    if test $? -eq 0; then
+      printf "The following warnings were produced. Repeated here for convenience:\n"
+      # We must quote sed expression (using []) to stop m4 from eating the [].
+      $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" | $SED -e  's/^configure:[0-9]*: //'
+      printf "\n"
+    fi
+  fi
 

common/autoconf/help.m4

@@ -212,7 +212,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
   if test "x$TOOLCHAIN_VERSION" != "x"; then
     print_version=" $TOOLCHAIN_VERSION"
   fi
-  printf "* Toolchain:      $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION$print_version)\n" 
+  printf "* Toolchain:      $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION$print_version)\n"
   printf "* C Compiler:     Version $CC_VERSION_NUMBER (at $CC)\n"
   printf "* C++ Compiler:   Version $CXX_VERSION_NUMBER (at $CXX)\n"
 
@@ -263,14 +263,20 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
 
 AC_DEFUN_ONCE([HELP_REPEAT_WARNINGS],
 [
-if test -e "$OUTPUT_ROOT/config.log"; then
+  # Locate config.log.
-  $GREP '^configure:.*: WARNING:' "$OUTPUT_ROOT/config.log" > /dev/null 2>&1
+  if test -e "$CONFIGURESUPPORT_OUTPUTDIR/config.log"; then
-  if test $? -eq 0; then
+    CONFIG_LOG_PATH="$CONFIGURESUPPORT_OUTPUTDIR"
-    printf "The following warnings were produced. Repeated here for convenience:\n"
+  elif test -e "./config.log"; then
-    # We must quote sed expression (using []) to stop m4 from eating the [].
+    CONFIG_LOG_PATH="."
-    $GREP '^configure:.*: WARNING:' "$OUTPUT_ROOT/config.log" | $SED -e [ 's/^configure:[0-9]*: //' ]
-    printf "\n"
   fi
-fi
 
+  if test -e "$CONFIG_LOG_PATH/config.log"; then
+    $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" > /dev/null 2>&1
+    if test $? -eq 0; then
+      printf "The following warnings were produced. Repeated here for convenience:\n"
+      # We must quote sed expression (using []) to stop m4 from eating the [].
+      $GREP '^configure:.*: WARNING:' "$CONFIG_LOG_PATH/config.log" | $SED -e [ 's/^configure:[0-9]*: //' ]
+      printf "\n"
+    fi
+  fi
 ])

common/autoconf/spec.gmk.in

@@ -321,6 +321,9 @@ CXX_FLAG_DEPS:=@CXX_FLAG_DEPS@
 DISABLE_WARNING_PREFIX := @DISABLE_WARNING_PREFIX@
 CFLAGS_WARNINGS_ARE_ERRORS:=@CFLAGS_WARNINGS_ARE_ERRORS@
 
+# A global flag (true or false) determining if native warnings are considered errors.
+WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@
+
 CFLAGS_CCACHE:=@CFLAGS_CCACHE@
 
 # Tools that potentially need to be cross compilation aware.
@@ -391,13 +394,9 @@ ARFLAGS:=@ARFLAGS@
 NM:=@NM@
 GNM:=@GNM@
 STRIP:=@STRIP@
-MCS:=@MCS@
 
 LIPO:=@LIPO@
 
-# Command to create a shared library
-SHARED_LIBRARY_FLAGS:=@SHARED_LIBRARY_FLAGS@
-
 # Options to linker to specify a mapfile.
 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
 SET_SHARED_LIBRARY_MAPFILE=@SET_SHARED_LIBRARY_MAPFILE@
@@ -440,7 +439,6 @@ EXE_SUFFIX:=@EXE_SUFFIX@
 OBJ_SUFFIX:=@OBJ_SUFFIX@
 
 POST_STRIP_CMD:=@POST_STRIP_CMD@
-POST_MCS_CMD:=@POST_MCS_CMD@
 
 JAVA_FLAGS:=@JAVA_FLAGS@
 JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
@@ -455,7 +453,6 @@ JAVA_CMD:=@JAVA@
 JAVAC_CMD:=@JAVAC@
 JAVAH_CMD:=@JAVAH@
 JAR_CMD:=@JAR@
-NATIVE2ASCII_CMD:=@NATIVE2ASCII@
 JARSIGNER_CMD:=@JARSIGNER@
 SJAVAC_SERVER_JAVA_CMD:=@SJAVAC_SERVER_JAVA@
 # These variables are meant to be used. They are defined with = instead of := to make
@@ -465,7 +462,6 @@ JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
 JAVAC=@FIXPATH@ $(JAVAC_CMD)
 JAVAH=@FIXPATH@ $(JAVAH_CMD)
 JAR=@FIXPATH@ $(JAR_CMD)
-NATIVE2ASCII=@FIXPATH@ $(NATIVE2ASCII_CMD) $(JAVA_TOOL_FLAGS_SMALL)
 JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD)
 # A specific java binary with specific options can be used to run
 # the long running background sjavac servers and other long running tasks.
@@ -692,10 +688,10 @@ SYMBOLS_IMAGE_SUBDIR:=symbols
 SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR)
 
 # Macosx bundles directory definitions
-JDK_BUNDLE_SUBDIR=jdk-bundle/jdk$(JDK_VERSION).jdk/Contents
+JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle/jdk$(JDK_VERSION).jdk/Contents
-JRE_BUNDLE_SUBDIR=jre-bundle/jre$(JDK_VERSION).jre/Contents
+JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle/jre$(JDK_VERSION).jre/Contents
-JDK_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR)
+JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
-JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
+JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
 
 # This macro is called to allow inclusion of closed source counterparts.
 # Unless overridden in closed sources, it expands to nothing.

common/autoconf/toolchain.m4

@@ -210,7 +210,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
   # For solaris we really need solaris tools, and not the GNU equivalent.
   # The build tools on Solaris reside in /usr/ccs (C Compilation System),
   # so add that to path before starting to probe.
-  # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP.
+  # FIXME: This was originally only done for AS,NM,GNM,STRIP,OBJCOPY,OBJDUMP.
   if test "x$OPENJDK_BUILD_OS" = xsolaris; then
     PATH="/usr/ccs/bin:$PATH"
   fi
@@ -569,9 +569,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
     BASIC_FIXUP_EXECUTABLE(NM)
     BASIC_PATH_PROGS(GNM, gnm)
     BASIC_FIXUP_EXECUTABLE(GNM)
-
-    BASIC_PATH_PROGS(MCS, mcs)
-    BASIC_FIXUP_EXECUTABLE(MCS)
   elif test "x$OPENJDK_TARGET_OS" != xwindows; then
     # FIXME: we should unify this with the solaris case above.
     BASIC_CHECK_TOOLS(STRIP, strip)

corba/.hgtags

@@ -305,3 +305,4 @@ cda6ae062f85fac5555f4e1318885b0ecd998bd1 jdk9-b59
 caa330b275f39282793466529f6864766b31d9fd jdk9-b60
 d690f489ca0bb95a6157d996da2fa72bcbcf02ea jdk9-b61
 d27f7e0a7aca129969de23e9934408a31b4abf4c jdk9-b62
+0acac6937de7a0868f8c6f88b7d036d780abeee6 jdk9-b63

corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java

@@ -222,7 +222,7 @@ public class AnyImpl extends Any
     /**
      * returns the type of the element contained in the Any.
      *
-     * @result          the TypeCode for the element in the Any
+     * @return          the TypeCode for the element in the Any
      */
     public TypeCode type() {
         return typeCode;
@@ -267,7 +267,7 @@ public class AnyImpl extends Any
      * checks for equality between Anys.
      *
      * @param otherAny  the Any to be compared with.
-     * @result          true if the Anys are equal, false otherwise.
+     * @return          true if the Anys are equal, false otherwise.
      */
     public boolean equal(Any otherAny)
     {
@@ -508,7 +508,7 @@ public class AnyImpl extends Any
     /**
      * returns an output stream that an Any value can be marshaled into.
      *
-     * @result          the OutputStream to marshal value of Any into
+     * @return          the OutputStream to marshal value of Any into
      */
     public org.omg.CORBA.portable.OutputStream create_output_stream()
     {
@@ -525,7 +525,7 @@ public class AnyImpl extends Any
     /**
      * returns an input stream that an Any value can be marshaled out of.
      *
-     * @result          the InputStream to marshal value of Any out of.
+     * @return          the InputStream to marshal value of Any out of.
      */
     public org.omg.CORBA.portable.InputStream create_input_stream()
     {

corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java

@@ -166,7 +166,7 @@ public class CDROutputObject extends CorbaOutputObject
      * Write the contents of the CDROutputStream to the specified
      * output stream.  Has the side-effect of pushing any current
      * Message onto the Message list.
-     * @param s The output stream to write to.
+     * @param connection The output stream to write to.
      */
     public void writeTo(CorbaConnection connection)
         throws java.io.IOException

corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java

@@ -54,8 +54,9 @@ import com.sun.corba.se.spi.logging.CORBALogDomains;
  *           use NIO ByteBuffer and NIO CharBuffer, the interaction
  *           and interface between this class and the CDR streams
  *           should be looked at more closely for optimizations to
- *           avoid unnecessary copying of data between char[] &
+ *           avoid unnecessary copying of data between
- *           CharBuffer and byte[] & ByteBuffer, especially
+ *           {@code char[] & CharBuffer} and
+ *           {@code byte[] & ByteBuffer}, especially
  *           DirectByteBuffers.
  *
  */

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

@@ -171,9 +171,9 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
      * @param out The stream to write the value to
      * @param value The value to be written to the stream
      **/
-    public void writeValue(org.omg.CORBA.portable.OutputStream _out,
+    public void writeValue(org.omg.CORBA.portable.OutputStream out,
                            java.io.Serializable value) {
-        writeValueWithVersion(_out, value, STREAM_FORMAT_VERSION_1);
+        writeValueWithVersion(out, value, STREAM_FORMAT_VERSION_1);
     }
 
     private void writeValueWithVersion(org.omg.CORBA.portable.OutputStream _out,
@@ -240,25 +240,25 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
      * Reads a value from the stream using java semantics.
      * @param in The stream to read the value from
      * @param clazz The type of the value to be read in
-     * @param sender The sending context runtime
+     * @param rt The sending context runtime
      **/
-    public java.io.Serializable readValue(org.omg.CORBA.portable.InputStream _in,
+    public java.io.Serializable readValue(org.omg.CORBA.portable.InputStream in,
                                           int offset,
                                           java.lang.Class clazz,
                                           String repositoryID,
-                                          org.omg.SendingContext.RunTime _sender)
+                                          org.omg.SendingContext.RunTime rt)
     {
         // Must use narrow rather than a direct cast to a com.sun
         // class.  Fix for bug 4379539.
-        CodeBase sender = CodeBaseHelper.narrow(_sender);
+        CodeBase sender = CodeBaseHelper.narrow(rt);
 
-        org.omg.CORBA_2_3.portable.InputStream in =
+        org.omg.CORBA_2_3.portable.InputStream inStream =
-            (org.omg.CORBA_2_3.portable.InputStream) _in;
+            (org.omg.CORBA_2_3.portable.InputStream) in;
 
         if (!useHashtables) {
             if (inputStreamBridge == null) {
                 inputStreamBridge = createInputStream();
-                inputStreamBridge.setOrbStream(in);
+                inputStreamBridge.setOrbStream(inStream);
                 inputStreamBridge.setSender(sender); //d11638
                 // backward compatability 4365188
                 inputStreamBridge.setValueHandler(this);
@@ -269,7 +269,7 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
             try {
 
                 inputStreamBridge.increaseRecursionDepth();
-                result = (java.io.Serializable) readValueInternal(inputStreamBridge, in, offset, clazz, repositoryID, sender);
+                result = (java.io.Serializable) readValueInternal(inputStreamBridge, inStream, offset, clazz, repositoryID, sender);
 
             } finally {
 
@@ -287,16 +287,16 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
         if (inputStreamPairs == null)
             inputStreamPairs = new Hashtable();
 
-        jdkToOrbInputStreamBridge = (IIOPInputStream)inputStreamPairs.get(_in);
+        jdkToOrbInputStreamBridge = (IIOPInputStream)inputStreamPairs.get(in);
 
         if (jdkToOrbInputStreamBridge == null) {
 
             jdkToOrbInputStreamBridge = createInputStream();
-            jdkToOrbInputStreamBridge.setOrbStream(in);
+            jdkToOrbInputStreamBridge.setOrbStream(inStream);
             jdkToOrbInputStreamBridge.setSender(sender); //d11638
             // backward compatability 4365188
             jdkToOrbInputStreamBridge.setValueHandler(this);
-            inputStreamPairs.put(_in, jdkToOrbInputStreamBridge);
+            inputStreamPairs.put(in, jdkToOrbInputStreamBridge);
         }
 
         java.io.Serializable result = null;
@@ -304,12 +304,12 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
         try {
 
             jdkToOrbInputStreamBridge.increaseRecursionDepth();
-            result = (java.io.Serializable) readValueInternal(jdkToOrbInputStreamBridge, in, offset, clazz, repositoryID, sender);
+            result = (java.io.Serializable) readValueInternal(jdkToOrbInputStreamBridge, inStream, offset, clazz, repositoryID, sender);
 
         } finally {
 
             if (jdkToOrbInputStreamBridge.decreaseRecursionDepth() == 0) {
-                inputStreamPairs.remove(_in);
+                inputStreamPairs.remove(in);
             }
         }
 

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

@@ -33,7 +33,6 @@ import org.omg.CORBA_2_3.portable.OutputStream;
 import com.sun.corba.se.spi.ior.Identifiable ;
 
 /**
- * @author
  * This is used for unknown components and profiles.  A TAG_MULTICOMPONENT_PROFILE will be represented this way.
  */
 public abstract class GenericIdentifiable implements Identifiable

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

@@ -34,9 +34,6 @@ import com.sun.corba.se.spi.ior.iiop.GIOPVersion ;
 
 import com.sun.corba.se.spi.ior.TaggedComponent ;
 
-/**
- * @author
- */
 public class GenericTaggedComponent extends GenericIdentifiable
     implements TaggedComponent
 {
@@ -52,8 +49,6 @@ public class GenericTaggedComponent extends GenericIdentifiable
 
     /**
      * @return org.omg.IOP.TaggedComponent
-     * @exception
-     * @author
      */
     public org.omg.IOP.TaggedComponent getIOPComponent( ORB orb )
     {

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

@@ -39,9 +39,6 @@ import com.sun.corba.se.spi.ior.iiop.GIOPVersion ;
 
 import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
 
-/**
- * @author
- */
 public class GenericTaggedProfile extends GenericIdentifiable implements TaggedProfile
 {
     private ORB orb ;

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

@@ -47,7 +47,6 @@ import com.sun.corba.se.spi.orb.ORB ;
 
 /**
  * This class is a container of TaggedProfileTemplates.
- * @author
  */
 public class IORTemplateImpl extends IdentifiableContainerBase implements IORTemplate
 {

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

@@ -31,7 +31,7 @@ import org.omg.CORBA_2_3.portable.OutputStream ;
 /** ObjectAdapterIdNumber is used to represent pre-JDK 1.4 POA adapter
  * IDs.  The POA ID was simply represented as a single integer, which was
  * mapped to the actual POA instance.  Here, we just represent these
- * internally as arrays of the form { "OldRootPOA", "<number>" },
+ * internally as arrays of the form {@code { "OldRootPOA", "<number>" }},
  * and provide an extra method to get the number back.
  */
 public class ObjectAdapterIdNumber extends ObjectAdapterIdArray {

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

@@ -29,9 +29,6 @@ import java.util.Arrays ;
 import com.sun.corba.se.spi.ior.ObjectId ;
 import org.omg.CORBA_2_3.portable.OutputStream ;
 
-/**
- * @author
- */
 public final class ObjectIdImpl implements ObjectId
 {
     private byte[] id;

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

@@ -37,9 +37,6 @@ import com.sun.corba.se.spi.ior.ObjectKeyTemplate ;
 
 import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
 
-/**
- * @author
- */
 public class ObjectKeyImpl implements ObjectKey
 {
     private ObjectKeyTemplate oktemp;

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

@@ -47,9 +47,6 @@ import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
 import com.sun.corba.se.impl.logging.IORSystemException ;
 
 
-/**
- * @author
- */
 public abstract class ObjectKeyTemplateBase implements ObjectKeyTemplate
 {
     // Fixed constants for Java IDL object key template forms

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

@@ -42,9 +42,6 @@ import com.sun.corba.se.spi.ior.ObjectAdapterId ;
 
 import com.sun.corba.se.impl.ior.ObjectKeyFactoryImpl ;
 
-/**
- * @author
- */
 public final class POAObjectKeyTemplate extends NewObjectKeyTemplateBase
 {
     /** This constructor reads the template ONLY from the stream.

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

@@ -245,7 +245,7 @@ public class StubIORImpl
     /**
      * Returns a string representation of this stub. Returns the same string
      * for all stubs that represent the same remote object.
-     * "SimpleIORImpl[<typeName>,[<profileID>]data, ...]"
+     * {@code "SimpleIORImpl[<typeName>,[<profileID>]data, ...]"}
      * @return a string representation of this stub.
      */
     public String toString()

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

@@ -33,9 +33,6 @@ import com.sun.corba.se.impl.ior.IdentifiableFactoryFinderBase ;
 
 import org.omg.CORBA_2_3.portable.InputStream ;
 
-/**
- * @author
- */
 public class TaggedProfileFactoryFinderImpl extends
     IdentifiableFactoryFinderBase
 {

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

@@ -35,9 +35,6 @@ import org.omg.CORBA_2_3.portable.InputStream ;
 
 import org.omg.CORBA.INTERNAL ;
 
-/**
- * @author
- */
 public class TaggedProfileTemplateFactoryFinderImpl extends
     IdentifiableFactoryFinderBase
 {

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

@@ -38,9 +38,6 @@ import com.sun.corba.se.impl.encoding.CodeSetComponentInfo ;
 import com.sun.corba.se.impl.encoding.MarshalOutputStream ;
 import com.sun.corba.se.impl.encoding.MarshalInputStream ;
 
-/**
- * @author
- */
 public class CodeSetsComponentImpl extends TaggedComponentBase
     implements CodeSetsComponent
 {

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

@@ -32,9 +32,6 @@ import org.omg.CORBA_2_3.portable.OutputStream ;
 
 import com.sun.corba.se.spi.ior.iiop.IIOPAddress ;
 
-/**
- * @author
- */
 abstract class IIOPAddressBase implements IIOPAddress
 {
     // Ports are marshalled as shorts on the wire.  The IDL

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

@@ -32,9 +32,6 @@ import org.omg.CORBA_2_3.portable.OutputStream ;
 
 import com.sun.corba.se.spi.orbutil.closure.Closure ;
 
-/**
- * @author
- */
 public final class IIOPAddressClosureImpl extends IIOPAddressBase
 {
     private Closure host;

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

@@ -36,9 +36,6 @@ import com.sun.corba.se.spi.logging.CORBALogDomains ;
 
 import com.sun.corba.se.impl.logging.IORSystemException ;
 
-/**
- * @author
- */
 public final class IIOPAddressImpl extends IIOPAddressBase
 {
     private ORB orb ;

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

@@ -76,9 +76,6 @@ import com.sun.corba.se.impl.util.JDKBridge;
 
 import com.sun.corba.se.impl.logging.IORSystemException;
 
-/**
- * @author
- */
 public class IIOPProfileImpl extends IdentifiableBase implements IIOPProfile
 {
     private ORB orb ;

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

@@ -55,7 +55,6 @@ import com.sun.corba.se.spi.ior.iiop.GIOPVersion ;
 import com.sun.corba.se.spi.orb.ORB ;
 
 /**
- * @author
  * If getMinorVersion==0, this does not contain any tagged components
  */
 public class IIOPProfileTemplateImpl extends TaggedProfileTemplateBase

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

@@ -33,9 +33,6 @@ import com.sun.corba.se.spi.ior.TaggedComponentBase ;
 
 import com.sun.corba.se.spi.ior.iiop.JavaCodebaseComponent ;
 
-/**
- * @author
- */
 public class JavaCodebaseComponentImpl extends TaggedComponentBase
     implements JavaCodebaseComponent
 {

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

@@ -593,7 +593,7 @@ public class Util implements javax.rmi.CORBA.UtilDelegate
      * @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 loadingContext a class whose ClassLoader may be used to
+     * @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.
      * @exception ClassNotFoundException if class cannot be loaded.

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java

@@ -92,7 +92,7 @@ public abstract class BindingIteratorImpl extends BindingIteratorPOA
      * Return the next n bindings. It also returns true or false, indicating
      * whether there were more bindings.
      * @param how_many The number of requested bindings in the BindingList.
-     * @param bl The BindingList as an out parameter.
+     * @param blh The BindingList as an out parameter.
      * @return true if there were more bindings.
      * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA
      * system exceptions.
@@ -114,7 +114,7 @@ public abstract class BindingIteratorImpl extends BindingIteratorPOA
      * scope, It will be called from NamingContext.list() operation or
      * this.next_n().
      * @param how_many The number of requested bindings in the BindingList.
-     * @param bl The BindingList as an out parameter.
+     * @param blh The BindingList as an out parameter.
      * @return true if there were more bindings.
      */
     public boolean list( int how_many, org.omg.CosNaming.BindingListHolder blh)

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java

@@ -181,7 +181,7 @@ public abstract class NamingContextImpl
      * exists. The NamingContext will participate in recursive resolving.
      * @param n a sequence of NameComponents which is the name under which
      * the object will be bound.
-     * @param obj the NamingContect object reference to be bound.
+     * @param nc the NamingContext object reference to be bound.
      * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with
      * multiple components was supplied, but the first component could not be
      * resolved.
@@ -278,7 +278,7 @@ public abstract class NamingContextImpl
      * resolving.
      * @param n a sequence of NameComponents which is the name under which
      * the object will be bound.
-     * @param obj the object reference to be bound.
+     * @param nc the object reference to be bound.
      * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with
      * multiple components was supplied, but the first component could not be
      * resolved.
@@ -853,10 +853,9 @@ public abstract class NamingContextImpl
    /**
     * This operation creates a stringified name from the array of Name
     * components.
-    * @param n Name of the object <p>
+    * @param n Name of the object
     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-    * Indicates the name does not identify a binding.<p>
+    * Indicates the name does not identify a binding.
-    *
     */
     public String to_string(org.omg.CosNaming.NameComponent[] n)
          throws org.omg.CosNaming.NamingContextPackage.InvalidName
@@ -882,10 +881,9 @@ public abstract class NamingContextImpl
    /**
     * This operation  converts a Stringified Name into an  equivalent array
     * of Name Components.
-    * @param sn Stringified Name of the object <p>
+    * @param sn Stringified Name of the object
     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-    * Indicates the name does not identify a binding.<p>
+    * Indicates the name does not identify a binding.
-    *
     */
     public org.omg.CosNaming.NameComponent[] to_name(String sn)
          throws org.omg.CosNaming.NamingContextPackage.InvalidName
@@ -920,14 +918,13 @@ public abstract class NamingContextImpl
     * This operation creates a URL based "iiopname://" format name
     * from the Stringified Name of the object.
     * @param addr internet based address of the host machine where
-    * Name Service is running <p>
+    * Name Service is running
-    * @param sn Stringified Name of the object <p>
+    * @param sn Stringified Name of the object
     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-    * Indicates the name does not identify a binding.<p>
+    * Indicates the name does not identify a binding.
     * @exception org.omg.CosNaming.NamingContextPackage.InvalidAddress
     * Indicates the internet based address of the host machine is
-    * incorrect <p>
+    * incorrect
-    *
     */
 
     public String to_url(String addr, String sn)
@@ -961,15 +958,15 @@ public abstract class NamingContextImpl
     /**
      * This operation resolves the Stringified name into the object
      * reference.
-     * @param sn Stringified Name of the object <p>
+     * @param sn Stringified Name of the object
      * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * Indicates there is no object reference for the given name. <p>
+     * Indicates there is no object reference for the given name.
      * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * Indicates that the given compound name is incorrect <p>
+     * Indicates that the given compound name is incorrect
      * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-     * Indicates the name does not identify a binding.<p>
+     * Indicates the name does not identify a binding.
      * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound
-     * Indicates the name is already bound.<p>
+     * Indicates the name is already bound.
      *
      */
     public org.omg.CORBA.Object resolve_str(String sn)

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java

@@ -90,7 +90,7 @@ public class NamingUtils {
 
     /**
      * Create a error print stream to the supplied file.
-     * @param logFile the file to which error messages will go.
+     * @param errFile the file to which error messages will go.
      * @exception IOException thrown if the file cannot be opened for output.
      */
     public static void makeErrStream(File errFile)

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java

@@ -63,7 +63,6 @@ public class TransientBindingIterator extends BindingIteratorImpl
      * @param orb a org.omg.CORBA.ORB object.
      * @param aTable A hashtable containing InternalBindingValues which is
      * the content of the TransientNamingContext.
-     * @param java.lang.Exception a Java exception.
      * @exception Exception a Java exception thrown of the base class cannot
      * initialize.
    */

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java

@@ -85,7 +85,7 @@ public class TransientNameService
      * NamingContext, whose object
      * reference can be obtained by the initialNamingContext method.
      * @param orb The ORB object
-     * @param nameserviceName Stringified key used for INS Service registry
+     * @param serviceName Stringified key used for INS Service registry
      * @exception org.omg.CORBA.INITIALIZE Thrown if
      * the TransientNameService cannot initialize.
      */

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java

@@ -33,7 +33,7 @@ import com.sun.corba.se.spi.logging.CORBALogDomains;
  *  will be stored in this object. This object is capable of storing CorbaLoc
  *  profiles as defined in the CorbaName grammer.
  *
- *  @Author Hemanth
+ *  @author Hemanth
  */
 public class CorbanameURL extends INSURLBase
 {

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java

@@ -32,7 +32,7 @@ import com.sun.corba.se.impl.orbutil.ORBConstants;
  *  host information used in creating the Service Object reference
  *  from the -ORBInitDef and -ORBDefaultInitDef definitions.
  *
- *  @Author Hemanth
+ *  @author Hemanth
  */
 public class IIOPEndpointInfo
 {

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java

@@ -29,7 +29,7 @@ package com.sun.corba.se.impl.naming.namingutil;
  * INS URL is a generic interface for two different types of URL's specified
  * in INS spec.
  *
- * @Author Hemanth
+ * @author Hemanth
  */
 public interface INSURL {
     public boolean getRIRFlag( );

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java

@@ -30,7 +30,7 @@ import java.util.StringTokenizer;
 /**
  *  This class is the entry point to parse different types of INS URL's.
  *
- *  @Author Hemanth
+ *  @author Hemanth
  */
 
 public class INSURLHandler {

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java

@@ -36,7 +36,7 @@ import com.sun.corba.se.spi.logging.CORBALogDomains;
 /**
  *  Utility methods for Naming.
  *
- *  @Author Hemanth
+ *  @author Hemanth
  */
 class Utility {
     private static NamingSystemException wrapper =

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java

@@ -186,7 +186,7 @@ public class NameService
     /**
      * getObjectReferenceFromKey returns the Object reference from the objectkey using POA.create_reference_with_id method
      * @param Object Key as String
-     * @returns reference an CORBA.Object.
+     * @return a CORBA.Object reference.
      */
     org.omg.CORBA.Object getObjectReferenceFromKey( String key )
     {
@@ -205,7 +205,7 @@ public class NameService
     /**
      * getObjectKey gets the Object Key from the reference using POA.reference_to_id method
      * @param reference an CORBA.Object.
-     * @returns Object Key as String
+     * @return Object Key as String
      */
     String getObjectKey( org.omg.CORBA.Object reference )
     {

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java

@@ -116,8 +116,8 @@ public class NamingContextImpl
      * Runs the super constructor.
      * @param orb an ORB object.
      * @param objKey as String
-     * @param TheNameService as NameService
+     * @param theNameService as NameService
-     * @param TheServantManagerImpl as ServantManagerImpl
+     * @param theServantManagerImpl as ServantManagerImpl
      * @exception java.lang.Exception a Java exception.
      */
 
@@ -223,7 +223,7 @@ public class NamingContextImpl
    * exists. The NamingContext will participate in recursive resolving.
    * @param n a sequence of NameComponents which is the name under which
    * the object will be bound.
-   * @param obj the NamingContect object reference to be bound.
+   * @param nc the NamingContect object reference to be bound.
    * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with multiple
    * components was supplied, but the first component could not be
    * resolved.
@@ -301,7 +301,7 @@ public class NamingContextImpl
    * unbound first. The NamingContext will participate in recursive resolving.
    * @param n a sequence of NameComponents which is the name under which
    * the object will be bound.
-   * @param obj the object reference to be bound.
+   * @param nc the object reference to be bound.
    * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with multiple
    * components was supplied, but the first component could not be
    * resolved.
@@ -907,7 +907,7 @@ public class NamingContextImpl
     * The doResolve( ) method calls Resolve( ) recursively to resolve n level
     * Names.
     * @param n a sequence of NameComponents which is the name to be resolved.
-    * @param bt Type of binding (as object or as context).
+    * @param bth Type of binding (as object or as context).
     * @return the object reference bound under the supplied name.
     * @exception org.omg.CosNaming.NamingContextPackage.NotFound Neither a NamingContext
     * or a Corba Object reference not found under this Name
@@ -1140,10 +1140,9 @@ public class NamingContextImpl
     /**
     * This operation creates a stringified name from the array of Name
     * components.
-    * @param n Name of the object <p>
+    * @param n Name of the object
     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-    * Indicates the name does not identify a binding.<p>
+    * Indicates the name does not identify a binding.
-    *
     */
     public String to_string(org.omg.CosNaming.NameComponent[] n)
          throws org.omg.CosNaming.NamingContextPackage.InvalidName
@@ -1167,10 +1166,9 @@ public class NamingContextImpl
     /**
     * This operation  converts a Stringified Name into an  equivalent array
     * of Name Components.
-    * @param sn Stringified Name of the object <p>
+    * @param sn Stringified Name of the object
     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-    * Indicates the name does not identify a binding.<p>
+    * Indicates the name does not identify a binding.
-    *
     */
     public org.omg.CosNaming.NameComponent[] to_name(String sn)
          throws org.omg.CosNaming.NamingContextPackage.InvalidName
@@ -1204,14 +1202,13 @@ public class NamingContextImpl
     * This operation creates a URL based "iiopname://" format name
     * from the Stringified Name of the object.
     * @param addr internet based address of the host machine where
-    * Name Service is running <p>
+    *        Name Service is running
-    * @param sn Stringified Name of the object <p>
+    * @param sn Stringified Name of the object
     * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-    * Indicates the name does not identify a binding.<p>
+    * Indicates the name does not identify a binding.
     * @exception org.omg.CosNaming.NamingContextPackage.InvalidAddress
     * Indicates the internet based address of the host machine is
-    * incorrect <p>
+    * incorrect
-    *
     */
 
     public String to_url(String addr, String sn)
@@ -1247,14 +1244,13 @@ public class NamingContextImpl
     /**
      * This operation resolves the Stringified name into the object
      * reference.
-     * @param sn Stringified Name of the object <p>
+     * @param sn Stringified Name of the object
      * @exception org.omg.CosNaming.NamingContextPackage.NotFound
-     * Indicates there is no object reference for the given name. <p>
+     * Indicates there is no object reference for the given name.
      * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed
-     * Indicates that the given compound name is incorrect <p>
+     * Indicates that the given compound name is incorrect
      * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName
-     * Indicates the name does not identify a binding.<p>
+     * Indicates the name does not identify a binding.
-     *
      */
     public org.omg.CORBA.Object resolve_str(String sn)
         throws org.omg.CosNaming.NamingContextPackage.NotFound,

corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java

@@ -64,7 +64,6 @@ public class PersistentBindingIterator extends BindingIteratorImpl
      * @param orb a org.omg.CORBA.ORB object.
      * @param aTable A hashtable containing InternalBindingValues which is
      * the content of the PersistentNamingContext.
-     * @param java.lang.Exception a Java exception.
      * @exception Exception a Java exception thrown of the base class cannot
      * initialize.
    */

corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java

@@ -61,7 +61,7 @@ import com.sun.corba.se.impl.protocol.JIDLLocalCRDImpl ;
 * Its characteristics include:
 * <UL>
 * <LI>There is only one OA instance of the TOA.  Its OAId is { "TOA" }</LI>
-* <LI>There is not adapter manager.  The TOA manager ID is fixed.<LI>
+* <LI>There is not adapter manager.  The TOA manager ID is fixed.</LI>
 * <LI>State is the same as ORB state (TBD)</LI>
 * </UL>
 * Other requirements:
@@ -118,7 +118,7 @@ public class TOAImpl extends ObjectAdapterBase implements TOA
     * This will update thread Current, so that subsequent calls to
     * returnServant and removeCurrent from the same thread are for the
     * same request.
-    * @param request is the request containing the rest of the request
+    * @param info is the request containing the rest of the request
     */
     public void getInvocationServant( OAInvocationInfo info )
     {

corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java

@@ -585,7 +585,7 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB
      * Create an NVList
      *
      * @param count     size of list to create
-     * @result          NVList created
+     * @return          NVList created
      *
      * @see NVList
      */
@@ -599,7 +599,7 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB
      * Create an NVList corresponding to an OperationDef
      *
      * @param oper      operation def to use to create list
-     * @result          NVList created
+     * @return          NVList created
      *
      * @see NVList
      */
@@ -612,7 +612,7 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB
     /**
      * Create a NamedValue
      *
-     * @result          NamedValue created
+     * @return          NamedValue created
      */
     public synchronized NamedValue create_named_value(String s, Any any, int flags)
     {
@@ -623,7 +623,7 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB
     /**
      * Create an ExceptionList
      *
-     * @result          ExceptionList created
+     * @return          ExceptionList created
      */
     public synchronized org.omg.CORBA.ExceptionList create_exception_list()
     {
@@ -634,7 +634,7 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB
     /**
      * Create a ContextList
      *
-     * @result          ContextList created
+     * @return          ContextList created
      */
     public synchronized org.omg.CORBA.ContextList create_context_list()
     {
@@ -645,7 +645,7 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB
     /**
      * Get the default Context object
      *
-     * @result          the default Context object
+     * @return          the default Context object
      */
     public synchronized org.omg.CORBA.Context get_default_context()
     {
@@ -656,7 +656,7 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB
     /**
      * Create an Environment
      *
-     * @result          Environment created
+     * @return          Environment created
      */
     public synchronized org.omg.CORBA.Environment create_environment()
     {
@@ -719,7 +719,7 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB
     /**
      * Get the next request that has gotten a response.
      *
-     * @result            the next request ready with a response.
+     * @return            the next request ready with a response.
      */
     public org.omg.CORBA.Request get_next_response()
         throws org.omg.CORBA.WrongTransaction

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

@@ -42,8 +42,9 @@ public class DenseIntMapImpl
             throw new IllegalArgumentException( "Key must be >= 0." ) ;
     }
 
-    /** If key >= 0, return the value bound to key, or null if none.
+    /**
-     * Throws IllegalArgumentException if key <0.
+     * If {@code key >= 0}, return the value bound to key, or null if none.
+     * Throws IllegalArgumentException if {@code key < 0}.
      */
     public Object get( int key )
     {
@@ -56,8 +57,9 @@ public class DenseIntMapImpl
         return result ;
     }
 
-    /** If key >= 0, bind value to the key.
+    /**
-     * Throws IllegalArgumentException if key <0.
+     * If {@code key >= 0}, bind value to the key.
+     * Throws IllegalArgumentException if {@code key < 0}.
      */
     public void set( int key, Object value )
     {

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

@@ -35,7 +35,7 @@ package com.sun.corba.se.impl.orbutil ;
  * <code>AccessController.doPrivileged</code>.
  *
  * <p>The following code retrieves the value of the system
- * property named <code>"prop"</code> as a privileged action: <p>
+ * property named <code>"prop"</code> as a privileged action:
  *
  * <pre>
  * String s = (String) java.security.AccessController.doPrivileged(
@@ -67,7 +67,7 @@ public class GetPropertyAction implements java.security.PrivilegedAction {
      * value of that property.
      *
      * @param theProp the name of the system property.
-     * @param defaulVal the default value.
+     * @param defaultVal the default value.
      */
     public GetPropertyAction(String theProp, String defaultVal) {
         this.theProp = theProp;

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

@@ -150,8 +150,7 @@ import com.sun.corba.se.impl.orbutil.ORBUtility ;
  *
  * </pre>
  * @see Mutex
- * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>]
+ * [<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>]
-
  **/
 
 public class CondVar {

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

@@ -126,7 +126,6 @@ package com.sun.corba.se.impl.orbutil.concurrent;
  *    // ...  other similar traversal and update methods ...
  * }
  * </pre>
- * <p>
  * @see Semaphore
  * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>]
 **/

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

@@ -181,11 +181,11 @@ package com.sun.corba.se.impl.orbutil.concurrent;
  *     }
  *   }
  * }
- *</pre>
+ * </pre>
  * <p>
  * Here is an even fancier version, that uses lock re-ordering
  * upon conflict:
- * <pre>
+ * <pre>{@code
  * class Cell {
  *   long value;
  *   Sync lock = ...;
@@ -214,8 +214,8 @@ package com.sun.corba.se.impl.orbutil.concurrent;
  *    }
  *    catch (InterruptedException ex) { return; }
  *  }
- *}
+ * }
- *</pre>
+ * }</pre>
  * <p>
  * Interruptions are in general handled as early as possible.
  * Normally, InterruptionExceptions are thrown
@@ -248,7 +248,7 @@ package com.sun.corba.se.impl.orbutil.concurrent;
  * it is normally best to just use acquire(), various forms
  * of busy waits can be implemented. For a simple example
  * (but one that would probably never be preferable to using acquire()):
- * <pre>
+ * <pre>{@code
  * class X {
  *   Sync lock = ...
  *   void spinUntilAcquired() throws InterruptedException {
@@ -269,17 +269,16 @@ package com.sun.corba.se.impl.orbutil.concurrent;
  *     }
  *   }
  * }
- * </pre>
+ * }</pre>
  * <p>
  * In addition pure synchronization control, Syncs
  * may be useful in any context requiring before/after methods.
  * For example, you can use an ObservableSync
  * (perhaps as part of a LayeredSync) in order to obtain callbacks
  * before and after each method invocation for a given class.
- * <p>
+ *
-
+ * [<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>]
- * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>]
+ **/
-**/
 
 
 public interface Sync {

corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java

@@ -130,13 +130,13 @@ public abstract class CorbaConnectionCacheBase
      * This method must be synchronized since one WorkerThread could
      * be reclaming connections inside the synchronized backingStore
      * block and a second WorkerThread (or a SelectorThread) could have
-     * already executed the if (numberOfConnections <= .... ). As a
+     * already executed the if (numberOfConnections {@literal <=} .... ). As a
      * result the second thread would also attempt to reclaim connections.
      *
      * If connection reclamation becomes a performance issue, the connection
      * reclamation could make its own task and consequently executed in
      * a separate thread.
-     * Currently, the accept & reclaim are done in the same thread, WorkerThread
+     * Currently, the accept {@literal &} reclaim are done in the same thread, WorkerThread
      * by default. It could be changed such that the SelectorThread would do
      * it for SocketChannels and WorkerThreads for Sockets by updating the
      * ParserTable.

corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java

@@ -59,7 +59,7 @@ public interface Acceptor
     /**
      * Used to determine if an <code>Acceptor</code> has been initialized.
      *
-     * @return <code>true</code. if the <code>Acceptor</code> has been
+     * @return <code>true</code> if the <code>Acceptor</code> has been
      * initialized.
      */
     public boolean initialized();
@@ -74,7 +74,7 @@ public interface Acceptor
 
     /**
      * Set the
-     * {@link com.sun.corba.se.pept.transport.Inbound.ConnectionCache InboundConnectionCache}
+     * {@link com.sun.corba.se.pept.transport.InboundConnectionCache InboundConnectionCache}
      * to be used by this <code>Acceptor</code>.
      *
      * PEPt uses separate caches for each type of <code>Acceptor</code>
@@ -88,7 +88,7 @@ public interface Acceptor
 
     /**
      * Get the
-     * {@link com.sun.corba.se.pept.transport.Inbound.ConnectionCache InboundConnectionCache}
+     * {@link com.sun.corba.se.pept.transport.InboundConnectionCache InboundConnectionCache}
      * used by this <code>Acceptor</code>
      *
      * PEPt uses separate caches for each type of <code>Acceptor</code>

corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java

@@ -44,7 +44,7 @@ import com.sun.corba.se.impl.orbutil.ORBConstants ;
 * <ol>
 * <li>POA current semantics
 * <li>Proper handling of POA destroy.
-* <ol>
+* </ol>
 * POA current semantics requires maintaining a ThreadLocal stack of
 * invocation information that is always available for POACurrent operations.
 * Maintaining this stack is expensive on the timescale of optimized co-located

corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html

@@ -41,8 +41,8 @@ The abstract model of IORs works as follows:
 <li>An IIOPProfile isA TaggedProfile.</li>
 <li>An IIOPProfile is composed of an IIOPProfileTemplate and an object ID.</li>
 <li>An IIOPProfileTemplate has an ObjectKeyTemplate, and contains TaggedComponents.</li>
-<li>A TaggedComponent has an ID, and can be written to an OuputStream.<li>
+<li>A TaggedComponent has an ID, and can be written to an OuputStream.</li>
-<li>A TaggedComponentFactory reads a TaggedComponent from an InputStream.<li>
+<li>A TaggedComponentFactory reads a TaggedComponent from an InputStream.</li>
 </ul>
 <p>
 In all cases, containment is represented by having the appropriate interface (IOR and

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

@@ -48,7 +48,7 @@ import com.sun.corba.se.spi.transport.SocketInfo;
  *
  * property. <p>
  *
- * Example: <p>
+ * Example:
 
  * <pre>
  *   -Dcom.sun.CORBA.connection.ORBSocketFactoryClass=MySocketFactory
@@ -145,7 +145,7 @@ public interface ORBSocketFactory
      *
      * property. <p>
      *
-     * Example usage:<p>
+     * Example usage:
      *
      * <pre>
      *    ... \
@@ -203,7 +203,7 @@ public interface ORBSocketFactory
      * Once you have the port you may add information to references
      * created by the associated adapter by calling
      *
-     *    <code>IORInfo::add_ior_component</code><p> <p>
+     *    <code>IORInfo::add_ior_component</code><p>
      *
      *
      * Note: if one is using a POA and the lifespan policy of that
@@ -247,7 +247,7 @@ public interface ORBSocketFactory
      *
      *    <code>ORBConstants.BAD_SERVER_ID_HANDLER_CLASS_PROPERTY</code> <p>
      *
-     * Example: <p>
+     * Example:
      *
      * <pre>
      *
@@ -271,7 +271,7 @@ public interface ORBSocketFactory
      *     <code>SOCKET_FACTORY_CLASS_PROPERTY</code> and
      *     <code>LISTEN_SOCKET_PROPERTY</code>
      *
-     * as used by other clients and servers in your distributed system. <p>
+     * as used by other clients and servers in your distributed system.
      *
      */
     public ServerSocket createServerSocket(String type, int port)
@@ -324,7 +324,7 @@ public interface ORBSocketFactory
      *
      * The <code>SocketInfo</code> given to <code>getEndPointInfo</code>
      * is either null or an object obtained
-     * from <code>GetEndPointInfoAgainException</code> <p>
+     * from <code>GetEndPointInfoAgainException</code>
      *
      */
     public SocketInfo getEndPointInfo(org.omg.CORBA.ORB orb,
@@ -333,7 +333,7 @@ public interface ORBSocketFactory
 
 
     /**
-     * DEPRECATED.  DEPRECATED. DEPRECATED. DEPRECATED. <p
+     * DEPRECATED.  DEPRECATED. DEPRECATED. DEPRECATED. <p>
      *
      * This method is used by a client side ORB. <p>
      *
@@ -346,7 +346,7 @@ public interface ORBSocketFactory
      *
      * If this method throws GetEndPointInfoAgainException then the
      * ORB calls <code>getEndPointInfo</code> again, passing it the
-     * <code>SocketInfo</code> object contained in the exception. <p>
+     * <code>SocketInfo</code> object contained in the exception.
      *
      */
     public Socket createSocket(SocketInfo socketInfo)

corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java

@@ -30,8 +30,7 @@ import com.sun.corba.se.spi.legacy.connection.Connection;
 /**
  * This interface is implemented by our implementation of
  * PortableInterceptor.ClientRequestInfo and
- * PortableInterceptor.ServerRequestInfo. <p>
+ * PortableInterceptor.ServerRequestInfo.
- *
  */
 
 public interface RequestInfoExt

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java

@@ -27,13 +27,9 @@ package com.sun.corba.se.spi.monitoring;
 import java.util.*;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  * A Cleaner Abstraction to provide a Monitored Attribute of type 'Long'
- * </p>
  */
 public abstract class LongMonitoredAttributeBase extends MonitoredAttributeBase {
 
@@ -42,20 +38,14 @@ public abstract class LongMonitoredAttributeBase extends MonitoredAttributeBase
 
 
 /**
- * <p>
  * Constructs LongMonitoredAttribute, by creating the
  * MonitoredAttributeInfo with 'Long' as the class type.
  * Users are expected to extend this class and provide the implementation
  * for getValue() and if needed clearState() as well.
- * </p>
- * <p>
  *
- * @param name of tthe MonitoredAttribute
+ * @param name of the MonitoredAttribute
- * </p>
- * <p>
  * @param description of the Attribute, Please provid a well thought out
  * description, so that the admin can make sense of the attribute supplied.
- * </p>
  */
     public  LongMonitoredAttributeBase(String name, String description) {
         super( name );

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java

@@ -28,15 +28,11 @@ import com.sun.corba.se.spi.monitoring.MonitoredAttributeInfo;
 import java.util.*;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  * Monitored Attribute is the interface to represent a Monitorable
  * Attribute. Using this interface, one can get the value of the attribute
  * and set the value if it is a writeable attribute.
- * </p>
  */
 public interface MonitoredAttribute {
 
@@ -44,34 +40,25 @@ public interface MonitoredAttribute {
   // operations
 
 /**
- * <p>
  * Gets the Monitored Attribute Info for the attribute.
- * </p>
- * <p>
  *
- * @param monitoredAttributeInfo for this Monitored Attribute.
+ * @return monitoredAttributeInfo for this Monitored Attribute.
- * </p>
  */
     public MonitoredAttributeInfo getAttributeInfo();
 /**
- * <p>
  * Sets the value for the Monitored Attribute if isWritable() is false, the
  * method will throw ILLEGAL Operation exception.
  *
  * Also, the type of 'value' should be same as specified in the
  * MonitoredAttributeInfo for a particular instance.
- * </p>
- * <p>
  *
  * @param value should be any one of the Basic Java Type Objects which are
  * Long, Double, Float, String, Integer, Short, Character, Byte.
- * </p>
  */
     public void setValue(Object value);
 
 
 /**
- * <p>
  * Gets the value of the Monitored Attribute. The value can be obtained
  * from different parts of the module. User may choose to delegate the call
  * to getValue() to other variables.
@@ -79,34 +66,21 @@ public interface MonitoredAttribute {
  * NOTE: It is important to make sure that the type of Object returned in
  * getvalue is same as the one specified in MonitoredAttributeInfo for this
  * attribute.
- * </p>
- * <p>
  *
- * </p>
+ * @return the current value for this MonitoredAttribute
- * <p>
- *
- * @param value is the current value for this MonitoredAttribute
- * </p>
  */
     public Object getValue();
 /**
- * <p>
  * Gets the name of the Monitored Attribute.
- * </p>
- * <p>
  *
- * @param name of this Attribute
+ * @return name of this Attribute
- * </p>
  */
     public String getName();
 /**
- * <p>
  * If this attribute needs to be cleared, the user needs to implement this
  * method to reset the state to initial state. If the Monitored Attribute
  * doesn't change like for example (ConnectionManager High Water Mark),
  * then clearState() is a No Op.
- * </p>
- *
  */
     public void clearState();
 

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java

@@ -27,16 +27,11 @@ package com.sun.corba.se.spi.monitoring;
 import java.util.*;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  *  A Convenient class provided to help users extend and implement only
  *  getValue(), if there is no need to clear the state and the attribute is not
  *  writable.
- *
- * </p>
  */
 public abstract class MonitoredAttributeBase implements MonitoredAttribute {
     String name;

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java

@@ -27,14 +27,10 @@ package com.sun.corba.se.spi.monitoring;
 import java.util.*;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  * Monitored AttributeInfo contains the meta information of the Monitored
  * Attribute.
- * </p>
  */
 public interface MonitoredAttributeInfo {
 
@@ -42,45 +38,38 @@ public interface MonitoredAttributeInfo {
   // operations
 
 /**
- * <p>
  * If the Attribute is writable from ASAdmin then isWritable() will return
  * true.
- * </p>
- * <p>
  *
  * @return a boolean with true or false
- * </p>
  */
     public boolean isWritable();
 /**
- * <p>
  * isStatistic() is true if the attribute is presented as a Statistic.
- * </p>
- * <p>
  *
  * @return a boolean with true or false
- * </p>
  */
     public boolean isStatistic();
 /**
- * <p>
+ * Class Type: We will allow only basic class types:
- * Class Type: We will allow only basic class types: 1)Boolean 2)Integer
+ * <ol>
- * 3)Byte 4)Long 5)Float 6)Double 7)String 8)Character
+ * <li>Boolean</li>
- * </p>
+ * <li>Integer</li>
- * <p>
+ * <li>Byte</li>
+ * <li>Long</li>
+ * <li>Float</li>
+ * <li>Double</li>
+ * <li>String</li>
+ * <li>Character</li>
+ * </ol>
  *
  * @return a Class Type
- * </p>
  */
     public Class type();
 /**
- * <p>
  * Get's the description for the Monitored Attribute.
- * </p>
- * <p>
  *
  * @return a String with description
- * </p>
  */
     public String getDescription();
 

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java

@@ -25,17 +25,12 @@
 package com.sun.corba.se.spi.monitoring;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  * MonitoredAttributeInfoFactory used mostly by internal classes. If the
  * User needs to define some special MonitoredAttributes like a Character
  * type Monitored Attribute, they can use this factory to build the meta
  * information.
- *
- * </p>
  */
 
 public interface MonitoredAttributeInfoFactory {

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java

@@ -30,161 +30,101 @@ import java.util.*;
 import java.util.Collection;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  * Monitored Object provides an Hierarchichal view of the ORB Monitoring
  * System. It can contain multiple children and a single parent. Each
  * Monitored Object may also contain Multiple Monitored Attributes.
- * </p>
  */
 public interface MonitoredObject {
 
   ///////////////////////////////////////
   // operations
 /**
- * <p>
  * Gets the name of this MonitoredObject
- * </p><p>
  *
  * @return a String with name of this Monitored Object
- * </p>
  */
     public String getName();
 /**
- * <p>
  * Gets the description of MonitoredObject
- * </p><p>
  *
  * @return a String with Monitored Object Description.
- * </p>
  */
     public String getDescription();
 /**
- * <p>
  * This method will add a child Monitored Object to this Monitored Object.
- * </p>
- * <p>
- * </p>
  */
     public void addChild( MonitoredObject m );
 /**
- * <p>
  * This method will remove child Monitored Object identified by the given name
- * </p>
+ *
- * <p>
  * @param name of the ChildMonitored Object
- * </p>
  */
     public void removeChild( String name );
 
 /**
- * <p>
  * Gets the child MonitoredObject associated with this MonitoredObject
  * instance using name as the key. The name should be fully qualified name
  * like orb.connectionmanager
- * </p>
- * <p>
  *
  * @return a MonitoredObject identified by the given name
- * </p>
- * <p>
  * @param name of the ChildMonitored Object
- * </p>
  */
     public MonitoredObject getChild(String name);
 /**
- * <p>
  * Gets all the Children registered under this instance of Monitored
  * Object.
- * </p>
- * <p>
  *
  * @return Collection of immediate Children associated with this MonitoredObject.
- * </p>
  */
     public Collection getChildren();
 /**
- * <p>
  * Sets the parent for this Monitored Object.
- * </p>
- * <p>
- * </p>
  */
     public void setParent( MonitoredObject m );
 /**
- * <p>
  * There will be only one parent for an instance of MontoredObject, this
  * call gets parent and returns null if the Monitored Object is the root.
- * </p>
- * <p>
  *
  * @return a MonitoredObject which is a Parent of this Monitored Object instance
- * </p>
  */
     public MonitoredObject getParent();
 
 /**
- * <p>
  * Adds the attribute with the given name.
- * </p>
- * <p>
  *
- * </p>
- * <p>
  * @param value is the MonitoredAttribute which will be set as one of the
  * attribute of this MonitoredObject.
- * </p>
  */
     public void addAttribute(MonitoredAttribute value);
 /**
- * <p>
  * Removes the attribute with the given name.
- * </p>
- * <p>
  *
- * </p>
- * <p>
  * @param name is the MonitoredAttribute name
- * </p>
  */
     public void removeAttribute(String name);
 
 /**
- * <p>
  * Gets the Monitored Object registered by the given name
- * </p>
  *
- * <p>
  * @return a MonitoredAttribute identified by the given name
- * </p>
- * <p>
  * @param name of the attribute
- * </p>
  */
     public MonitoredAttribute getAttribute(String name);
 /**
- * <p>
  * Gets all the Monitored Attributes for this Monitored Objects. It doesn't
  * include the Child Monitored Object, that needs to be traversed using
  * getChild() or getChildren() call.
- * </p>
- * <p>
  *
  * @return Collection of all the Attributes for this MonitoredObject
- * </p>
  */
     public Collection getAttributes();
 /**
- * <p>
  * Clears the state of all the Monitored Attributes associated with the
  * Monitored Object. It will also clear the state on all it's child
  * Monitored Object. The call to clearState will be initiated from
  * CORBAMBean.startMonitoring() call.
- * </p>
- *
  */
     public void clearState();
 

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java

@@ -25,14 +25,9 @@
 package com.sun.corba.se.spi.monitoring;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
- * <p>
  *
  * MonitoredObject Factory to create Monitored Object.
- * </p>
  */
 public interface MonitoredObjectFactory {
     /**

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java

@@ -29,17 +29,13 @@ import com.sun.corba.se.impl.monitoring.MonitoredAttributeInfoFactoryImpl;
 import com.sun.corba.se.impl.monitoring.MonitoringManagerFactoryImpl;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  *  This is used for getting the default factories for
  *  MonitoredObject, MonitoredAttributeInfo and MonitoringManager. We do not
  *  expect users to use the MonitoredAttributeInfo factory most of the time
  *  because the Info is automatically built by StringMonitoredAttributeBase
  *  and LongMonitoredAttributeBase.
- *  </p>
  */
 public class MonitoringFactories {
     ///////////////////////////////////////
@@ -57,20 +53,15 @@ public class MonitoringFactories {
     // operations
 
 /**
- * <p>
  * Gets the MonitoredObjectFactory
- * </p>
- * <p>
  *
  * @return a MonitoredObjectFactory
- * </p>
  */
     public static MonitoredObjectFactory getMonitoredObjectFactory( ) {
         return monitoredObjectFactory;
     }
 
 /**
- * <p>
  * Gets the MonitoredAttributeInfoFactory. The user is not expected to use this
  * Factory, since the MonitoredAttributeInfo is internally created by
  * StringMonitoredAttributeBase, LongMonitoredAttributeBase and
@@ -79,11 +70,8 @@ public class MonitoringFactories {
  * build a DoubleMonitoredAttributeBase like LongMonitoredAttributeBase
  * and build a MonitoredAttributeInfo required by MonitoredAttributeBase
  * internally by using this Factory.
- * </p>
- * <p>
  *
  * @return a MonitoredAttributeInfoFactory
- * </p>
  */
     public static MonitoredAttributeInfoFactory
         getMonitoredAttributeInfoFactory( )
@@ -92,18 +80,14 @@ public class MonitoringFactories {
     }
 
 /**
- * <p>
  * Gets the MonitoredManagerFactory. The user is not expected to use this
  * Factory, since the ORB will be automatically initialized with the
  * MonitoringManager.
  *
  * User can get hold of MonitoringManager associated with ORB by calling
  * orb.getMonitoringManager( )
- * </p>
- * <p>
  *
  * @return a MonitoredManagerFactory
- * </p>
  */
     public static MonitoringManagerFactory getMonitoringManagerFactory( ) {
         return monitoringManagerFactory;

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java

@@ -30,15 +30,11 @@ import com.sun.corba.se.spi.monitoring.MonitoredObject;
 import java.util.*;
 
 /**
- * <p>
  * Monitoring Manager will have a 1 to 1 association with the ORB. This
  * gives access to the top level Monitored Object, using which more
  * Monitored Objects and Attributes can be added and traversed.
- * </p>
- * <p>
  *
  * @author Hemanth Puttaswamy
- * </p>
  */
 public interface MonitoringManager extends Closeable {
 
@@ -46,23 +42,14 @@ public interface MonitoringManager extends Closeable {
   // operations
 
 /**
- * <p>
  * Gets the Root Monitored Object which contains a Hierarchy Of Monitored
  * Objects exposing various Monitorable Attributes of Various modules.
- * </p>
- * <p>
- *
- * @param MonitoredObject ...
- * </p>
  */
     public MonitoredObject getRootMonitoredObject();
 /**
- * <p>
  * Initialize is called whenever there is a start monitoring call to CORBA
  * MBean. This will result in triaging initialize to all the
  * MonitoredObjects and it's Monitored Attributes.
- * </p>
- *
  */
     public void clearState();
 

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java

@@ -25,14 +25,10 @@
 package com.sun.corba.se.spi.monitoring;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  * MonitoringObjectFactory is used internally by the ORB, It is not for
  * general public use.
- * </p>
  */
 public interface MonitoringManagerFactory {
     /**

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java

@@ -27,15 +27,11 @@ package com.sun.corba.se.spi.monitoring;
 import java.util.*;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  * StatisticsMonitoredAttribute is provided as a convenience to collect the
  * Statistics of any entity. The getValue() call will be delegated to the
  * StatisticsAccumulator set by the user.
- * </p>
  */
 public class StatisticMonitoredAttribute extends MonitoredAttributeBase {
 
@@ -55,32 +51,19 @@ public class StatisticMonitoredAttribute extends MonitoredAttributeBase {
 
 
 /**
- * <p>
  * Constructs the StaisticMonitoredAttribute, builds the required
  * MonitoredAttributeInfo with Long as the class type and is always
  * readonly attribute.
- * </p>
- * <p>
  *
  * @param name Of this attribute
- * </p>
- * <p>
- * @return a StatisticMonitoredAttribute
- * </p>
- * <p>
  * @param desc should provide a good description on the kind of statistics
  * collected, a good example is "Connection Response Time Stats will Provide the
  * detailed stats based on the samples provided from every request completion
  * time"
- * </p>
- * <p>
  * @param s is the StatisticsAcumulator that user will use to accumulate the
  * samples and this Attribute Object will get the computed statistics values
  * from.
- * </p>
- * <p>
  * @param mutex using which clearState() and getValue() calls need to be locked.
- * </p>
  */
     public  StatisticMonitoredAttribute(String name, String desc,
         StatisticsAccumulator s, Object mutex)

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java

@@ -27,11 +27,8 @@ package com.sun.corba.se.spi.monitoring;
 import java.util.*;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  * StatisticsAccumulator accumulates the samples provided by the user and
  * computes the value of minimum, maximum, sum and sample square sum. When
  * the StatisticMonitoredAttribute calls getValue(), it will compute all
@@ -42,7 +39,6 @@ import java.util.*;
  * Users can easily extend this class and provide the implementation of
  * toString() method to format the stats as desired. By default all the stats
  * are printed in a single line.
- * </p>
  */
 public class StatisticsAccumulator {
 
@@ -72,19 +68,12 @@ public class StatisticsAccumulator {
 
 
 /**
- * <p>
  * User will use this method to just register a sample with the
  * StatisticsAccumulator. This is the only method that User will use to
  * expose the statistics, internally the StatisticMonitoredAttribute will
  * collect the information when requested from the ASAdmin.
- * </p>
- * <p>
- *
- * </p>
- * <p>
  *
  * @param value a double value to make it more precise
- * </p>
  */
     public void sample(double value) {
         sampleCount++;
@@ -137,19 +126,11 @@ public class StatisticsAccumulator {
     }
 
 /**
- * <p>
  * Construct the Statistics Accumulator by providing the unit as a String.
- * The examples of units are &quot;Hours&quot;, &quot;Minutes&quot;,
+ * The examples of units are "Hours", "Minutes",
- * &quot;Seconds&quot;, &quot;MilliSeconds&quot;, &quot;Micro Seconds&quot;
+ * "Seconds", "MilliSeconds", "Micro Seconds" etc.
- * etc.,
- * </p>
- * <p>
  *
- * @return a StatisticsAccumulator with ...
- * </p>
- * <p>
  * @param unit a String representing the units for the samples collected
- * </p>
  */
     public StatisticsAccumulator( String unit ) {
         this.unit = unit;

corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java

@@ -27,14 +27,10 @@ package com.sun.corba.se.spi.monitoring;
 import java.util.*;
 
 /**
- * <p>
- *
  * @author Hemanth Puttaswamy
- * </p>
+ *
- * <p>
  * A Convenient Abstraction to present String type Monitored Attribute. One
  * of the examples of StringMonitoredAttribute is the State information.
- * </p>
  */
 public abstract class StringMonitoredAttributeBase
     extends MonitoredAttributeBase
@@ -45,20 +41,11 @@ public abstract class StringMonitoredAttributeBase
 
 
 /**
- * <p>
  * Constructs StringMonitoredAttribute with the MonitoredAttributeInfo
  * built with the class type of String.
- * </p>
- * <p>
  *
  * @param name of this attribute
- * </p>
- * <p>
  * @param description of this attribute
- * </p>
- * <p>
- * @return a StringMonitoredAttributeBase
- * </p>
  */
     public  StringMonitoredAttributeBase(String name, String description) {
         super( name );

corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java

@@ -89,7 +89,7 @@ import com.sun.corba.se.spi.ior.IORTemplate ;
 * <li>A local invocation, where the dispatch is handled in the client subcontract.</li>
 * <li>A cached local invocation, where the servant is cached when the IOR is established
 * for the client subcontract, and the dispatch is handled in the client subcontract
-* to the cached subcontract.<li>
+* to the cached subcontract.</li>
 * </ol>
 * <p>
 * Each of these 3 cases is handled a bit differently.  On each request, assume as known
@@ -111,11 +111,11 @@ import com.sun.corba.se.spi.ior.IORTemplate ;
 *   <li>oa.returnServant()</li>
 *   <li>oa.exit()</li>
 *   <li>pop info</li>
-*   <ol>
+*   </ol>
 * </li>
-* REVISIT: Is this the required order for exit/pop?  Cna they be nested instead?
+* <!-- REVISIT: Is this the required order for exit/pop?  Cna they be nested instead?
 * Note that getInvocationServant and returnServant may throw exceptions.  In such cases,
-* returnServant, exit, and pop must be called in the correct order.
+* returnServant, exit, and pop must be called in the correct order. -->
 * <li>The local pattern:
 *   <ol>
 *   <li>oa = oaf.find( oaid )</li>
@@ -128,10 +128,10 @@ import com.sun.corba.se.spi.ior.IORTemplate ;
 *   <li>oa.returnServant()</li>
 *   <li>oa.exit()</li>
 *   <li>pop info</li>
-*   <ol>
+*   </ol>
 * </li>
-* This is the same as the remote case, except that setExecuteReturnServantInResponseConstructor
+* <!-- This is the same as the remote case, except that setExecuteReturnServantInResponseConstructor
-* is not needed (or possible, since there is no server request).
+* is not needed (or possible, since there is no server request). -->
 * <li>The fast local pattern: When delegate is constructed,
 *    first extract ObjectKey from IOR in delegate,
 *    then get ObjectId, ObjectAdapterId, and ObjectAdapterFactory (oaf). Then:
@@ -143,14 +143,14 @@ import com.sun.corba.se.spi.ior.IORTemplate ;
 *    <li>pop info
 *    </ol>
 *    The info instance (which includes the Servant) is cached in the client subcontract.
-*    <p>Then, on each invocation:</p>
+*    <p>Then, on each invocation:
 *    <ol>
 *    <li>newinfo = copy of info (clone)</li>
 *    <li>info.setOperation( operation )</li>
 *    <li>push newinfo</li>
 *    <li>oa.enter()</li>
 *    <li>dispatch to servant</li>
-*    <li>oa.returnServant()</li>  // XXX This is probably wrong: remove it.
+*    <li>oa.returnServant()</li>  <!-- XXX This is probably wrong: remove it. -->
 *    <li>oa.exit()</li>
 *    <li>pop info</li>
 *    </ol>

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

@@ -58,7 +58,7 @@ public interface DataCollector {
      * mappings in the resulting properties.  Also, -ORBInitialServices
      * is handled specially in applet mode: they are converted from
      * relative to absolute URLs.
-     * @raises IllegalStateException if setPropertyNames has not
+     * @throws IllegalStateException if setPropertyNames has not
      * been called.
      */
     Properties getProperties() ;

corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java

@@ -46,8 +46,8 @@ public interface Action
         * in the state machine, as the state could be corrupted.
         * Any exception thrown by the Action for the transition
         * will be propagated to doIt.
-        * @param FSM fsm is the state machine causing this action.
+        * @param fsm the state machine causing this action.
-        * @param Input in is the input that caused the transition.
+        * @param in  the input that caused the transition.
         */
         public void doIt( FSM fsm, Input in ) ;
 }

corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java

@@ -93,8 +93,8 @@ public interface Guard
     * input is retried when the thread runs again.
     * </ul>
     *
-    * @param FSM fsm is the state machine causing this action.
+    * @param fsm is the state machine causing this action.
-    * @param Input in is the input that caused the transition.
+    * @param in is the input that caused the transition.
     */
     public Result evaluate( FSM fsm, Input in ) ;
 }

corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java

@@ -42,9 +42,8 @@ import com.sun.corba.se.impl.orbutil.ORBUtility ;
 * the service context and provides any needed methods for manipulating
 * the service context.  Each subclass must provide the following
 * members:
-* <p>
 * <ul>
-* </li>a public static final int SERVICE_CONTEXT_ID that gives the OMG
+* <li>a public static final int SERVICE_CONTEXT_ID that gives the OMG
 * (or other) defined id for the service context.  This is needed for the
 * registration mechanism defined in ServiceContexts. OMG defined
 * service context ids are taken from section 13.6.7 of ptc/98-12-04.</li>

corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java

@@ -32,7 +32,7 @@ import org.omg.CORBA.portable.BoxedValueHelper;
  * An interface that is implemented by valuetype helper classes.
  * This interface appeared in CORBA 2.3 drafts but was removed from
  * the published CORBA 2.3 specification.
- * <P>
+ *
  * @deprecated Deprecated by CORBA 2.3.
  */
 @Deprecated

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java

@@ -68,9 +68,9 @@ public class Arguments
    * must check the arguments passed to it for validity and process the
    * arguments appropriately.  If it detects an invalid argument, it should
    * throw an InvalidArgument exception.  Arguments MUST be of the form
-   * `/<arg> [<qualifiers>]' or `-<arg> [<qualifiers>]' where <qualifiers>
+   * {@code '/<arg> [<qualifiers>]'} or {@code '-<arg> [<qualifiers>]'} where {@code <qualifiers>}
-   * is optional (for example, -iC:\includes, `C:\includes' is the qualifier
+   * is optional (for example, -iC:\includes, 'C:\includes' is the qualifier
-   * for the argument `i').
+   * for the argument 'i').
    * @param args The arguments which are unknown by the framework.
    * @param properties Environment-style properties collected from the
    * file idl.config.
@@ -289,7 +289,7 @@ public class Arguments
   public Hashtable definedSymbols = new Hashtable ();
 
   /**
-   * <f46082.46.01> True if new module entries are created for each
+   * (f46082.46.01) True if new module entries are created for each
    * re-opened module.
    **/
   public boolean cppModule = false;

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java

@@ -80,7 +80,7 @@ public class AttributeEntry extends MethodEntry
   } // generate
 
   /** Access the attribute generator.
-      @returns an object which implements the AttributeGen interface.
+      @return an object which implements the AttributeGen interface.
       @see AttributeGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Compile.java

@@ -52,7 +52,7 @@ import com.sun.tools.corba.se.idl.constExpr.DefaultExprFactory;
  * Compiler usage:
  * <br><br>
  *
- * java com.sun.tools.corba.se.idl.toJava.compile [options] <idl file>
+ * {@code java com.sun.tools.corba.se.idl.toJava.compile [options] <idl file>}
  * <br><br>
  *
  * where &lt;idl file&gt; is the name of a file containing IDL definitions,
@@ -62,17 +62,17 @@ import com.sun.tools.corba.se.idl.constExpr.DefaultExprFactory;
  *
  * Options:
  * <dl>
- * <dt>-i &lt;include path&gt;
+ * <dt>{@code -i <include path>}
  * <dd>By default, the current directory is scanned for included files.
  *     This option adds another directory.  See also Note 1 below.
  *
- * <dt>-d &lt;symbol&gt;
+ * <dt>{@code -d <symbol>}
- * <dd>This is equivalent to the following line in an IDL file: #define &lt;symbol&gt;
+ * <dd>This is equivalent to the following line in an IDL file: {@code #define <symbol>}
  *
- * <dt>-emitAll
+ * <dt>{@code -emitAll}
  * <dd>Emit all types, including those found in #included files.
  *
- * <dt>-v
+ * <dt>{@code -v}
  * <dd>Verbose mode.
  * </dl>
  *
@@ -81,9 +81,9 @@ import com.sun.tools.corba.se.idl.constExpr.DefaultExprFactory;
  * time.  Instead, these can be placed into a config file called idl.config.
  * This file must be in the CLASSPATH.  The format of the includes line is:
  *
- * <pre>
+ * <pre>{@code
  * includes=<path1>;<path2>;...;<pathN>
- * </pre>
+ * }</pre>
  *
  * Note that the path separator character, here shown as a semicolon, is
  * machine dependent.  For instance, on Windows 95 this character is a
@@ -481,10 +481,10 @@ public class Compile
    **/
   public Arguments arguments           = null;
   /**
-   * This hashtable contains <real name, alias> pairs.  It is filled in by
+   * This hashtable contains {@code <real name, alias>} pairs. It is filled in by
    * extenders in cases where they wish to override an IDL type name with
    * some other name.  For instance, when mapping to Java, there could be
-   * an overrideNames entry of <"TRUE", "true">.  NOTE:  Do NOT change this
+   * an overrideNames entry of {@code <"TRUE", "true">}.  NOTE:  Do NOT change this
    * variable to a new Hash table.  Just add elements to it.
    **/
   protected Hashtable overrideNames    = new Hashtable ();
@@ -495,8 +495,8 @@ public class Compile
    **/
   protected Hashtable symbolTable      = new Hashtable ();
   /**
-   * This is a vector of strings of the form "IDLfile" or <IDLfile>.  It is
+   * This is a vector of strings of the form {@code "IDLfile"} or {@code <IDLfile>}.
-   * a list of the files included in the given IDL file.  It will be empty
+   * It is a list of the files included in the given IDL file. It will be empty
    * until the parse method executes.  If errors are encountered, the state
    * of this vector is undefined.
    **/

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java

@@ -90,7 +90,7 @@ public class ConstEntry extends SymtabEntry
   } // generate
 
   /** Access the constant generator.
-      @returns an object which implements the ConstGen interface.
+      @return an object which implements the ConstGen interface.
       @see ConstGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java

@@ -202,7 +202,7 @@ public class DefaultSymtabFactory implements SymtabFactory
       'char', 'octet', 'short', 'long', etc.  The reason it is not limited
       to these is that, as an extender, you may wish to override these names.
       For instance, when generating Java code, octet translates to byte, so
-      there is an entry in Compile.overrideNames:  <"octet", "byte"> and a
+      there is an entry in Compile.overrideNames: {@code <"octet", "byte">} and a
       PrimitiveEntry in the symbol table for "byte". */
   public PrimitiveEntry primitiveEntry (String name)
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java

@@ -84,7 +84,7 @@ public class EnumEntry extends SymtabEntry
   } // generate
 
   /** Access the enumerator generator.
-      @returns an object which implements the EnumGen interface.
+      @return an object which implements the EnumGen interface.
       @see EnumGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java

@@ -80,7 +80,7 @@ public class ExceptionEntry extends StructEntry
   } // generate
 
   /** Access the exception generator.
-      @returns an object which implements the ExceptionGen interface.
+      @return an object which implements the ExceptionGen interface.
       @see ExceptionGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java

@@ -83,7 +83,7 @@ public class ForwardEntry extends SymtabEntry implements InterfaceType
   } // generate
 
   /** Access the interface generator.
-      @returns an object which implements the InterfaceGen interface.
+      @return an object which implements the InterfaceGen interface.
       @see InterfaceGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java

@@ -79,7 +79,7 @@ public class ForwardValueEntry extends ForwardEntry
   } // generate
 
   /** Access the interface generator.
-      @returns an object which implements the ForwardValueGen interface.
+      @return an object which implements the ForwardValueGen interface.
       @see ValueGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java

@@ -81,7 +81,7 @@ public class IncludeEntry extends SymtabEntry
   } // generate
 
   /** Access the Include type generator.
-      @returns an object which implements the IncludeGen interface.
+      @return an object which implements the IncludeGen interface.
       @see IncludeGen */
   public Generator generator ()
   {
@@ -97,7 +97,7 @@ public class IncludeEntry extends SymtabEntry
 
   //d44810
   /** Access the fully-qualified file specification of this include.
-      @returns a string containing the path of the include file. */
+      @return a string containing the path of the include file. */
   public String absFilename ()
   {
     return _absFilename;

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java

@@ -111,7 +111,7 @@ public class InterfaceEntry extends SymtabEntry implements InterfaceType
   } // generate
 
   /** Access the interface generator.
-      @returns an object which implements the InterfaceGen interface.
+      @return an object which implements the InterfaceGen interface.
       @see InterfaceGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java

@@ -89,7 +89,7 @@ public class MethodEntry extends SymtabEntry
   } // generate
 
   /** Access the method generator.
-      @returns an object which implements the MethodGen interface.
+      @return an object which implements the MethodGen interface.
       @see MethodGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java

@@ -84,7 +84,7 @@ public class ModuleEntry extends SymtabEntry
   } // generate
 
   /** Access the module generator.
-      @returns an object which implements the ModuleGen interface.
+      @return an object which implements the ModuleGen interface.
       @see ModuleGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java

@@ -73,7 +73,7 @@ public class NativeEntry extends SymtabEntry
   } // generate
 
   /** Access the constant generator.
-      @returns an object which implements the ConstGen interface.
+      @return an object which implements the ConstGen interface.
       @see ConstGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java

@@ -88,7 +88,7 @@ public class ParameterEntry extends SymtabEntry
   } // generate
 
   /** Access the parameter generator.
-      @returns an object which implements the ParameterGen interface.
+      @return an object which implements the ParameterGen interface.
       @see ParameterGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java

@@ -80,7 +80,7 @@ public class PragmaEntry extends SymtabEntry
   } // generate
 
   /** Access the Include type generator.
-      @returns an object which implements the IncludeGen interface.
+      @return an object which implements the IncludeGen interface.
       @see IncludeGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java

@@ -81,7 +81,7 @@ public class PrimitiveEntry extends SymtabEntry
   } // generate
 
   /** Access the primitive type generator.
-      @returns an object which implements the PrimitiveGen interface.
+      @return an object which implements the PrimitiveGen interface.
       @see PrimitiveGen */
   public Generator generator ()
   {

corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java

@@ -68,8 +68,8 @@ public class RepositoryID
   /**
    * Determine is a supplied string meets the minimal format requirement
    * for a Repository ID.
-   * @return true iff supplied string has form '<format>:<string>', where
+   * @return true if supplied string has form {@code '<format>:<string>'}, where
-   * <format> is any non-empty string not containing ':'.
+   * {@code <format>} is any non-empty string not containing ':'.
    **/
   public static boolean hasValidForm (String string)
   {