--- a/.hgtags Thu Jul 06 09:36:17 2017 -0700
+++ b/.hgtags Mon Jul 17 09:13:49 2017 -0700
@@ -1,3 +1,6 @@
+43bf6f30fcba031ecf0cc7e511efe3a8179d0f77 jdk-9+176
+d9f6bc6ba599d0487dc18b2fbdb6c34eedf6f958 jdk-9+177
+bc9df7dd63ec76f50fafeb4acc44465044662f0a jdk-9+178
994036e74ab805bcc09afa0646be17a725bec42f jdk-9+175
94680c6d60ecd9ed3ffd1847706efde7eb947afc jdk-9+174
6dd7fda42bab7ecf648cafb0a4e9b4ca11b3094f jdk-9+173
@@ -432,3 +435,4 @@
036dbf8b381798e5d31065109714d04d97bf98a4 jdk-10+11
e6d70017f5b9adbb2ec82d826973d0251800a3c3 jdk-10+12
9927a9f16738e240ab7014f0118f41e314ef8f99 jdk-10+13
+9ef5029b247b4d940080417a287440bbdbab995b jdk-10+14
--- a/.hgtags-top-repo Thu Jul 06 09:36:17 2017 -0700
+++ b/.hgtags-top-repo Mon Jul 17 09:13:49 2017 -0700
@@ -432,3 +432,7 @@
8d4ed1e06fe184c9cb08c5b708e7d6f5c066644f jdk-10+12
8f7227c6012b0051ea4e0bcee040c627bf699b88 jdk-9+175
d67a3f1f057f7e31e12f33ebe3667cb73d252268 jdk-10+13
+1fd5901544acc50bb30fde9388c8e53cb7c449e4 jdk-10+14
+84777531d994ef70163d35078ec9c4127f2eadb5 jdk-9+176
+a4371edb589c60db01142e45c317adb9ccbcb083 jdk-9+177
+a6c830ee8a6798b186730475e700027cdf4598aa jdk-10+15
--- a/common/autoconf/flags.m4 Thu Jul 06 09:36:17 2017 -0700
+++ b/common/autoconf/flags.m4 Mon Jul 17 09:13:49 2017 -0700
@@ -996,7 +996,6 @@
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -fno-rtti -fno-exceptions -fvisibility=hidden \
-mno-omit-leaf-frame-pointer -mstack-alignment=16 -pipe -fno-strict-aliasing \
- -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -mmacosx-version-min=10.7.0 \
-fno-omit-frame-pointer"
elif test "x$OPENJDK_$1_OS" = xaix; then
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -DAIX"
@@ -1081,18 +1080,50 @@
# Additional macosx handling
if test "x$OPENJDK_$1_OS" = xmacosx; then
- # Setting these parameters makes it an error to link to macosx APIs that are
- # newer than the given OS version and makes the linked binaries compatible
- # even if built on a newer version of the OS.
- # The expected format is X.Y.Z
+ # MACOSX_VERSION_MIN is the c++ and ld is -mmacosx-version-min argument. The expected
+ # format is X.Y.Z. It's hard-coded to the minimum OSX version on which the
+ # JDK can be built and makes the linked binaries compatible even if built on
+ # a newer version of the OS.
MACOSX_VERSION_MIN=10.7.0
AC_SUBST(MACOSX_VERSION_MIN)
- # The macro takes the version with no dots, ex: 1070
+ # Setting --with-macosx-version-max=<version> makes it an error to build or
+ # link to macosx APIs that are newer than the given OS version. The expected
+ # format for <version> is either nn.n.n or nn.nn.nn. See /usr/include/AvailabilityMacros.h.
+ AC_ARG_WITH([macosx-version-max], [AS_HELP_STRING([--with-macosx-version-max],
+ [error on use of newer functionality. @<:@macosx@:>@])],
+ [
+ if echo "$with_macosx_version_max" | $GREP -q "^[[0-9]][[0-9]]\.[[0-9]]\.[[0-9]]\$"; then
+ MACOSX_VERSION_MAX=$with_macosx_version_max
+ elif echo "$with_macosx_version_max" | $GREP -q "^[[0-9]][[0-9]]\.[[0-9]][[0-9]]\.[[0-9]][[0-9]]\$"; then
+ MACOSX_VERSION_MAX=$with_macosx_version_max
+ elif test "x$with_macosx_version_max" = "xno"; then
+ # Use build system default
+ MACOSX_VERSION_MAX=
+ else
+ AC_MSG_ERROR([osx version format must be nn.n.n or nn.nn.nn])
+ fi
+ ],
+ [MACOSX_VERSION_MAX=]
+ )
+ AC_SUBST(MACOSX_VERSION_MAX)
+
# Let the flags variables get resolved in make for easier override on make
- # command line.
- $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ # command line. AvailabilityMacros.h versions have no dots, ex: 1070.
+ $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
+ -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
+ -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
$2LDFLAGS_JDK="[$]$2LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ $2JVM_CFLAGS="[$]$2JVM_CFLAGS \
+ -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
+ -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+
+ if test -n "$MACOSX_VERSION_MAX"; then
+ $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
+ -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
+ $2JVM_CFLAGS="[$]$2JVM_CFLAGS \
+ -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
+ fi
fi
# Setup some hard coded includes
--- a/common/autoconf/generated-configure.sh Thu Jul 06 09:36:17 2017 -0700
+++ b/common/autoconf/generated-configure.sh Mon Jul 17 09:13:49 2017 -0700
@@ -749,6 +749,7 @@
CXXFLAGS_JDKLIB
CFLAGS_JDKEXE
CFLAGS_JDKLIB
+MACOSX_VERSION_MAX
MACOSX_VERSION_MIN
CXXSTD_CXXFLAG
JDK_ARCH_ABI_PROP_NAME
@@ -1182,6 +1183,7 @@
with_build_devkit
with_jtreg
with_abi_profile
+with_macosx_version_max
enable_warnings_as_errors
with_native_debug_symbols
enable_debug_symbols
@@ -2132,6 +2134,8 @@
(arm-vfp-sflt,arm-vfp-hflt,arm-sflt,
armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64)
[toolchain dependent]
+ --with-macosx-version-max
+ error on use of newer functionality. [macosx]
--with-native-debug-symbols
set the native debug symbol configuration (none,
internal, external, zipped) [varying]
@@ -5189,7 +5193,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1496926402
+DATE_WHEN_GENERATED=1500048914
###############################################################################
#
@@ -51461,7 +51465,6 @@
JVM_CFLAGS="$JVM_CFLAGS -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
JVM_CFLAGS="$JVM_CFLAGS -fno-rtti -fno-exceptions -fvisibility=hidden \
-mno-omit-leaf-frame-pointer -mstack-alignment=16 -pipe -fno-strict-aliasing \
- -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -mmacosx-version-min=10.7.0 \
-fno-omit-frame-pointer"
elif test "x$OPENJDK_TARGET_OS" = xaix; then
JVM_CFLAGS="$JVM_CFLAGS -DAIX"
@@ -51635,18 +51638,54 @@
# Additional macosx handling
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- # Setting these parameters makes it an error to link to macosx APIs that are
- # newer than the given OS version and makes the linked binaries compatible
- # even if built on a newer version of the OS.
- # The expected format is X.Y.Z
+ # MACOSX_VERSION_MIN is the c++ and ld is -mmacosx-version-min argument. The expected
+ # format is X.Y.Z. It's hard-coded to the minimum OSX version on which the
+ # JDK can be built and makes the linked binaries compatible even if built on
+ # a newer version of the OS.
MACOSX_VERSION_MIN=10.7.0
- # The macro takes the version with no dots, ex: 1070
+ # Setting --with-macosx-version-max=<version> makes it an error to build or
+ # link to macosx APIs that are newer than the given OS version. The expected
+ # format for <version> is either nn.n.n or nn.nn.nn. See /usr/include/AvailabilityMacros.h.
+
+# Check whether --with-macosx-version-max was given.
+if test "${with_macosx_version_max+set}" = set; then :
+ withval=$with_macosx_version_max;
+ if echo "$with_macosx_version_max" | $GREP -q "^[0-9][0-9]\.[0-9]\.[0-9]\$"; then
+ MACOSX_VERSION_MAX=$with_macosx_version_max
+ elif echo "$with_macosx_version_max" | $GREP -q "^[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\$"; then
+ MACOSX_VERSION_MAX=$with_macosx_version_max
+ elif test "x$with_macosx_version_max" = "xno"; then
+ # Use build system default
+ MACOSX_VERSION_MAX=
+ else
+ as_fn_error $? "osx version format must be nn.n.n or nn.nn.nn" "$LINENO" 5
+ fi
+
+else
+ MACOSX_VERSION_MAX=
+
+fi
+
+
+
# Let the flags variables get resolved in make for easier override on make
- # command line.
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ # command line. AvailabilityMacros.h versions have no dots, ex: 1070.
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
+ -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
+ -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ JVM_CFLAGS="$JVM_CFLAGS \
+ -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
+ -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+
+ if test -n "$MACOSX_VERSION_MAX"; then
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
+ -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
+ JVM_CFLAGS="$JVM_CFLAGS \
+ -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
+ fi
fi
# Setup some hard coded includes
@@ -52279,7 +52318,6 @@
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -fno-rtti -fno-exceptions -fvisibility=hidden \
-mno-omit-leaf-frame-pointer -mstack-alignment=16 -pipe -fno-strict-aliasing \
- -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -mmacosx-version-min=10.7.0 \
-fno-omit-frame-pointer"
elif test "x$OPENJDK_BUILD_OS" = xaix; then
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -DAIX"
@@ -52453,18 +52491,54 @@
# Additional macosx handling
if test "x$OPENJDK_BUILD_OS" = xmacosx; then
- # Setting these parameters makes it an error to link to macosx APIs that are
- # newer than the given OS version and makes the linked binaries compatible
- # even if built on a newer version of the OS.
- # The expected format is X.Y.Z
+ # MACOSX_VERSION_MIN is the c++ and ld is -mmacosx-version-min argument. The expected
+ # format is X.Y.Z. It's hard-coded to the minimum OSX version on which the
+ # JDK can be built and makes the linked binaries compatible even if built on
+ # a newer version of the OS.
MACOSX_VERSION_MIN=10.7.0
- # The macro takes the version with no dots, ex: 1070
+ # Setting --with-macosx-version-max=<version> makes it an error to build or
+ # link to macosx APIs that are newer than the given OS version. The expected
+ # format for <version> is either nn.n.n or nn.nn.nn. See /usr/include/AvailabilityMacros.h.
+
+# Check whether --with-macosx-version-max was given.
+if test "${with_macosx_version_max+set}" = set; then :
+ withval=$with_macosx_version_max;
+ if echo "$with_macosx_version_max" | $GREP -q "^[0-9][0-9]\.[0-9]\.[0-9]\$"; then
+ MACOSX_VERSION_MAX=$with_macosx_version_max
+ elif echo "$with_macosx_version_max" | $GREP -q "^[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\$"; then
+ MACOSX_VERSION_MAX=$with_macosx_version_max
+ elif test "x$with_macosx_version_max" = "xno"; then
+ # Use build system default
+ MACOSX_VERSION_MAX=
+ else
+ as_fn_error $? "osx version format must be nn.n.n or nn.nn.nn" "$LINENO" 5
+ fi
+
+else
+ MACOSX_VERSION_MAX=
+
+fi
+
+
+
# Let the flags variables get resolved in make for easier override on make
- # command line.
- OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ # command line. AvailabilityMacros.h versions have no dots, ex: 1070.
+ OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
+ -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
+ -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
OPENJDK_BUILD_LDFLAGS_JDK="$OPENJDK_BUILD_LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS \
+ -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
+ -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+
+ if test -n "$MACOSX_VERSION_MAX"; then
+ OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
+ -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
+ OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS \
+ -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
+ fi
fi
# Setup some hard coded includes
--- a/common/autoconf/spec.gmk.in Thu Jul 06 09:36:17 2017 -0700
+++ b/common/autoconf/spec.gmk.in Mon Jul 17 09:13:49 2017 -0700
@@ -335,8 +335,10 @@
X_CFLAGS:=@X_CFLAGS@
X_LIBS:=@X_LIBS@
-# The lowest required version of macosx to enforce compatiblity for
+# The lowest required version of macosx
MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
+# The highest allowed version of macosx
+MACOSX_VERSION_MAX=@MACOSX_VERSION_MAX@
# Toolchain type: gcc, clang, solstudio, lxc, microsoft...
TOOLCHAIN_TYPE:=@TOOLCHAIN_TYPE@
--- a/common/conf/jib-profiles.js Thu Jul 06 09:36:17 2017 -0700
+++ b/common/conf/jib-profiles.js Mon Jul 17 09:13:49 2017 -0700
@@ -436,7 +436,8 @@
target_os: "macosx",
target_cpu: "x64",
dependencies: ["devkit"],
- configure_args: concat(common.configure_args_64bit, "--with-zlib=system"),
+ configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
+ "--with-macosx-version-max=10.7.0"),
},
"solaris-x64": {
@@ -615,6 +616,8 @@
}
var testOnlyProfilesPrebuilt = {
"run-test-prebuilt": {
+ target_os: input.build_os,
+ target_cpu: input.build_cpu,
src: "src.conf",
dependencies: [ "jtreg", "gnumake", "boot_jdk", testedProfile + ".jdk",
testedProfile + ".test", "src.full"
@@ -635,13 +638,14 @@
if (input.profile == "run-test-prebuilt") {
if (profiles[testedProfile] == null) {
error("testedProfile is not defined: " + testedProfile);
- } else {
- testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"]
- = profiles[testedProfile]["target_os"];
- testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
- = profiles[testedProfile]["target_cpu"];
}
}
+ if (profiles[testedProfile] != null) {
+ testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"]
+ = profiles[testedProfile]["target_os"];
+ testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
+ = profiles[testedProfile]["target_cpu"];
+ }
profiles = concatObjects(profiles, testOnlyProfilesPrebuilt);
// On macosx add the devkit bin dir to the path in all the run-test profiles.
--- a/common/doc/building.html Thu Jul 06 09:36:17 2017 -0700
+++ b/common/doc/building.html Mon Jul 17 09:13:49 2017 -0700
@@ -4,149 +4,345 @@
<meta charset="utf-8">
<meta name="generator" content="pandoc">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
- <title>OpenJDK Build README</title>
+ <title>Building OpenJDK</title>
<style type="text/css">code{white-space: pre;}</style>
- <link rel="stylesheet" href="../../jdk/make/data/docs-resources/specs/resources/jdk-default.css">
+ <link rel="stylesheet" href="../../jdk/make/data/docs-resources/resources/jdk-default.css">
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
<![endif]-->
+ <style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
</head>
<body>
<header>
-<h1 class="title">OpenJDK Build README</h1>
+<h1 class="title">Building OpenJDK</h1>
</header>
-<figure>
-<img src="http://openjdk.java.net/images/openjdk.png" alt="OpenJDK" /><figcaption>OpenJDK</figcaption>
-</figure>
-<hr />
-<h2 id="introduction">Introduction</h2>
-<p>This README file contains build instructions for the <a href="http://openjdk.java.net">OpenJDK</a>. Building the source code for the OpenJDK requires a certain degree of technical expertise.</p>
-<h3 id="this-is-a-major-re-write-of-this-document.">!!!!!!!!!!!!!!! THIS IS A MAJOR RE-WRITE of this document. !!!!!!!!!!!!!</h3>
-<p>Some Headlines:</p>
-<ul>
-<li>The build is now a "<code>configure && make</code>" style build</li>
-<li>Any GNU make 3.81 or newer should work, except on Windows where 4.0 or newer is recommended.</li>
-<li>The build should scale, i.e. more processors should cause the build to be done in less wall-clock time</li>
-<li>Nested or recursive make invocations have been significantly reduced, as has the total fork/exec or spawning of sub processes during the build</li>
-<li>Windows MKS usage is no longer supported</li>
-<li>Windows Visual Studio <code>vsvars*.bat</code> and <code>vcvars*.bat</code> files are run automatically</li>
-<li>Ant is no longer used when building the OpenJDK</li>
-<li>Use of ALT_* environment variables for configuring the build is no longer supported</li>
-</ul>
-<hr />
-<h2 id="contents">Contents</h2>
-<ul>
-<li><a href="#introduction">Introduction</a></li>
-<li><a href="#hg">Use of Mercurial</a>
+<nav id="TOC">
<ul>
-<li><a href="#get_source">Getting the Source</a></li>
-<li><a href="#repositories">Repositories</a></li>
+<li><a href="#tldr-instructions-for-the-impatient">TL;DR (Instructions for the Impatient)</a></li>
+<li><a href="#introduction">Introduction</a></li>
+<li><a href="#getting-the-source-code">Getting the Source Code</a><ul>
+<li><a href="#special-considerations">Special Considerations</a></li>
+<li><a href="#using-get_source.sh">Using get_source.sh</a></li>
+<li><a href="#using-hgforest.sh">Using hgforest.sh</a></li>
+<li><a href="#using-the-trees-extension">Using the Trees Extension</a></li>
+</ul></li>
+<li><a href="#build-hardware-requirements">Build Hardware Requirements</a><ul>
+<li><a href="#building-on-x86">Building on x86</a></li>
+<li><a href="#building-on-sparc">Building on sparc</a></li>
+<li><a href="#building-on-armaarch64">Building on arm/aarch64</a></li>
+</ul></li>
+<li><a href="#operating-system-requirements">Operating System Requirements</a><ul>
+<li><a href="#windows">Windows</a></li>
+<li><a href="#solaris">Solaris</a></li>
+<li><a href="#macos">macOS</a></li>
+<li><a href="#linux">Linux</a></li>
+<li><a href="#aix">AIX</a></li>
+</ul></li>
+<li><a href="#native-compiler-toolchain-requirements">Native Compiler (Toolchain) Requirements</a><ul>
+<li><a href="#gcc">gcc</a></li>
+<li><a href="#clang">clang</a></li>
+<li><a href="#apple-xcode">Apple Xcode</a></li>
+<li><a href="#oracle-solaris-studio">Oracle Solaris Studio</a></li>
+<li><a href="#microsoft-visual-studio">Microsoft Visual Studio</a></li>
+<li><a href="#ibm-xl-cc">IBM XL C/C++</a></li>
+</ul></li>
+<li><a href="#boot-jdk-requirements">Boot JDK Requirements</a><ul>
+<li><a href="#jdk-8-on-linux">JDK 8 on Linux</a></li>
+<li><a href="#jdk-8-on-windows">JDK 8 on Windows</a></li>
+<li><a href="#jdk-8-on-macos">JDK 8 on macOS</a></li>
+<li><a href="#jdk-8-on-aix">JDK 8 on AIX</a></li>
</ul></li>
-<li><a href="#building">Building</a>
-<ul>
-<li><a href="#setup">System Setup</a>
-<ul>
-<li><a href="#linux">Linux</a></li>
-<li><a href="#solaris">Solaris</a></li>
-<li><a href="#macosx">Mac OS X</a></li>
-<li><a href="#windows">Windows</a></li>
+<li><a href="#external-library-requirements">External Library Requirements</a><ul>
+<li><a href="#freetype">FreeType</a></li>
+<li><a href="#cups">CUPS</a></li>
+<li><a href="#x11">X11</a></li>
+<li><a href="#alsa">ALSA</a></li>
+<li><a href="#libffi">libffi</a></li>
+<li><a href="#libelf">libelf</a></li>
+</ul></li>
+<li><a href="#other-tooling-requirements">Other Tooling Requirements</a><ul>
+<li><a href="#gnu-make">GNU Make</a></li>
+<li><a href="#gnu-bash">GNU Bash</a></li>
+<li><a href="#autoconf">Autoconf</a></li>
+</ul></li>
+<li><a href="#running-configure">Running Configure</a><ul>
+<li><a href="#common-configure-arguments">Common Configure Arguments</a></li>
+<li><a href="#configure-control-variables">Configure Control Variables</a></li>
+</ul></li>
+<li><a href="#running-make">Running Make</a><ul>
+<li><a href="#common-make-targets">Common Make Targets</a></li>
+<li><a href="#make-control-variables">Make Control Variables</a></li>
+</ul></li>
+<li><a href="#running-tests">Running Tests</a></li>
+<li><a href="#cross-compiling">Cross-compiling</a><ul>
+<li><a href="#boot-jdk-and-build-jdk">Boot JDK and Build JDK</a></li>
+<li><a href="#specifying-the-target-platform">Specifying the Target Platform</a></li>
+<li><a href="#toolchain-considerations">Toolchain Considerations</a></li>
+<li><a href="#native-libraries">Native Libraries</a></li>
+<li><a href="#building-for-armaarch64">Building for ARM/aarch64</a></li>
+<li><a href="#verifying-the-build">Verifying the Build</a></li>
+</ul></li>
+<li><a href="#build-performance">Build Performance</a><ul>
+<li><a href="#disk-speed">Disk Speed</a></li>
+<li><a href="#virus-checking">Virus Checking</a></li>
+<li><a href="#ccache">Ccache</a></li>
+<li><a href="#precompiled-headers">Precompiled Headers</a></li>
+<li><a href="#icecc-icecream">Icecc / icecream</a></li>
+<li><a href="#using-sjavac">Using sjavac</a></li>
+<li><a href="#building-the-right-target">Building the Right Target</a></li>
</ul></li>
-<li><a href="#configure">Configure</a></li>
-<li><a href="#make">Make</a></li>
+<li><a href="#troubleshooting">Troubleshooting</a><ul>
+<li><a href="#locating-the-source-of-the-error">Locating the Source of the Error</a></li>
+<li><a href="#fixing-unexpected-build-failures">Fixing Unexpected Build Failures</a></li>
+<li><a href="#specific-build-issues">Specific Build Issues</a></li>
+<li><a href="#getting-help">Getting Help</a></li>
+</ul></li>
+<li><a href="#hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</a><ul>
+<li><a href="#setting-up-a-forest-for-pushing-changes-defpath">Setting Up a Forest for Pushing Changes (defpath)</a></li>
+<li><a href="#bash-completion">Bash Completion</a></li>
+<li><a href="#using-multiple-configurations">Using Multiple Configurations</a></li>
+<li><a href="#handling-reconfigurations">Handling Reconfigurations</a></li>
+<li><a href="#using-fine-grained-make-targets">Using Fine-Grained Make Targets</a></li>
+<li><a href="#learn-about-mercurial">Learn About Mercurial</a></li>
+</ul></li>
+<li><a href="#understanding-the-build-system">Understanding the Build System</a><ul>
+<li><a href="#configurations">Configurations</a></li>
+<li><a href="#build-output-structure">Build Output Structure</a></li>
+<li><a href="#fixpath">Fixpath</a></li>
+<li><a href="#native-debug-symbols">Native Debug Symbols</a></li>
+<li><a href="#autoconf-details">Autoconf Details</a></li>
+<li><a href="#developing-the-build-system-itself">Developing the Build System Itself</a></li>
</ul></li>
-<li><a href="#testing">Testing</a></li>
+<li><a href="#contributing-to-openjdk">Contributing to OpenJDK</a></li>
</ul>
-<hr />
+</nav>
+<h2 id="tldr-instructions-for-the-impatient">TL;DR (Instructions for the Impatient)</h2>
+<p>If you are eager to try out building OpenJDK, these simple steps works most of the time. They assume that you have installed Mercurial (and Cygwin if running on Windows) and cloned the top-level OpenJDK repository that you want to build.</p>
+<ol type="1">
+<li><p><a href="#getting-the-source-code">Get the complete source code</a>:<br />
+<code>bash get_source.sh</code></p></li>
+<li><p><a href="#running-configure">Run configure</a>:<br />
+<code>bash configure</code></p>
+<p>If <code>configure</code> fails due to missing dependencies (to either the <a href="#native-compiler-toolchain-requirements">toolchain</a>, <a href="#external-library-requirements">external libraries</a> or the <a href="#boot-jdk-requirements">boot JDK</a>), most of the time it prints a suggestion on how to resolve the situation on your platform. Follow the instructions, and try running <code>bash configure</code> again.</p></li>
+<li><p><a href="#running-make">Run make</a>:<br />
+<code>make images</code></p></li>
+<li><p>Verify your newly built JDK:<br />
+<code>./build/*/images/jdk/bin/java -version</code></p></li>
+<li><p><a href="##running-tests">Run basic tests</a>:<br />
+<code>make run-test-tier1</code></p></li>
+</ol>
+<p>If any of these steps failed, or if you want to know more about build requirements or build functionality, please continue reading this document.</p>
+<h2 id="introduction">Introduction</h2>
+<p>OpenJDK is a complex software project. Building it requires a certain amount of technical expertise, a fair number of dependencies on external software, and reasonably powerful hardware.</p>
+<p>If you just want to use OpenJDK and not build it yourself, this document is not for you. See for instance <a href="http://openjdk.java.net/install">OpenJDK installation</a> for some methods of installing a prebuilt OpenJDK.</p>
+<h2 id="getting-the-source-code">Getting the Source Code</h2>
+<p>OpenJDK uses <a href="http://www.mercurial-scm.org">Mercurial</a> for source control. The source code is contained not in a single Mercurial repository, but in a tree ("forest") of interrelated repositories. You will need to check out all of the repositories to be able to build OpenJDK. To assist you in dealing with this somewhat unusual arrangement, there are multiple tools available, which are explained below.</p>
+<p>In any case, make sure you are getting the correct version. At the <a href="http://hg.openjdk.java.net/">OpenJDK Mercurial server</a> you can see a list of all available forests. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
+<p>If you are new to Mercurial, a good place to start is the <a href="http://www.mercurial-scm.org/guide">Mercurial Beginner's Guide</a>. The rest of this document assumes a working knowledge of Mercurial.</p>
+<h3 id="special-considerations">Special Considerations</h3>
+<p>For a smooth building experience, it is recommended that you follow these rules on where and how to check out the source code.</p>
<ul>
-<li><a href="#hints">Appendix A: Hints and Tips</a>
+<li><p>Do not check out the source code in a path which contains spaces. Chances are the build will not work. This is most likely to be an issue on Windows systems.</p></li>
+<li><p>Do not check out the source code in a path which has a very long name or is nested many levels deep. Chances are you will hit an OS limitation during the build.</p></li>
+<li><p>Put the source code on a local disk, not a network share. If possible, use an SSD. The build process is very disk intensive, and having slow disk access will significantly increase build times. If you need to use a network share for the source code, see below for suggestions on how to keep the build artifacts on a local disk.</p></li>
+<li><p>On Windows, extra care must be taken to make sure the <a href="#cygwin">Cygwin</a> environment is consistent. It is recommended that you follow this procedure:</p>
<ul>
-<li><a href="#faq">FAQ</a></li>
-<li><a href="#performance">Build Performance Tips</a></li>
-<li><a href="#troubleshooting">Troubleshooting</a></li>
-</ul></li>
-<li><a href="#gmake">Appendix B: GNU Make Information</a></li>
-<li><a href="#buildenvironments">Appendix C: Build Environments</a></li>
+<li><p>Create the directory that is going to contain the top directory of the OpenJDK clone by using the <code>mkdir</code> command in the Cygwin bash shell. That is, do <em>not</em> create it using Windows Explorer. This will ensure that it will have proper Cygwin attributes, and that it's children will inherit those attributes.</p></li>
+<li><p>Do not put the OpenJDK clone in a path under your Cygwin home directory. This is especially important if your user name contains spaces and/or mixed upper and lower case letters.</p></li>
+<li><p>Clone the OpenJDK repository using the Cygwin command line <code>hg</code> client as instructed in this document. That is, do <em>not</em> use another Mercurial client such as TortoiseHg.</p></li>
+</ul>
+<p>Failure to follow this procedure might result in hard-to-debug build problems.</p></li>
+</ul>
+<h3 id="using-get_source.sh">Using get_source.sh</h3>
+<p>The simplest way to get the entire forest is probably to clone the top-level repository and then run the <code>get_source.sh</code> script, like this:</p>
+<pre><code>hg clone http://hg.openjdk.java.net/jdk9/jdk9
+cd jdk9
+bash get_source.sh</code></pre>
+<p>The first time this is run, it will clone all the sub-repositories. Any subsequent execution of the script will update all sub-repositories to the latest revision.</p>
+<h3 id="using-hgforest.sh">Using hgforest.sh</h3>
+<p>The <code>hgforest.sh</code> script is more expressive than <code>get_source.sh</code>. It takes any number of arguments, and runs <code>hg</code> with those arguments on each sub-repository in the forest. The <code>get_source.sh</code> script is basically a simple wrapper that runs either <code>hgforest.sh clone</code> or <code>hgforest.sh pull -u</code>.</p>
+<ul>
+<li><p>Cloning the forest:</p>
+<pre><code>hg clone http://hg.openjdk.java.net/jdk9/jdk9
+cd jdk9
+bash common/bin/hgforest.sh clone</code></pre></li>
+<li><p>Pulling and updating the forest:</p>
+<pre><code>bash common/bin/hgforest.sh pull -u</code></pre></li>
+<li><p>Merging over the entire forest:</p>
+<pre><code>bash common/bin/hgforest.sh merge</code></pre></li>
</ul>
-<hr />
-<h2 id="use-of-mercurial">Use of Mercurial</h2>
-<p>The OpenJDK sources are maintained with the revision control system <a href="http://mercurial.selenic.com/wiki/Mercurial">Mercurial</a>. If you are new to Mercurial, please see the <a href="http://mercurial.selenic.com/wiki/BeginnersGuides">Beginner Guides</a> or refer to the <a href="http://hgbook.red-bean.com/">Mercurial Book</a>. The first few chapters of the book provide an excellent overview of Mercurial, what it is and how it works.</p>
-<p>For using Mercurial with the OpenJDK refer to the <a href="http://openjdk.java.net/guide/repositories.html#installConfig">Developer Guide: Installing and Configuring Mercurial</a> section for more information.</p>
-<h3 id="getting-the-source">Getting the Source</h3>
-<p>To get the entire set of OpenJDK Mercurial repositories use the script <code>get_source.sh</code> located in the root repository:</p>
-<pre><code> hg clone http://hg.openjdk.java.net/jdk9/jdk9 YourOpenJDK
- cd YourOpenJDK
- bash ./get_source.sh</code></pre>
-<p>Once you have all the repositories, keep in mind that each repository is its own independent repository. You can also re-run <code>./get_source.sh</code> anytime to pull over all the latest changesets in all the repositories. This set of nested repositories has been given the term "forest" and there are various ways to apply the same <code>hg</code> command to each of the repositories. For example, the script <code>make/scripts/hgforest.sh</code> can be used to repeat the same <code>hg</code> command on every repository, e.g.</p>
-<pre><code> cd YourOpenJDK
- bash ./make/scripts/hgforest.sh status</code></pre>
-<h3 id="repositories">Repositories</h3>
-<p>The set of repositories and what they contain:</p>
+<h3 id="using-the-trees-extension">Using the Trees Extension</h3>
+<p>The trees extension is a Mercurial add-on that helps you deal with the forest. More information is available on the <a href="http://openjdk.java.net/projects/code-tools/trees">Code Tools trees page</a>.</p>
+<h4 id="installing-the-extension">Installing the Extension</h4>
+<p>Install the extension by cloning <code>http://hg.openjdk.java.net/code-tools/trees</code> and updating your <code>.hgrc</code> file. Here's one way to do this:</p>
+<pre><code>cd ~
+mkdir hg-ext
+cd hg-ext
+hg clone http://hg.openjdk.java.net/code-tools/trees
+cat << EOT >> ~/.hgrc
+[extensions]
+trees=~/hg-ext/trees/trees.py
+EOT</code></pre>
+<h4 id="initializing-the-tree">Initializing the Tree</h4>
+<p>The trees extension needs to know the structure of the forest. If you have already cloned the entire forest using another method, you can initialize the forest like this:</p>
+<pre><code>hg tconf --set --walk --depth</code></pre>
+<p>Or you can clone the entire forest at once, if you substitute <code>clone</code> with <code>tclone</code> when cloning the top-level repository, e.g. like this:</p>
+<pre><code>hg tclone http://hg.openjdk.java.net/jdk9/jdk9</code></pre>
+<p>In this case, the forest will be properly initialized from the start.</p>
+<h4 id="other-operations">Other Operations</h4>
+<p>The trees extensions supplement many common operations with a trees version by prefixing a <code>t</code> to the normal Mercurial command, e.g. <code>tcommit</code>, <code>tstatus</code> or <code>tmerge</code>. For instance, to update the entire forest:</p>
+<pre><code>hg tpull -u</code></pre>
+<h2 id="build-hardware-requirements">Build Hardware Requirements</h2>
+<p>OpenJDK is a massive project, and require machines ranging from decent to powerful to be able to build in a reasonable amount of time, or to be able to complete a build at all.</p>
+<p>We <em>strongly</em> recommend usage of an SSD disk for the build, since disk speed is one of the limiting factors for build performance.</p>
+<h3 id="building-on-x86">Building on x86</h3>
+<p>At a minimum, a machine with 2-4 cores is advisable, as well as 2-4 GB of RAM. (The more cores to use, the more memory you need.) At least 6 GB of free disk space is required (8 GB minimum for building on Solaris).</p>
+<p>Even for 32-bit builds, it is recommended to use a 64-bit build machine, and instead create a 32-bit target using <code>--with-target-bits=32</code>.</p>
+<h3 id="building-on-sparc">Building on sparc</h3>
+<p>At a minimum, a machine with 4 cores is advisable, as well as 4 GB of RAM. (The more cores to use, the more memory you need.) At least 8 GB of free disk space is required.</p>
+<h3 id="building-on-armaarch64">Building on arm/aarch64</h3>
+<p>This is not recommended. Instead, see the section on <a href="#cross-compiling">Cross-compiling</a>.</p>
+<h2 id="operating-system-requirements">Operating System Requirements</h2>
+<p>The mainline OpenJDK project supports Linux, Solaris, macOS, AIX and Windows. Support for other operating system, e.g. BSD, exists in separate "port" projects.</p>
+<p>In general, OpenJDK can be built on a wide range of versions of these operating systems, but the further you deviate from what is tested on a daily basis, the more likely you are to run into problems.</p>
+<p>This table lists the OS versions used by Oracle when building JDK 9. Such information is always subject to change, but this table is up to date at the time of writing.</p>
+<table>
+<thead>
+<tr class="header">
+<th style="text-align: left;">Operating system</th>
+<th style="text-align: left;">Vendor/version used</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td style="text-align: left;">Linux</td>
+<td style="text-align: left;">Oracle Enterprise Linux 6.4 / 7.1 (using kernel 3.8.13)</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">Solaris</td>
+<td style="text-align: left;">Solaris 11.1 SRU 21.4.1 / 11.2 SRU 5.5</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">macOS</td>
+<td style="text-align: left;">Mac OS X 10.9 (Mavericks) / 10.10 (Yosemite)</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">Windows</td>
+<td style="text-align: left;">Windows Server 2012 R2</td>
+</tr>
+</tbody>
+</table>
+<p>The double version numbers for Linux, Solaris and macOS is due to the hybrid model used at Oracle, where header files and external libraries from an older version is used when building on a more modern version of the OS.</p>
+<p>The Build Group has a wiki page with <a href="https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms">Supported Build Platforms</a>. From time to time, this is updated by the community to list successes or failures of building on different platforms.</p>
+<h3 id="windows">Windows</h3>
+<p>Windows XP is not a supported platform, but all newer Windows should be able to build OpenJDK.</p>
+<p>On Windows, it is important that you pay attention to the instructions in the <a href="#special-considerations">Special Considerations</a>.</p>
+<p>Windows is the only non-POSIX OS supported by OpenJDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. For OpenJDK 9, the only supported such layer is Cygwin. (Msys is no longer supported due to a too old bash; msys2 and the new Windows Subsystem for Linux (WSL) would likely be possible to support in a future version but that would require a community effort to implement.)</p>
+<p>Internally in the build system, all paths are represented as Unix-style paths, e.g. <code>/cygdrive/c/hg/jdk9/Makefile</code> rather than <code>C:\hg\jdk9\Makefile</code>. This rule also applies to input to the build system, e.g. in arguments to <code>configure</code>. So, use <code>--with-freetype=/cygdrive/c/freetype</code> rather than <code>--with-freetype=c:\freetype</code>. For details on this conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
+<h4 id="cygwin">Cygwin</h4>
+<p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment is thus required for building OpenJDK on Windows. If you have a 64-bit OS, we strongly recommend using the 64-bit version of Cygwin.</p>
+<p><strong>Note:</strong> Cygwin has a model of continuously updating all packages without any easy way to install or revert to a specific version of a package. This means that whenever you add or update a package in Cygwin, you might (inadvertently) update tools that are used by the OpenJDK build process, and that can cause unexpected build problems.</p>
+<p>OpenJDK requires GNU Make 4.0 or greater on Windows. This is usually not a problem, since Cygwin currently only distributes GNU Make at a version above 4.0.</p>
+<p>Apart from the basic Cygwin installation, the following packages must also be installed:</p>
<ul>
-<li><strong>. (root)</strong> contains common configure and makefile logic</li>
-<li><strong>hotspot</strong> contains source code and make files for building the OpenJDK Hotspot Virtual Machine</li>
-<li><strong>langtools</strong> contains source code for the OpenJDK javac and language tools</li>
-<li><strong>jdk</strong> contains source code and make files for building the OpenJDK runtime libraries and misc files</li>
-<li><strong>jaxp</strong> contains source code for the OpenJDK JAXP functionality</li>
-<li><strong>jaxws</strong> contains source code for the OpenJDK JAX-WS functionality</li>
-<li><strong>corba</strong> contains source code for the OpenJDK Corba functionality</li>
-<li><strong>nashorn</strong> contains source code for the OpenJDK JavaScript implementation</li>
-</ul>
-<h3 id="repository-source-guidelines">Repository Source Guidelines</h3>
-<p>There are some very basic guidelines:</p>
-<ul>
-<li>Use of whitespace in source files (.java, .c, .h, .cpp, and .hpp files) is restricted. No TABs, no trailing whitespace on lines, and files should not terminate in more than one blank line.</li>
-<li>Files with execute permissions should not be added to the source repositories.</li>
-<li>All generated files need to be kept isolated from the files maintained or managed by the source control system. The standard area for generated files is the top level <code>build/</code> directory.</li>
-<li>The default build process should be to build the product and nothing else, in one form, e.g. a product (optimized), debug (non-optimized, -g plus assert logic), or fastdebug (optimized, -g plus assert logic).</li>
-<li>The <code>.hgignore</code> file in each repository must exist and should include <code>^build/</code>, <code>^dist/</code> and optionally any <code>nbproject/private</code> directories. <strong>It should NEVER</strong> include anything in the <code>src/</code> or <code>test/</code> or any managed directory area of a repository.</li>
-<li>Directory names and file names should never contain blanks or non-printing characters.</li>
-<li>Generated source or binary files should NEVER be added to the repository (that includes <code>javah</code> output). There are some exceptions to this rule, in particular with some of the generated configure scripts.</li>
-<li>Files not needed for typical building or testing of the repository should not be added to the repository.</li>
+<li><code>make</code></li>
+<li><code>zip</code></li>
+<li><code>unzip</code></li>
</ul>
-<hr />
-<h2 id="building">Building</h2>
-<p>The very first step in building the OpenJDK is making sure the system itself has everything it needs to do OpenJDK builds. Once a system is setup, it generally doesn't need to be done again.</p>
-<p>Building the OpenJDK is now done with running a <code>configure</code> script which will try and find and verify you have everything you need, followed by running <code>make</code>, e.g.</p>
-<blockquote>
-<p><strong><code>bash ./configure</code></strong><br />
-<strong><code>make all</code></strong></p>
-</blockquote>
-<p>Where possible the <code>configure</code> script will attempt to located the various components in the default locations or via component specific variable settings. When the normal defaults fail or components cannot be found, additional <code>configure</code> options may be necessary to help <code>configure</code> find the necessary tools for the build, or you may need to re-visit the setup of your system due to missing software packages.</p>
-<p><strong>NOTE:</strong> The <code>configure</code> script file does not have execute permissions and will need to be explicitly run with <code>bash</code>, see the source guidelines.</p>
-<hr />
-<h3 id="system-setup">System Setup</h3>
-<p>Before even attempting to use a system to build the OpenJDK there are some very basic system setups needed. For all systems:</p>
-<ul>
-<li>Be sure the GNU make utility is version 3.81 (4.0 on windows) or newer, e.g. run "<code>make -version</code>"</li>
-</ul>
-<p><a name="bootjdk"></a> * Install a Bootstrap JDK. All OpenJDK builds require access to a previously released JDK called the <em>bootstrap JDK</em> or <em>boot JDK.</em> The general rule is that the bootstrap JDK must be an instance of the previous major release of the JDK. In addition, there may be a requirement to use a release at or beyond a particular update level.</p>
-<p><strong><em>Building JDK 9 requires JDK 8. JDK 9 developers should not use JDK 9 as the boot JDK, to ensure that JDK 9 dependencies are not introduced into the parts of the system that are built with JDK 8.</em></strong></p>
-<p>The JDK 8 binaries can be downloaded from Oracle's <a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">JDK 8 download site</a>. For build performance reasons it is very important that this bootstrap JDK be made available on the local disk of the machine doing the build. You should add its <code>bin</code> directory to the <code>PATH</code> environment variable. If <code>configure</code> has any issues finding this JDK, you may need to use the <code>configure</code> option <code>--with-boot-jdk</code>.</p>
-<ul>
-<li>Ensure that GNU make, the Bootstrap JDK, and the compilers are all in your PATH environment variable.</li>
-</ul>
-<p>And for specific systems:</p>
-<ul>
-<li><strong>Linux</strong></li>
-</ul>
-<p>Install all the software development packages needed including <a href="#alsa">alsa</a>, <a href="#freetype">freetype</a>, <a href="#cups">cups</a>, and <a href="#xrender">xrender</a>. See <a href="#SDBE">specific system packages</a>.</p>
-<ul>
-<li><strong>Solaris</strong></li>
-</ul>
-<p>Install all the software development packages needed including <a href="#studio">Studio Compilers</a>, <a href="#freetype">freetype</a>, <a href="#cups">cups</a>, and <a href="#xrender">xrender</a>. See <a href="#SDBE">specific system packages</a>.</p>
-<ul>
-<li><p><strong>Windows</strong></p></li>
-<li>Install one of <a href="#cygwin">CYGWIN</a> or <a href="#msys">MinGW/MSYS</a></li>
-<li><p>Install <a href="#vs2013">Visual Studio 2013</a></p></li>
-<li><p><strong>Mac OS X</strong></p></li>
-</ul>
-<p>Install <a href="https://developer.apple.com/xcode/">XCode 6.3</a></p>
-<h4 id="linux">Linux</h4>
-<p>With Linux, try and favor the system packages over building your own or getting packages from other areas. Most Linux builds should be possible with the system's available packages.</p>
-<p>Note that some Linux systems have a habit of pre-populating your environment variables for you, for example <code>JAVA_HOME</code> might get pre-defined for you to refer to the JDK installed on your Linux system. You will need to unset <code>JAVA_HOME</code>. It's a good idea to run <code>env</code> and verify the environment variables you are getting from the default system settings make sense for building the OpenJDK.</p>
-<h4 id="solaris">Solaris</h4>
-<h5 id="studio-compilers">Studio Compilers</h5>
-<p>At a minimum, the <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm">Studio 12 Update 4 Compilers</a> (containing version 5.13 of the C and C++ compilers) is required, including specific patches.</p>
+<p>Often, you can install these packages using the following command line:</p>
+<pre><code><path to Cygwin setup>/setup-x86_64 -q -P make -P unzip -P zip</code></pre>
+<p>Unfortunately, Cygwin can be unreliable in certain circumstances. If you experience build tool crashes or strange issues when building on Windows, please check the Cygwin FAQ on the <a href="https://cygwin.com/faq/faq.html#faq.using.bloda">"BLODA" list</a> and the section on <a href="https://cygwin.com/faq/faq.html#faq.using.fixing-fork-failures">fork() failures</a>.</p>
+<h3 id="solaris">Solaris</h3>
+<p>See <code>make/devkit/solaris11.1-package-list.txt</code> for a list of recommended packages to install when building on Solaris. The versions specified in this list is the versions used by the daily builds at Oracle, and is likely to work properly.</p>
+<p>Older versions of Solaris shipped a broken version of <code>objcopy</code>. At least version 2.21.1 is needed, which is provided by Solaris 11 Update 1. Objcopy is needed if you want to have external debug symbols. Please make sure you are using at least version 2.21.1 of objcopy, or that you disable external debug symbols.</p>
+<h3 id="macos">macOS</h3>
+<p>Apple is using a quite aggressive scheme of pushing OS updates, and coupling these updates with required updates of Xcode. Unfortunately, this makes it difficult for a project like OpenJDK to keep pace with a continuously updated machine running macOS. See the section on <a href="#apple-xcode">Apple Xcode</a> on some strategies to deal with this.</p>
+<p>It is recommended that you use at least Mac OS X 10.9 (Mavericks). At the time of writing, OpenJDK has been successfully compiled on macOS versions up to 10.12.5 (Sierra), using XCode 8.3.2 and <code>--disable-warnings-as-errors</code>.</p>
+<p>The standard macOS environment contains the basic tooling needed to build, but for external libraries a package manager is recommended. OpenJDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but feel free to use whatever manager you want (or none).</p>
+<h3 id="linux">Linux</h3>
+<p>It is often not much problem to build OpenJDK on Linux. The only general advice is to try to use the compilers, external libraries and header files as provided by your distribution.</p>
+<p>The basic tooling is provided as part of the core operating system, but you will most likely need to install developer packages.</p>
+<p>For apt-based distributions (Debian, Ubuntu, etc), try this:</p>
+<pre><code>sudo apt-get install build-essential</code></pre>
+<p>For rpm-based distributions (Fedora, Red Hat, etc), try this:</p>
+<pre><code>sudo yum groupinstall "Development Tools"</code></pre>
+<h3 id="aix">AIX</h3>
+<p>The regular builds by SAP is using AIX version 7.1, but AIX 5.3 is also supported. See the <a href="http://cr.openjdk.java.net/~simonis/ppc-aix-port">OpenJDK PowerPC Port Status Page</a> for details.</p>
+<h2 id="native-compiler-toolchain-requirements">Native Compiler (Toolchain) Requirements</h2>
+<p>Large portions of OpenJDK consists of native code, that needs to be compiled to be able to run on the target platform. In theory, toolchain and operating system should be independent factors, but in practice there's more or less a one-to-one correlation between target operating system and toolchain.</p>
+<table>
+<thead>
+<tr class="header">
+<th style="text-align: left;">Operating system</th>
+<th style="text-align: left;">Supported toolchain</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td style="text-align: left;">Linux</td>
+<td style="text-align: left;">gcc, clang</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">macOS</td>
+<td style="text-align: left;">Apple Xcode (using clang)</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">Solaris</td>
+<td style="text-align: left;">Oracle Solaris Studio</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">AIX</td>
+<td style="text-align: left;">IBM XL C/C++</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">Windows</td>
+<td style="text-align: left;">Microsoft Visual Studio</td>
+</tr>
+</tbody>
+</table>
+<p>Please see the individual sections on the toolchains for version recommendations. As a reference, these versions of the toolchains are used, at the time of writing, by Oracle for the daily builds of OpenJDK. It should be possible to compile OpenJDK with both older and newer versions, but the closer you stay to this list, the more likely you are to compile successfully without issues.</p>
+<table>
+<thead>
+<tr class="header">
+<th style="text-align: left;">Operating system</th>
+<th style="text-align: left;">Toolchain version</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td style="text-align: left;">Linux</td>
+<td style="text-align: left;">gcc 4.9.2</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">macOS</td>
+<td style="text-align: left;">Apple Xcode 6.3 (using clang 6.1.0)</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">Solaris</td>
+<td style="text-align: left;">Oracle Solaris Studio 12.4 (with compiler version 5.13)</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">Windows</td>
+<td style="text-align: left;">Microsoft Visual Studio 2013 update 4</td>
+</tr>
+</tbody>
+</table>
+<h3 id="gcc">gcc</h3>
+<p>The minimum accepted version of gcc is 4.3. Older versions will not be accepted by <code>configure</code>.</p>
+<p>However, gcc 4.3 is quite old and OpenJDK is not regularly tested on this version, so it is recommended to use a more modern gcc.</p>
+<p>OpenJDK 9 includes patches that should allow gcc 6 to compile, but this should be considered experimental.</p>
+<p>In general, any version between these two should be usable.</p>
+<h3 id="clang">clang</h3>
+<p>The minimum accepted version of clang is 3.2. Older versions will not be accepted by <code>configure</code>.</p>
+<p>To use clang instead of gcc on Linux, use <code>--with-toolchain-type=clang</code>.</p>
+<h3 id="apple-xcode">Apple Xcode</h3>
+<p>The oldest supported version of Xcode is 5.</p>
+<p>You will need the Xcode command lines developers tools to be able to build OpenJDK. (Actually, <em>only</em> the command lines tools are needed, not the IDE.) The simplest way to install these is to run:</p>
+<pre><code>xcode-select --install</code></pre>
+<p>It is advisable to keep an older version of Xcode for building OpenJDK when updating Xcode. This <a href="http://iosdevelopertips.com/xcode/install-multiple-versions-of-xcode.html">blog page</a> has good suggestions on managing multiple Xcode versions. To use a specific version of Xcode, use <code>xcode-select -s</code> before running <code>configure</code>, or use <code>--with-toolchain-path</code> to point to the version of Xcode to use, e.g. <code>configure --with-toolchain-path=/Applications/Xcode5.app/Contents/Developer/usr/bin</code></p>
+<p>If you have recently (inadvertently) updated your OS and/or Xcode version, and OpenJDK can no longer be built, please see the section on <a href="#problems-with-the-build-environment">Problems with the Build Environment</a>, and <a href="#getting-help">Getting Help</a> to find out if there are any recent, non-merged patches available for this update.</p>
+<h3 id="oracle-solaris-studio">Oracle Solaris Studio</h3>
+<p>The minimum accepted version of the Solaris Studio compilers is 5.13 (corresponding to Solaris Studio 12.4). Older versions will not be accepted by configure.</p>
<p>The Solaris Studio installation should contain at least these packages:</p>
<table>
<thead>
@@ -198,555 +394,567 @@
</tr>
</tbody>
</table>
-<p>In particular backend 12.4-1.0.6.0 contains a critical patch for the sparc version.</p>
-<p>Place the <code>bin</code> directory in <code>PATH</code>.</p>
-<p>The Oracle Solaris Studio Express compilers at: <a href="http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index-jsp-142582.html">Oracle Solaris Studio Express Download site</a> are also an option, although these compilers have not been extensively used yet.</p>
-<h4 id="windows">Windows</h4>
-<h5 id="windows-unix-toolkit">Windows Unix Toolkit</h5>
-<p>Building on Windows requires a Unix-like environment, notably a Unix-like shell. There are several such environments available of which <a href="http://www.cygwin.com/">Cygwin</a> and <a href="http://www.mingw.org/wiki/MSYS">MinGW/MSYS</a> are currently supported for the OpenJDK build. One of the differences of these systems from standard Windows tools is the way they handle Windows path names, particularly path names which contain spaces, backslashes as path separators and possibly drive letters. Depending on the use case and the specifics of each environment these path problems can be solved by a combination of quoting whole paths, translating backslashes to forward slashes, escaping backslashes with additional backslashes and translating the path names to their <a href="http://en.wikipedia.org/wiki/8.3_filename">"8.3" version</a>.</p>
-<h6 id="cygwin">CYGWIN</h6>
-<p>CYGWIN is an open source, Linux-like environment which tries to emulate a complete POSIX layer on Windows. It tries to be smart about path names and can usually handle all kinds of paths if they are correctly quoted or escaped although internally it maps drive letters <code><drive>:</code> to a virtual directory <code>/cygdrive/<drive></code>.</p>
-<p>You can always use the <code>cygpath</code> utility to map pathnames with spaces or the backslash character into the <code>C:/</code> style of pathname (called 'mixed'), e.g. <code>cygpath -s -m "<path>"</code>.</p>
-<p>Note that the use of CYGWIN creates a unique problem with regards to setting <a href="#path"><code>PATH</code></a>. Normally on Windows the <code>PATH</code> variable contains directories separated with the ";" character (Solaris and Linux use ":"). With CYGWIN, it uses ":", but that means that paths like "C:/path" cannot be placed in the CYGWIN version of <code>PATH</code> and instead CYGWIN uses something like <code>/cygdrive/c/path</code> which CYGWIN understands, but only CYGWIN understands.</p>
-<p>The OpenJDK build requires CYGWIN version 1.7.16 or newer. Information about CYGWIN can be obtained from the CYGWIN website at <a href="http://www.cygwin.com">www.cygwin.com</a>.</p>
-<p>By default CYGWIN doesn't install all the tools required for building the OpenJDK. Along with the default installation, you need to install the following tools.</p>
-<table>
-<thead>
-<tr class="header">
-<th style="text-align: left;">Binary Name</th>
-<th style="text-align: left;">Category</th>
-<th style="text-align: left;">Package</th>
-<th style="text-align: left;">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td style="text-align: left;">ar.exe</td>
-<td style="text-align: left;">Devel</td>
-<td style="text-align: left;">binutils</td>
-<td style="text-align: left;">The GNU assembler, linker and binary utilities</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">make.exe</td>
-<td style="text-align: left;">Devel</td>
-<td style="text-align: left;">make</td>
-<td style="text-align: left;">The GNU version of the 'make' utility built for CYGWIN</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">m4.exe</td>
-<td style="text-align: left;">Interpreters</td>
-<td style="text-align: left;">m4</td>
-<td style="text-align: left;">GNU implementation of the traditional Unix macro processor</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">cpio.exe</td>
-<td style="text-align: left;">Utils</td>
-<td style="text-align: left;">cpio</td>
-<td style="text-align: left;">A program to manage archives of files</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">gawk.exe</td>
-<td style="text-align: left;">Utils</td>
-<td style="text-align: left;">awk</td>
-<td style="text-align: left;">Pattern-directed scanning and processing language</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">file.exe</td>
-<td style="text-align: left;">Utils</td>
-<td style="text-align: left;">file</td>
-<td style="text-align: left;">Determines file type using 'magic' numbers</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">zip.exe</td>
-<td style="text-align: left;">Archive</td>
-<td style="text-align: left;">zip</td>
-<td style="text-align: left;">Package and compress (archive) files</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">unzip.exe</td>
-<td style="text-align: left;">Archive</td>
-<td style="text-align: left;">unzip</td>
-<td style="text-align: left;">Extract compressed files in a ZIP archive</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">free.exe</td>
-<td style="text-align: left;">System</td>
-<td style="text-align: left;">procps</td>
-<td style="text-align: left;">Display amount of free and used memory in the system</td>
-</tr>
-</tbody>
-</table>
-<p>Note that the CYGWIN software can conflict with other non-CYGWIN software on your Windows system. CYGWIN provides a <a href="http://cygwin.com/faq/faq.using.html">FAQ</a> for known issues and problems, of particular interest is the section on <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda">BLODA (applications that interfere with CYGWIN)</a>.</p>
-<h6 id="mingwmsys">MinGW/MSYS</h6>
-<p>MinGW ("Minimalist GNU for Windows") is a collection of free Windows specific header files and import libraries combined with GNU toolsets that allow one to produce native Windows programs that do not rely on any 3rd-party C runtime DLLs. MSYS is a supplement to MinGW which allows building applications and programs which rely on traditional UNIX tools to be present. Among others this includes tools like <code>bash</code> and <code>make</code>. See <a href="http://www.mingw.org/wiki/MSYS">MinGW/MSYS</a> for more information.</p>
-<p>Like Cygwin, MinGW/MSYS can handle different types of path formats. They are internally converted to paths with forward slashes and drive letters <code><drive>:</code> replaced by a virtual directory <code>/<drive></code>. Additionally, MSYS automatically detects binaries compiled for the MSYS environment and feeds them with the internal, Unix-style path names. If native Windows applications are called from within MSYS programs their path arguments are automatically converted back to Windows style path names with drive letters and backslashes as path separators. This may cause problems for Windows applications which use forward slashes as parameter separator (e.g. <code>cl /nologo /I</code>) because MSYS may wrongly <a href="http://mingw.org/wiki/Posix_path_conversion">replace such parameters by drive letters</a>.</p>
-<p>In addition to the tools which will be installed by default, you have to manually install the <code>msys-zip</code> and <code>msys-unzip</code> packages. This can be easily done with the MinGW command line installer:</p>
-<pre><code> mingw-get.exe install msys-zip
- mingw-get.exe install msys-unzip</code></pre>
-<h5 id="visual-studio-2013-compilers">Visual Studio 2013 Compilers</h5>
-<p>The 32-bit and 64-bit OpenJDK Windows build requires Microsoft Visual Studio C++ 2013 (VS2013) Professional Edition or Express compiler. The compiler and other tools are expected to reside in the location defined by the variable <code>VS120COMNTOOLS</code> which is set by the Microsoft Visual Studio installer.</p>
-<p>Only the C++ part of VS2013 is needed. Try to let the installation go to the default install directory. Always reboot your system after installing VS2013. The system environment variable VS120COMNTOOLS should be set in your environment.</p>
-<p>Make sure that TMP and TEMP are also set in the environment and refer to Windows paths that exist, like <code>C:\temp</code>, not <code>/tmp</code>, not <code>/cygdrive/c/temp</code>, and not <code>C:/temp</code>. <code>C:\temp</code> is just an example, it is assumed that this area is private to the user, so by default after installs you should see a unique user path in these variables.</p>
-<h4 id="mac-os-x">Mac OS X</h4>
-<p>Make sure you get the right XCode version.</p>
-<hr />
-<h3 id="configure">Configure</h3>
-<p>The basic invocation of the <code>configure</code> script looks like:</p>
-<blockquote>
-<p><strong><code>bash ./configure [options]</code></strong></p>
-</blockquote>
-<p>This will create an output directory containing the "configuration" and setup an area for the build result. This directory typically looks like:</p>
-<blockquote>
-<p><strong><code>build/linux-x64-normal-server-release</code></strong></p>
-</blockquote>
-<p><code>configure</code> will try to figure out what system you are running on and where all necessary build components are. If you have all prerequisites for building installed, it should find everything. If it fails to detect any component automatically, it will exit and inform you about the problem. When this happens, read more below in <a href="#configureoptions">the <code>configure</code> options</a>.</p>
-<p>Some examples:</p>
-<blockquote>
-<p><strong>Windows 32bit build with freetype specified:</strong><br />
-<code>bash ./configure --with-freetype=/cygdrive/c/freetype-i586 --with-target-bits=32</code></p>
-</blockquote>
-<blockquote>
-<p><strong>Debug 64bit Build:</strong><br />
-<code>bash ./configure --enable-debug --with-target-bits=64</code></p>
-</blockquote>
-<h4 id="configure-options">Configure Options</h4>
-<p>Complete details on all the OpenJDK <code>configure</code> options can be seen with:</p>
-<blockquote>
-<p><strong><code>bash ./configure --help=short</code></strong></p>
-</blockquote>
-<p>Use <code>-help</code> to see all the <code>configure</code> options available. You can generate any number of different configurations, e.g. debug, release, 32, 64, etc.</p>
-<p>Some of the more commonly used <code>configure</code> options are:</p>
-<blockquote>
-<p><strong><code>--enable-debug</code></strong><br />
-set the debug level to fastdebug (this is a shorthand for <code>--with-debug-level=fastdebug</code>)</p>
-</blockquote>
-<p><a name="alsa"></a></p>
-<blockquote>
-<p><strong><code>--with-alsa=</code></strong><em>path</em><br />
-select the location of the Advanced Linux Sound Architecture (ALSA)</p>
-</blockquote>
-<blockquote>
-<p>Version 0.9.1 or newer of the ALSA files are required for building the OpenJDK on Linux. These Linux files are usually available from an "alsa" of "libasound" development package, and it's highly recommended that you try and use the package provided by the particular version of Linux that you are using.</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-boot-jdk=</code></strong><em>path</em><br />
-select the <a href="#bootjdk">Bootstrap JDK</a></p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-boot-jdk-jvmargs=</code></strong>"<em>args</em>"<br />
-provide the JVM options to be used to run the <a href="#bootjdk">Bootstrap JDK</a></p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-cacerts=</code></strong><em>path</em><br />
-select the path to the cacerts file.</p>
-</blockquote>
-<blockquote>
-<p>See <a href="http://en.wikipedia.org/wiki/Certificate_Authority">Certificate Authority on Wikipedia</a> for a better understanding of the Certificate Authority (CA). A certificates file named "cacerts" represents a system-wide keystore with CA certificates. In JDK and JRE binary bundles, the "cacerts" file contains root CA certificates from several public CAs (e.g., VeriSign, Thawte, and Baltimore). The source contain a cacerts file without CA root certificates. Formal JDK builders will need to secure permission from each public CA and include the certificates into their own custom cacerts file. Failure to provide a populated cacerts file will result in verification errors of a certificate chain during runtime. By default an empty cacerts file is provided and that should be fine for most JDK developers.</p>
-</blockquote>
-<p><a name="cups"></a></p>
-<blockquote>
-<p><strong><code>--with-cups=</code></strong><em>path</em><br />
-select the CUPS install location</p>
-</blockquote>
-<blockquote>
-<p>The Common UNIX Printing System (CUPS) Headers are required for building the OpenJDK on Solaris and Linux. The Solaris header files can be obtained by installing the package <strong>print/cups</strong>.</p>
-</blockquote>
-<blockquote>
-<p>The CUPS header files can always be downloaded from <a href="http://www.cups.org">www.cups.org</a>.</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-cups-include=</code></strong><em>path</em><br />
-select the CUPS include directory location</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-debug-level=</code></strong><em>level</em><br />
-select the debug information level of release, fastdebug, or slowdebug</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-dev-kit=</code></strong><em>path</em><br />
-select location of the compiler install or developer install location</p>
-</blockquote>
-<p><a name="freetype"></a></p>
-<blockquote>
-<p><strong><code>--with-freetype=</code></strong><em>path</em><br />
-select the freetype files to use.</p>
-</blockquote>
-<blockquote>
-<p>Expecting the freetype libraries under <code>lib/</code> and the headers under <code>include/</code>.</p>
-</blockquote>
-<blockquote>
-<p>Version 2.3 or newer of FreeType is required. On Unix systems required files can be available as part of your distribution (while you still may need to upgrade them). Note that you need development version of package that includes both the FreeType library and header files.</p>
-</blockquote>
-<blockquote>
-<p>You can always download latest FreeType version from the <a href="http://www.freetype.org">FreeType website</a>. Building the freetype 2 libraries from scratch is also possible, however on Windows refer to the <a href="http://freetype.freedesktop.org/wiki/FreeType_DLL">Windows FreeType DLL build instructions</a>.</p>
-</blockquote>
-<blockquote>
-<p>Note that by default FreeType is built with byte code hinting support disabled due to licensing restrictions. In this case, text appearance and metrics are expected to differ from Sun's official JDK build. See the <a href="http://freetype.sourceforge.net/freetype2">SourceForge FreeType2 Home Page</a> for more information.</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-import-hotspot=</code></strong><em>path</em><br />
-select the location to find hotspot binaries from a previous build to avoid building hotspot</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-target-bits=</code></strong><em>arg</em><br />
-select 32 or 64 bit build</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-jvm-variants=</code></strong><em>variants</em><br />
-select the JVM variants to build from, comma separated list that can include: server, client, kernel, zero and zeroshark</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-memory-size=</code></strong><em>size</em><br />
-select the RAM size that GNU make will think this system has</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-msvcr-dll=</code></strong><em>path</em><br />
-select the <code>msvcr100.dll</code> file to include in the Windows builds (C/C++ runtime library for Visual Studio).</p>
-</blockquote>
-<blockquote>
-<p>This is usually picked up automatically from the redist directories of Visual Studio 2013.</p>
-</blockquote>
-<blockquote>
-<p><strong><code>--with-num-cores=</code></strong><em>cores</em><br />
-select the number of cores to use (processor count or CPU count)</p>
-</blockquote>
-<p><a name="xrender"></a></p>
-<blockquote>
-<p><strong><code>--with-x=</code></strong><em>path</em><br />
-select the location of the X11 and xrender files.</p>
-</blockquote>
-<blockquote>
-<p>The XRender Extension Headers are required for building the OpenJDK on Solaris and Linux. The Linux header files are usually available from a "Xrender" development package, it's recommended that you try and use the package provided by the particular distribution of Linux that you are using. The Solaris XRender header files is included with the other X11 header files in the package <strong>SFWxwinc</strong> on new enough versions of Solaris and will be installed in <code>/usr/X11/include/X11/extensions/Xrender.h</code> or <code>/usr/openwin/share/include/X11/extensions/Xrender.h</code></p>
-</blockquote>
-<hr />
-<h3 id="make">Make</h3>
-<p>The basic invocation of the <code>make</code> utility looks like:</p>
-<blockquote>
-<p><strong><code>make all</code></strong></p>
-</blockquote>
-<p>This will start the build to the output directory containing the "configuration" that was created by the <code>configure</code> script. Run <code>make help</code> for more information on the available targets.</p>
-<p>There are some of the make targets that are of general interest:</p>
-<blockquote>
-<p><em>empty</em><br />
-build everything but no images</p>
-</blockquote>
-<blockquote>
-<p><strong><code>all</code></strong><br />
-build everything including images</p>
-</blockquote>
-<blockquote>
-<p><strong><code>all-conf</code></strong><br />
-build all configurations</p>
-</blockquote>
-<blockquote>
-<p><strong><code>images</code></strong><br />
-create complete j2sdk and j2re images</p>
-</blockquote>
-<blockquote>
-<p><strong><code>install</code></strong><br />
-install the generated images locally, typically in <code>/usr/local</code></p>
-</blockquote>
-<blockquote>
-<p><strong><code>clean</code></strong><br />
-remove all files generated by make, but not those generated by <code>configure</code></p>
-</blockquote>
-<blockquote>
-<p><strong><code>dist-clean</code></strong><br />
-remove all files generated by both and <code>configure</code> (basically killing the configuration)</p>
-</blockquote>
-<blockquote>
-<p><strong><code>help</code></strong><br />
-give some help on using <code>make</code>, including some interesting make targets</p>
-</blockquote>
-<hr />
-<h2 id="testing">Testing</h2>
-<p>When the build is completed, you should see the generated binaries and associated files in the <code>j2sdk-image</code> directory in the output directory. In particular, the <code>build/*/images/j2sdk-image/bin</code> directory should contain executables for the OpenJDK tools and utilities for that configuration. The testing tool <code>jtreg</code> will be needed and can be found at: <a href="http://openjdk.java.net/jtreg/">the jtreg site</a>. The provided regression tests in the repositories can be run with the command:</p>
-<blockquote>
-<p><strong><code>cd test && make PRODUCT_HOME=`pwd`/../build/*/images/j2sdk-image all</code></strong></p>
-</blockquote>
-<hr />
-<h2 id="appendix-a-hints-and-tips">Appendix A: Hints and Tips</h2>
-<h3 id="faq">FAQ</h3>
-<p><strong>Q:</strong> The <code>generated-configure.sh</code> file looks horrible! How are you going to edit it?<br />
-<strong>A:</strong> The <code>generated-configure.sh</code> file is generated (think "compiled") by the autoconf tools. The source code is in <code>configure.ac</code> and various .m4 files in common/autoconf, which are much more readable.</p>
-<p><strong>Q:</strong> Why is the <code>generated-configure.sh</code> file checked in, if it is generated?<br />
-<strong>A:</strong> If it was not generated, every user would need to have the autoconf tools installed, and re-generate the <code>configure</code> file as the first step. Our goal is to minimize the work needed to be done by the user to start building OpenJDK, and to minimize the number of external dependencies required.</p>
-<p><strong>Q:</strong> Do you require a specific version of autoconf for regenerating <code>generated-configure.sh</code>?<br />
-<strong>A:</strong> Yes, version 2.69 is required and should be easy enough to aquire on all supported operating systems. The reason for this is to avoid large spurious changes in <code>generated-configure.sh</code>.</p>
-<p><strong>Q:</strong> How do you regenerate <code>generated-configure.sh</code> after making changes to the input files?<br />
-<strong>A:</strong> Regnerating <code>generated-configure.sh</code> should always be done using the script <code>common/autoconf/autogen.sh</code> to ensure that the correct files get updated. This script should also be run after mercurial tries to merge <code>generated-configure.sh</code> as a merge of the generated file is not guaranteed to be correct.</p>
-<p><strong>Q:</strong> What are the files in <code>common/makefiles/support/*</code> for? They look like gibberish.<br />
-<strong>A:</strong> They are a somewhat ugly hack to compensate for command line length limitations on certain platforms (Windows, Solaris). Due to a combination of limitations in make and the shell, command lines containing too many files will not work properly. These helper files are part of an elaborate hack that will compress the command line in the makefile and then uncompress it safely. We're not proud of it, but it does fix the problem. If you have any better suggestions, we're all ears! :-)</p>
-<p><strong>Q:</strong> I want to see the output of the commands that make runs, like in the old build. How do I do that?<br />
-<strong>A:</strong> You specify the <code>LOG</code> variable to make. There are several log levels:</p>
+<p>Compiling with Solaris Studio can sometimes be finicky. This is the exact version used by Oracle, which worked correctly at the time of writing:</p>
+<pre><code>$ cc -V
+cc: Sun C 5.13 SunOS_i386 2014/10/20
+$ CC -V
+CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
+<h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
+<p>The minimum accepted version of Visual Studio is 2010. Older versions will not be accepted by <code>configure</code>. The maximum accepted version of Visual Studio is 2013.</p>
+<p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2010</code>.</p>
+<p>If you get <code>LINK: fatal error LNK1123: failure during conversion to COFF: file invalid</code> when building using Visual Studio 2010, you have encountered <a href="http://support.microsoft.com/kb/2757355">KB2757355</a>, a bug triggered by a specific installation order. However, the solution suggested by the KB article does not always resolve the problem. See <a href="https://stackoverflow.com/questions/10888391">this stackoverflow discussion</a> for other suggestions.</p>
+<h3 id="ibm-xl-cc">IBM XL C/C++</h3>
+<p>The regular builds by SAP is using version 12.1, described as <code>IBM XL C/C++ for AIX, V12.1 (5765-J02, 5725-C72) Version: 12.01.0000.0017</code>.</p>
+<p>See the <a href="http://cr.openjdk.java.net/~simonis/ppc-aix-port">OpenJDK PowerPC Port Status Page</a> for details.</p>
+<h2 id="boot-jdk-requirements">Boot JDK Requirements</h2>
+<p>Paradoxically, building OpenJDK requires a pre-existing JDK. This is called the "boot JDK". The boot JDK does not have to be OpenJDK, though. If you are porting OpenJDK to a new platform, chances are that there already exists another JDK for that platform that is usable as boot JDK.</p>
+<p>The rule of thumb is that the boot JDK for building JDK major version <em>N</em> should be an JDK of major version <em>N-1</em>, so for building JDK 9 a JDK 8 would be suitable as boot JDK. However, OpenJDK should be able to "build itself", so an up-to-date build of the current OpenJDK source is an acceptable alternative. If you are following the <em>N-1</em> rule, make sure you got the latest update version, since JDK 8 GA might not be able to build JDK 9 on all platforms.</p>
+<p>If the Boot JDK is not automatically detected, or the wrong JDK is picked, use <code>--with-boot-jdk</code> to point to the JDK to use.</p>
+<h3 id="jdk-8-on-linux">JDK 8 on Linux</h3>
+<p>On apt-based distros (like Debian and Ubuntu), <code>sudo apt-get install openjdk-8-jdk</code> is typically enough to install OpenJDK 8. On rpm-based distros (like Fedora and Red Hat), try <code>sudo yum install java-1.8.0-openjdk-devel</code>.</p>
+<h3 id="jdk-8-on-windows">JDK 8 on Windows</h3>
+<p>No pre-compiled binaries of OpenJDK 8 are readily available for Windows at the time of writing. An alternative is to download the <a href="http://www.oracle.com/technetwork/java/javase/downloads">Oracle JDK</a>. Another is the <a href="https://adoptopenjdk.net/">Adopt OpenJDK Project</a>, which publishes experimental prebuilt binaries for Windows.</p>
+<h3 id="jdk-8-on-macos">JDK 8 on macOS</h3>
+<p>No pre-compiled binaries of OpenJDK 8 are readily available for macOS at the time of writing. An alternative is to download the <a href="http://www.oracle.com/technetwork/java/javase/downloads">Oracle JDK</a>, or to install it using <code>brew cask install java</code>. Another option is the <a href="https://adoptopenjdk.net/">Adopt OpenJDK Project</a>, which publishes experimental prebuilt binaries for macOS.</p>
+<h3 id="jdk-8-on-aix">JDK 8 on AIX</h3>
+<p>No pre-compiled binaries of OpenJDK 8 are readily available for AIX at the time of writing. A starting point for working with OpenJDK on AIX is the <a href="http://openjdk.java.net/projects/ppc-aix-port/">PowerPC/AIX Port Project</a>.</p>
+<h2 id="external-library-requirements">External Library Requirements</h2>
+<p>Different platforms require different external libraries. In general, libraries are not optional - that is, they are either required or not used.</p>
+<p>If a required library is not detected by <code>configure</code>, you need to provide the path to it. There are two forms of the <code>configure</code> arguments to point to an external library: <code>--with-<LIB>=<path></code> or <code>--with-<LIB>-include=<path to include> --with-<LIB>-lib=<path to lib></code>. The first variant is more concise, but require the include files an library files to reside in a default hierarchy under this directory. In most cases, it works fine.</p>
+<p>As a fallback, the second version allows you to point to the include directory and the lib directory separately.</p>
+<h3 id="freetype">FreeType</h3>
+<p>FreeType2 from <a href="http://www.freetype.org/">The FreeType Project</a> is required on all platforms. At least version 2.3 is required.</p>
+<ul>
+<li>To install on an apt-based Linux, try running <code>sudo apt-get install libcups2-dev</code>.</li>
+<li>To install on an rpm-based Linux, try running <code>sudo yum install cups-devel</code>.</li>
+<li>To install on Solaris, try running <code>pkg install system/library/freetype-2</code>.</li>
+<li>To install on macOS, try running <code>brew install freetype</code>.</li>
+<li>To install on Windows, see <a href="#building-freetype-on-windows">below</a>.</li>
+</ul>
+<p>Use <code>--with-freetype=<path></code> if <code>configure</code> does not properly locate your FreeType files.</p>
+<h4 id="building-freetype-on-windows">Building FreeType on Windows</h4>
+<p>On Windows, there is no readily available compiled version of FreeType. OpenJDK can help you compile FreeType from source. Download the FreeType sources and unpack them into an arbitrary directory:</p>
+<pre><code>wget http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.gz
+tar -xzf freetype-2.5.3.tar.gz</code></pre>
+<p>Then run <code>configure</code> with <code>--with-freetype-src=<freetype_src></code>. This will automatically build the freetype library into <code><freetype_src>/lib64</code> for 64-bit builds or into <code><freetype_src>/lib32</code> for 32-bit builds. Afterwards you can always use <code>--with-freetype-include=<freetype_src>/include</code> and <code>--with-freetype-lib=<freetype_src>/lib[32|64]</code> for other builds.</p>
+<p>Alternatively you can unpack the sources like this to use the default directory:</p>
+<pre><code>tar --one-top-level=$HOME/freetype --strip-components=1 -xzf freetype-2.5.3.tar.gz</code></pre>
+<h3 id="cups">CUPS</h3>
+<p>CUPS, <a href="http://www.cups.org">Common UNIX Printing System</a> header files are required on all platforms, except Windows. Often these files are provided by your operating system.</p>
+<ul>
+<li>To install on an apt-based Linux, try running <code>sudo apt-get install libcups2-dev</code>.</li>
+<li>To install on an rpm-based Linux, try running <code>sudo yum install cups-devel</code>.</li>
+<li>To install on Solaris, try running <code>pkg install print/cups</code>.</li>
+</ul>
+<p>Use <code>--with-cups=<path></code> if <code>configure</code> does not properly locate your CUPS files.</p>
+<h3 id="x11">X11</h3>
+<p>Certain <a href="http://www.x.org/">X11</a> libraries and include files are required on Linux and Solaris.</p>
+<ul>
+<li>To install on an apt-based Linux, try running <code>sudo apt-get install libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev</code>.</li>
+<li>To install on an rpm-based Linux, try running <code>sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel</code>.</li>
+<li>To install on Solaris, try running <code>pkg install x11/header/x11-protocols x11/library/libice x11/library/libpthread-stubs x11/library/libsm x11/library/libx11 x11/library/libxau x11/library/libxcb x11/library/libxdmcp x11/library/libxevie x11/library/libxext x11/library/libxrender x11/library/libxscrnsaver x11/library/libxtst x11/library/toolkit/libxt</code>.</li>
+</ul>
+<p>Use <code>--with-x=<path></code> if <code>configure</code> does not properly locate your X11 files.</p>
+<h3 id="alsa">ALSA</h3>
+<p>ALSA, <a href="https://www.alsa-project.org/">Advanced Linux Sound Architecture</a> is required on Linux. At least version 0.9.1 of ALSA is required.</p>
+<ul>
+<li>To install on an apt-based Linux, try running <code>sudo apt-get install libasound2-dev</code>.</li>
+<li>To install on an rpm-based Linux, try running <code>sudo yum install alsa-lib-devel</code>.</li>
+</ul>
+<p>Use <code>--with-alsa=<path></code> if <code>configure</code> does not properly locate your ALSA files.</p>
+<h3 id="libffi">libffi</h3>
+<p>libffi, the <a href="http://sourceware.org/libffi">Portable Foreign Function Interface Library</a> is required when building the Zero version of Hotspot.</p>
+<ul>
+<li>To install on an apt-based Linux, try running <code>sudo apt-get install libffi-dev</code>.</li>
+<li>To install on an rpm-based Linux, try running <code>sudo yum install libffi-devel</code>.</li>
+</ul>
+<p>Use <code>--with-libffi=<path></code> if <code>configure</code> does not properly locate your libffi files.</p>
+<h3 id="libelf">libelf</h3>
+<p>libelf from the <a href="http://sourceware.org/elfutils">elfutils project</a> is required when building the AOT feature of Hotspot.</p>
+<ul>
+<li>To install on an apt-based Linux, try running <code>sudo apt-get install libelf-dev</code>.</li>
+<li>To install on an rpm-based Linux, try running <code>sudo yum install elfutils-libelf-devel</code>.</li>
+</ul>
+<p>Use <code>--with-libelf=<path></code> if <code>configure</code> does not properly locate your libelf files.</p>
+<h2 id="other-tooling-requirements">Other Tooling Requirements</h2>
+<h3 id="gnu-make">GNU Make</h3>
+<p>OpenJDK requires <a href="http://www.gnu.org/software/make">GNU Make</a>. No other flavors of make are supported.</p>
+<p>At least version 3.81 of GNU Make must be used. For distributions supporting GNU Make 4.0 or above, we strongly recommend it. GNU Make 4.0 contains useful functionality to handle parallel building (supported by <code>--with-output-sync</code>) and speed and stability improvements.</p>
+<p>Note that <code>configure</code> locates and verifies a properly functioning version of <code>make</code> and stores the path to this <code>make</code> binary in the configuration. If you start a build using <code>make</code> on the command line, you will be using the version of make found first in your <code>PATH</code>, and not necessarily the one stored in the configuration. This initial make will be used as "bootstrap make", and in a second stage, the make located by <code>configure</code> will be called. Normally, this will present no issues, but if you have a very old <code>make</code>, or a non-GNU Make <code>make</code> in your path, this might cause issues.</p>
+<p>If you want to override the default make found by <code>configure</code>, use the <code>MAKE</code> configure variable, e.g. <code>configure MAKE=/opt/gnu/make</code>.</p>
+<p>On Solaris, it is common to call the GNU version of make by using <code>gmake</code>.</p>
+<h3 id="gnu-bash">GNU Bash</h3>
+<p>OpenJDK requires <a href="http://www.gnu.org/software/bash">GNU Bash</a>. No other shells are supported.</p>
+<p>At least version 3.2 of GNU Bash must be used.</p>
+<h3 id="autoconf">Autoconf</h3>
+<p>If you want to modify the build system itself, you need to install <a href="http://www.gnu.org/software/autoconf">Autoconf</a>.</p>
+<p>However, if you only need to build OpenJDK or if you only edit the actual OpenJDK source files, there is no dependency on autoconf, since the source distribution includes a pre-generated <code>configure</code> shell script.</p>
+<p>See the section on <a href="#autoconf-details">Autoconf Details</a> for details on how OpenJDK uses autoconf. This is especially important if you plan to contribute changes to OpenJDK that modifies the build system.</p>
+<h2 id="running-configure">Running Configure</h2>
+<p>To build OpenJDK, you need a "configuration", which consists of a directory where to store the build output, coupled with information about the platform, the specific build machine, and choices that affect how OpenJDK is built.</p>
+<p>The configuration is created by the <code>configure</code> script. The basic invocation of the <code>configure</code> script looks like this:</p>
+<pre><code>bash configure [options]</code></pre>
+<p>This will create an output directory containing the configuration and setup an area for the build result. This directory typically looks like <code>build/linux-x64-normal-server-release</code>, but the actual name depends on your specific configuration. (It can also be set directly, see <a href="#using-multiple-configurations">Using Multiple Configurations</a>). This directory is referred to as <code>$BUILD</code> in this documentation.</p>
+<p><code>configure</code> will try to figure out what system you are running on and where all necessary build components are. If you have all prerequisites for building installed, it should find everything. If it fails to detect any component automatically, it will exit and inform you about the problem.</p>
+<p>Some command line examples:</p>
+<ul>
+<li><p>Create a 32-bit build for Windows with FreeType2 in <code>C:\freetype-i586</code>:</p>
+<pre><code>bash configure --with-freetype=/cygdrive/c/freetype-i586 --with-target-bits=32</code></pre></li>
+<li><p>Create a debug build with the <code>server</code> JVM and DTrace enabled:</p>
+<pre><code>bash configure --enable-debug --with-jvm-variants=server --enable-dtrace</code></pre></li>
+</ul>
+<h3 id="common-configure-arguments">Common Configure Arguments</h3>
+<p>Here follows some of the most common and important <code>configure</code> argument.</p>
+<p>To get up-to-date information on <em>all</em> available <code>configure</code> argument, please run:</p>
+<pre><code>bash configure --help</code></pre>
+<p>(Note that this help text also include general autoconf options, like <code>--dvidir</code>, that is not relevant to OpenJDK. To list only OpenJDK specific features, use <code>bash configure --help=short</code> instead.)</p>
+<h4 id="configure-arguments-for-tailoring-the-build">Configure Arguments for Tailoring the Build</h4>
+<ul>
+<li><code>--enable-debug</code> - Set the debug level to <code>fastdebug</code> (this is a shorthand for <code>--with-debug-level=fastdebug</code>)</li>
+<li><code>--with-debug-level=<level></code> - Set the debug level, which can be <code>release</code>, <code>fastdebug</code>, <code>slowdebug</code> or <code>optimized</code>. Default is <code>release</code>. <code>optimized</code> is variant of <code>release</code> with additional Hotspot debug code.</li>
+<li><code>--with-native-debug-symbols=<method></code> - Specify if and how native debug symbols should be built. Available methods are <code>none</code>, <code>internal</code>, <code>external</code>, <code>zipped</code>. Default behavior depends on platform. See <a href="#native-debug-symbols">Native Debug Symbols</a> for more details.</li>
+<li><code>--with-version-string=<string></code> - Specify the version string this build will be identified with.</li>
+<li><code>--with-version-<part>=<value></code> - A group of options, where <code><part></code> can be any of <code>pre</code>, <code>opt</code>, <code>build</code>, <code>major</code>, <code>minor</code>, <code>security</code> or <code>patch</code>. Use these options to modify just the corresponding part of the version string from the default, or the value provided by <code>--with-version-string</code>.</li>
+<li><code>--with-jvm-variants=<variant>[,<variant>...]</code> - Build the specified variant (or variants) of Hotspot. Valid variants are: <code>server</code>, <code>client</code>, <code>minimal</code>, <code>core</code>, <code>zero</code>, <code>zeroshark</code>, <code>custom</code>. Note that not all variants are possible to combine in a single build.</li>
+<li><code>--with-jvm-features=<feature>[,<feature>...]</code> - Use the specified JVM features when building Hotspot. The list of features will be enabled on top of the default list. For the <code>custom</code> JVM variant, this default list is empty. A complete list of available JVM features can be found using <code>bash configure --help</code>.</li>
+<li><code>--with-target-bits=<bits></code> - Create a target binary suitable for running on a <code><bits></code> platform. Use this to create 32-bit output on a 64-bit build platform, instead of doing a full cross-compile. (This is known as a <em>reduced</em> build.)</li>
+</ul>
+<h4 id="configure-arguments-for-native-compilation">Configure Arguments for Native Compilation</h4>
+<ul>
+<li><code>--with-devkit=<path></code> - Use this devkit for compilers, tools and resources</li>
+<li><code>--with-sysroot=<path></code> - Use this directory as sysroot</li>
+<li><code>--with-extra-path=<path>[;<path>]</code> - Prepend these directories to the default path when searching for all kinds of binaries</li>
+<li><code>--with-toolchain-path=<path>[;<path>]</code> - Prepend these directories when searching for toolchain binaries (compilers etc)</li>
+<li><code>--with-extra-cflags=<flags></code> - Append these flags when compiling JDK C files</li>
+<li><code>--with-extra-cxxflags=<flags></code> - Append these flags when compiling JDK C++ files</li>
+<li><code>--with-extra-ldflags=<flags></code> - Append these flags when linking JDK libraries</li>
+</ul>
+<h4 id="configure-arguments-for-external-dependencies">Configure Arguments for External Dependencies</h4>
+<ul>
+<li><code>--with-boot-jdk=<path></code> - Set the path to the <a href="#boot-jdk-requirements">Boot JDK</a></li>
+<li><code>--with-freetype=<path></code> - Set the path to <a href="#freetype">FreeType</a></li>
+<li><code>--with-cups=<path></code> - Set the path to <a href="#cups">CUPS</a></li>
+<li><code>--with-x=<path></code> - Set the path to <a href="#x11">X11</a></li>
+<li><code>--with-alsa=<path></code> - Set the path to <a href="#alsa">ALSA</a></li>
+<li><code>--with-libffi=<path></code> - Set the path to <a href="#libffi">libffi</a></li>
+<li><code>--with-libelf=<path></code> - Set the path to <a href="#libelf">libelf</a></li>
+<li><code>--with-jtreg=<path></code> - Set the path to JTReg. See <a href="#running-tests">Running Tests</a></li>
+</ul>
+<p>Certain third-party libraries used by OpenJDK (libjpeg, giflib, libpng, lcms and zlib) are included in the OpenJDK repository. The default behavior of the OpenJDK build is to use this version of these libraries, but they might be replaced by an external version. To do so, specify <code>system</code> as the <code><source></code> option in these arguments. (The default is <code>bundled</code>).</p>
<ul>
-<li><strong><code>warn</code></strong> -- Default and very quiet.</li>
-<li><strong><code>info</code></strong> -- Shows more progress information than warn.</li>
-<li><strong><code>debug</code></strong> -- Echos all command lines and prints all macro calls for compilation definitions.</li>
-<li><strong><code>trace</code></strong> -- Echos all $(shell) command lines as well.</li>
+<li><code>--with-libjpeg=<source></code> - Use the specified source for libjpeg</li>
+<li><code>--with-giflib=<source></code> - Use the specified source for giflib</li>
+<li><code>--with-libpng=<source></code> - Use the specified source for libpng</li>
+<li><code>--with-lcms=<source></code> - Use the specified source for lcms</li>
+<li><code>--with-zlib=<source></code> - Use the specified source for zlib</li>
+</ul>
+<p>On Linux, it is possible to select either static or dynamic linking of the C++ runtime. The default is static linking, with dynamic linking as fallback if the static library is not found.</p>
+<ul>
+<li><code>--with-stdc++lib=<method></code> - Use the specified method (<code>static</code>, <code>dynamic</code> or <code>default</code>) for linking the C++ runtime.</li>
+</ul>
+<h3 id="configure-control-variables">Configure Control Variables</h3>
+<p>It is possible to control certain aspects of <code>configure</code> by overriding the value of <code>configure</code> variables, either on the command line or in the environment.</p>
+<p>Normally, this is <strong>not recommended</strong>. If used improperly, it can lead to a broken configuration. Unless you're well versed in the build system, this is hard to use properly. Therefore, <code>configure</code> will print a warning if this is detected.</p>
+<p>However, there are a few <code>configure</code> variables, known as <em>control variables</em> that are supposed to be overriden on the command line. These are variables that describe the location of tools needed by the build, like <code>MAKE</code> or <code>GREP</code>. If any such variable is specified, <code>configure</code> will use that value instead of trying to autodetect the tool. For instance, <code>bash configure MAKE=/opt/gnumake4.0/bin/make</code>.</p>
+<p>If a configure argument exists, use that instead, e.g. use <code>--with-jtreg</code> instead of setting <code>JTREGEXE</code>.</p>
+<p>Also note that, despite what autoconf claims, setting <code>CFLAGS</code> will not accomplish anything. Instead use <code>--with-extra-cflags</code> (and similar for <code>cxxflags</code> and <code>ldflags</code>).</p>
+<h2 id="running-make">Running Make</h2>
+<p>When you have a proper configuration, all you need to do to build OpenJDK is to run <code>make</code>. (But see the warning at <a href="#gnu-make">GNU Make</a> about running the correct version of make.)</p>
+<p>When running <code>make</code> without any arguments, the default target is used, which is the same as running <code>make default</code> or <code>make jdk</code>. This will build a minimal (or roughly minimal) set of compiled output (known as an "exploded image") needed for a developer to actually execute the newly built JDK. The idea is that in an incremental development fashion, when doing a normal make, you should only spend time recompiling what's changed (making it purely incremental) and only do the work that's needed to actually run and test your code.</p>
+<p>The output of the exploded image resides in <code>$BUILD/jdk</code>. You can test the newly built JDK like this: <code>$BUILD/jdk/bin/java -version</code>.</p>
+<h3 id="common-make-targets">Common Make Targets</h3>
+<p>Apart from the default target, here are some common make targets:</p>
+<ul>
+<li><code>hotspot</code> - Build all of hotspot (but only hotspot)</li>
+<li><code>hotspot-<variant></code> - Build just the specified jvm variant</li>
+<li><code>images</code> or <code>product-images</code> - Build the JRE and JDK images</li>
+<li><code>docs</code> or <code>docs-image</code> - Build the documentation image</li>
+<li><code>test-image</code> - Build the test image</li>
+<li><code>all</code> or <code>all-images</code> - Build all images (product, docs and test)</li>
+<li><code>bootcycle-images</code> - Build images twice, second time with newly built JDK (good for testing)</li>
+<li><code>clean</code> - Remove all files generated by make, but not those generated by configure</li>
+<li><code>dist-clean</code> - Remove all files, including configuration</li>
+</ul>
+<p>Run <code>make help</code> to get an up-to-date list of important make targets and make control variables.</p>
+<p>It is possible to build just a single module, a single phase, or a single phase of a single module, by creating make targets according to these followin patterns. A phase can be either of <code>gensrc</code>, <code>gendata</code>, <code>copy</code>, <code>java</code>, <code>launchers</code>, <code>libs</code> or <code>rmic</code>. See <a href="#using-fine-grained-make-targets">Using Fine-Grained Make Targets</a> for more details about this functionality.</p>
+<ul>
+<li><code><phase></code> - Build the specified phase and everything it depends on</li>
+<li><code><module></code> - Build the specified module and everything it depends on</li>
+<li><code><module>-<phase></code> - Compile the specified phase for the specified module and everything it depends on</li>
+</ul>
+<p>Similarly, it is possible to clean just a part of the build by creating make targets according to these patterns:</p>
+<ul>
+<li><code>clean-<outputdir></code> - Remove the subdir in the output dir with the name</li>
+<li><code>clean-<phase></code> - Remove all build results related to a certain build phase</li>
+<li><code>clean-<module></code> - Remove all build results related to a certain module</li>
+<li><code>clean-<module>-<phase></code> - Remove all build results related to a certain module and phase</li>
+</ul>
+<h3 id="make-control-variables">Make Control Variables</h3>
+<p>It is possible to control <code>make</code> behavior by overriding the value of <code>make</code> variables, either on the command line or in the environment.</p>
+<p>Normally, this is <strong>not recommended</strong>. If used improperly, it can lead to a broken build. Unless you're well versed in the build system, this is hard to use properly. Therefore, <code>make</code> will print a warning if this is detected.</p>
+<p>However, there are a few <code>make</code> variables, known as <em>control variables</em> that are supposed to be overriden on the command line. These make up the "make time" configuration, as opposed to the "configure time" configuration.</p>
+<h4 id="general-make-control-variables">General Make Control Variables</h4>
+<ul>
+<li><code>JOBS</code> - Specify the number of jobs to build with. See <a href="#build-performance">Build Performance</a>.</li>
+<li><code>LOG</code> - Specify the logging level and functionality. See <a href="#checking-the-build-log-file">Checking the Build Log File</a></li>
+<li><code>CONF</code> and <code>CONF_NAME</code> - Selecting the configuration(s) to use. See <a href="#using-multiple-configurations">Using Multiple Configurations</a></li>
+</ul>
+<h4 id="test-make-control-variables">Test Make Control Variables</h4>
+<p>These make control variables only make sense when running tests. Please see <a href="testing.html">Testing OpenJDK</a> for details.</p>
+<ul>
+<li><code>TEST</code></li>
+<li><code>TEST_JOBS</code></li>
+<li><code>JTREG</code></li>
+<li><code>GTEST</code></li>
+</ul>
+<h4 id="advanced-make-control-variables">Advanced Make Control Variables</h4>
+<p>These advanced make control variables can be potentially unsafe. See <a href="#hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</a> and <a href="#understanding-the-build-system">Understanding the Build System</a> for details.</p>
+<ul>
+<li><code>SPEC</code></li>
+<li><code>CONF_CHECK</code></li>
+<li><code>COMPARE_BUILD</code></li>
+<li><code>JDK_FILTER</code></li>
</ul>
-<p><strong>Q:</strong> When do I have to re-run <code>configure</code>?<br />
-<strong>A:</strong> Normally you will run <code>configure</code> only once for creating a configuration. You need to re-run configuration only if you want to change any configuration options, or if you pull down changes to the <code>configure</code> script.</p>
-<p><strong>Q:</strong> I have added a new source file. Do I need to modify the makefiles?<br />
-<strong>A:</strong> Normally, no. If you want to create e.g. a new native library, you will need to modify the makefiles. But for normal file additions or removals, no changes are needed. There are certan exceptions for some native libraries where the source files are spread over many directories which also contain sources for other libraries. In these cases it was simply easier to create include lists rather than excludes.</p>
-<p><strong>Q:</strong> When I run <code>configure --help</code>, I see many strange options, like <code>--dvidir</code>. What is this?<br />
-<strong>A:</strong> Configure provides a slew of options by default, to all projects that use autoconf. Most of them are not used in OpenJDK, so you can safely ignore them. To list only OpenJDK specific features, use <code>configure --help=short</code> instead.</p>
-<p><strong>Q:</strong> <code>configure</code> provides OpenJDK-specific features such as <code>--with-builddeps-server</code> that are not described in this document. What about those?<br />
-<strong>A:</strong> Try them out if you like! But be aware that most of these are experimental features. Many of them don't do anything at all at the moment; the option is just a placeholder. Others depend on pieces of code or infrastructure that is currently not ready for prime time.</p>
-<p><strong>Q:</strong> How will you make sure you don't break anything?<br />
-<strong>A:</strong> We have a script that compares the result of the new build system with the result of the old. For most part, we aim for (and achieve) byte-by-byte identical output. There are however technical issues with e.g. native binaries, which might differ in a byte-by-byte comparison, even when building twice with the old build system. For these, we compare relevant aspects (e.g. the symbol table and file size). Note that we still don't have 100% equivalence, but we're close.</p>
-<p><strong>Q:</strong> I noticed this thing X in the build that looks very broken by design. Why don't you fix it?<br />
-<strong>A:</strong> Our goal is to produce a build output that is as close as technically possible to the old build output. If things were weird in the old build, they will be weird in the new build. Often, things were weird before due to obscurity, but in the new build system the weird stuff comes up to the surface. The plan is to attack these things at a later stage, after the new build system is established.</p>
-<p><strong>Q:</strong> The code in the new build system is not that well-structured. Will you fix this?<br />
-<strong>A:</strong> Yes! The new build system has grown bit by bit as we converted the old system. When all of the old build system is converted, we can take a step back and clean up the structure of the new build system. Some of this we plan to do before replacing the old build system and some will need to wait until after.</p>
-<p><strong>Q:</strong> Is anything able to use the results of the new build's default make target?<br />
-<strong>A:</strong> Yes, this is the minimal (or roughly minimal) set of compiled output needed for a developer to actually execute the newly built JDK. The idea is that in an incremental development fashion, when doing a normal make, you should only spend time recompiling what's changed (making it purely incremental) and only do the work that's needed to actually run and test your code. The packaging stuff that is part of the <code>images</code> target is not needed for a normal developer who wants to test his new code. Even if it's quite fast, it's still unnecessary. We're targeting sub-second incremental rebuilds! ;-) (Or, well, at least single-digit seconds...)</p>
-<p><strong>Q:</strong> I usually set a specific environment variable when building, but I can't find the equivalent in the new build. What should I do?<br />
-<strong>A:</strong> It might very well be that we have neglected to add support for an option that was actually used from outside the build system. Email us and we will add support for it!</p>
-<h3 id="build-performance-tips">Build Performance Tips</h3>
+<h2 id="running-tests">Running Tests</h2>
+<p>Most of the OpenJDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, use the <code>--with-jtreg=<path to jtreg home></code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc.</p>
+<p>To execute the most basic tests (tier 1), use:</p>
+<pre><code>make run-test-tier1</code></pre>
+<p>For more details on how to run tests, please see the <a href="testing.html">Testing OpenJDK</a> document.</p>
+<h2 id="cross-compiling">Cross-compiling</h2>
+<p>Cross-compiling means using one platform (the <em>build</em> platform) to generate output that can ran on another platform (the <em>target</em> platform).</p>
+<p>The typical reason for cross-compiling is that the build is performed on a more powerful desktop computer, but the resulting binaries will be able to run on a different, typically low-performing system. Most of the complications that arise when building for embedded is due to this separation of <em>build</em> and <em>target</em> systems.</p>
+<p>This requires a more complex setup and build procedure. This section assumes you are familiar with cross-compiling in general, and will only deal with the particularities of cross-compiling OpenJDK. If you are new to cross-compiling, please see the <a href="https://en.wikipedia.org/wiki/Cross_compiler#External_links">external links at Wikipedia</a> for a good start on reading materials.</p>
+<p>Cross-compiling OpenJDK requires you to be able to build both for the build platform and for the target platform. The reason for the former is that we need to build and execute tools during the build process, both native tools and Java tools.</p>
+<p>If all you want to do is to compile a 32-bit version, for the same OS, on a 64-bit machine, consider using <code>--with-target-bits=32</code> instead of doing a full-blown cross-compilation. (While this surely is possible, it's a lot more work and will take much longer to build.)</p>
+<h3 id="boot-jdk-and-build-jdk">Boot JDK and Build JDK</h3>
+<p>When cross-compiling, make sure you use a boot JDK that runs on the <em>build</em> system, and not on the <em>target</em> system.</p>
+<p>To be able to build, we need a "Build JDK", which is a JDK built from the current sources (that is, the same as the end result of the entire build process), but able to run on the <em>build</em> system, and not the <em>target</em> system. (In contrast, the Boot JDK should be from an older release, e.g. JDK 8 when building JDK 9.)</p>
+<p>The build process will create a minimal Build JDK for you, as part of building. To speed up the build, you can use <code>--with-build-jdk</code> to <code>configure</code> to point to a pre-built Build JDK. Please note that the build result is unpredictable, and can possibly break in subtle ways, if the Build JDK does not <strong>exactly</strong> match the current sources.</p>
+<h3 id="specifying-the-target-platform">Specifying the Target Platform</h3>
+<p>You <em>must</em> specify the target platform when cross-compiling. Doing so will also automatically turn the build into a cross-compiling mode. The simplest way to do this is to use the <code>--openjdk-target</code> argument, e.g. <code>--openjdk-target=arm-linux-gnueabihf</code>. or <code>--openjdk-target=aarch64-oe-linux</code>. This will automatically set the <code>--build</code>, <code>--host</code> and <code>--target</code> options for autoconf, which can otherwise be confusing. (In autoconf terminology, the "target" is known as "host", and "target" is used for building a Canadian cross-compiler.)</p>
+<h3 id="toolchain-considerations">Toolchain Considerations</h3>
+<p>You will need two copies of your toolchain, one which generates output that can run on the target system (the normal, or <em>target</em>, toolchain), and one that generates output that can run on the build system (the <em>build</em> toolchain). Note that cross-compiling is only supported for gcc at the time being. The gcc standard is to prefix cross-compiling toolchains with the target denominator. If you follow this standard, <code>configure</code> is likely to pick up the toolchain correctly.</p>
+<p>The <em>build</em> toolchain will be autodetected just the same way the normal <em>build</em>/<em>target</em> toolchain will be autodetected when not cross-compiling. If this is not what you want, or if the autodetection fails, you can specify a devkit containing the <em>build</em> toolchain using <code>--with-build-devkit</code> to <code>configure</code>, or by giving <code>BUILD_CC</code> and <code>BUILD_CXX</code> arguments.</p>
+<p>It is often helpful to locate the cross-compilation tools, headers and libraries in a separate directory, outside the normal path, and point out that directory to <code>configure</code>. Do this by setting the sysroot (<code>--with-sysroot</code>) and appending the directory when searching for cross-compilations tools (<code>--with-toolchain-path</code>). As a compact form, you can also use <code>--with-devkit</code> to point to a single directory, if it is correctly setup. (See <code>basics.m4</code> for details.)</p>
+<p>If you are unsure what toolchain and versions to use, these have been proved working at the time of writing:</p>
+<ul>
+<li><a href="https://releases.linaro.org/archive/13.11/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux.tar.xz">aarch64</a></li>
+<li><a href="https://launchpad.net/linaro-toolchain-unsupported/trunk/2012.09/+download/gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux.tar.bz2">arm 32-bit hardware floating point</a></li>
+</ul>
+<h3 id="native-libraries">Native Libraries</h3>
+<p>You will need copies of external native libraries for the <em>target</em> system, present on the <em>build</em> machine while building.</p>
+<p>Take care not to replace the <em>build</em> system's version of these libraries by mistake, since that can render the <em>build</em> machine unusable.</p>
+<p>Make sure that the libraries you point to (ALSA, X11, etc) are for the <em>target</em>, not the <em>build</em>, platform.</p>
+<h4 id="alsa-1">ALSA</h4>
+<p>You will need alsa libraries suitable for your <em>target</em> system. For most cases, using Debian's pre-built libraries work fine.</p>
+<p>Note that alsa is needed even if you only want to build a headless JDK.</p>
+<ul>
+<li><p>Go to <a href="https://www.debian.org/distrib/packages">Debian Package Search</a> and search for the <code>libasound2</code> and <code>libasound2-dev</code> packages for your <em>target</em> system. Download them to /tmp.</p></li>
+<li><p>Install the libraries into the cross-compilation toolchain. For instance:</p>
+<pre><code>cd /tools/gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux/arm-linux-gnueabihf/libc
+dpkg-deb -x /tmp/libasound2_1.0.25-4_armhf.deb .
+dpkg-deb -x /tmp/libasound2-dev_1.0.25-4_armhf.deb .</code></pre></li>
+<li><p>If alsa is not properly detected by <code>configure</code>, you can point it out by <code>--with-alsa</code>.</p></li>
+</ul>
+<h4 id="x11-1">X11</h4>
+<p>You will need X11 libraries suitable for your <em>target</em> system. For most cases, using Debian's pre-built libraries work fine.</p>
+<p>Note that X11 is needed even if you only want to build a headless JDK.</p>
+<ul>
+<li>Go to <a href="https://www.debian.org/distrib/packages">Debian Package Search</a>, search for the following packages for your <em>target</em> system, and download them to /tmp/target-x11:
+<ul>
+<li>libxi</li>
+<li>libxi-dev</li>
+<li>x11proto-core-dev</li>
+<li>x11proto-input-dev</li>
+<li>x11proto-kb-dev</li>
+<li>x11proto-render-dev</li>
+<li>x11proto-xext-dev</li>
+<li>libice-dev</li>
+<li>libxrender</li>
+<li>libxrender-dev</li>
+<li>libsm-dev</li>
+<li>libxt-dev</li>
+<li>libx11</li>
+<li>libx11-dev</li>
+<li>libxtst</li>
+<li>libxtst-dev</li>
+<li>libxext</li>
+<li>libxext-dev</li>
+</ul></li>
+<li><p>Install the libraries into the cross-compilation toolchain. For instance:</p>
+<pre><code>cd /tools/gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux/arm-linux-gnueabihf/libc/usr
+mkdir X11R6
+cd X11R6
+for deb in /tmp/target-x11/*.deb ; do dpkg-deb -x $deb . ; done
+mv usr/* .
+cd lib
+cp arm-linux-gnueabihf/* .</code></pre>
+<p>You can ignore the following messages. These libraries are not needed to successfully complete a full JDK build.</p>
+<pre><code>cp: cannot stat `arm-linux-gnueabihf/libICE.so': No such file or directory
+cp: cannot stat `arm-linux-gnueabihf/libSM.so': No such file or directory
+cp: cannot stat `arm-linux-gnueabihf/libXt.so': No such file or directory</code></pre></li>
+<li><p>If the X11 libraries are not properly detected by <code>configure</code>, you can point them out by <code>--with-x</code>.</p></li>
+</ul>
+<h3 id="building-for-armaarch64">Building for ARM/aarch64</h3>
+<p>A common cross-compilation target is the ARM CPU. When building for ARM, it is useful to set the ABI profile. A number of pre-defined ABI profiles are available using <code>--with-abi-profile</code>: arm-vfp-sflt, arm-vfp-hflt, arm-sflt, armv5-vfp-sflt, armv6-vfp-hflt. Note that soft-float ABIs are no longer properly supported on OpenJDK.</p>
+<p>OpenJDK contains two different ports for the aarch64 platform, one is the original aarch64 port from the <a href="http://openjdk.java.net/projects/aarch64-port">AArch64 Port Project</a> and one is a 64-bit version of the Oracle contributed ARM port. When targeting aarch64, by the default the original aarch64 port is used. To select the Oracle ARM 64 port, use <code>--with-cpu-port=arm64</code>. Also set the corresponding value (<code>aarch64</code> or <code>arm64</code>) to --with-abi-profile, to ensure a consistent build.</p>
+<h3 id="verifying-the-build">Verifying the Build</h3>
+<p>The build will end up in a directory named like <code>build/linux-arm-normal-server-release</code>.</p>
+<p>Inside this build output directory, the <code>images/jdk</code> and <code>images/jre</code> will contain the newly built JDK and JRE, respectively, for your <em>target</em> system.</p>
+<p>Copy these folders to your <em>target</em> system. Then you can run e.g. <code>images/jdk/bin/java -version</code>.</p>
+<h2 id="build-performance">Build Performance</h2>
<p>Building OpenJDK requires a lot of horsepower. Some of the build tools can be adjusted to utilize more or less of resources such as parallel threads and memory. The <code>configure</code> script analyzes your system and selects reasonable values for such options based on your hardware. If you encounter resource problems, such as out of memory conditions, you can modify the detected values with:</p>
<ul>
-<li><strong><code>--with-num-cores</code></strong> -- number of cores in the build system, e.g. <code>--with-num-cores=8</code></li>
-<li><strong><code>--with-memory-size</code></strong> -- memory (in MB) available in the build system, e.g. <code>--with-memory-size=1024</code></li>
-</ul>
-<p>It might also be necessary to specify the JVM arguments passed to the Bootstrap JDK, using e.g. <code>--with-boot-jdk-jvmargs="-Xmx8G -enableassertions"</code>. Doing this will override the default JVM arguments passed to the Bootstrap JDK.</p>
-<p>One of the top goals of the new build system is to improve the build performance and decrease the time needed to build. This will soon also apply to the java compilation when the Smart Javac wrapper is fully supported.</p>
-<p>At the end of a successful execution of <code>configure</code>, you will get a performance summary, indicating how well the build will perform. Here you will also get performance hints. If you want to build fast, pay attention to those!</p>
-<h4 id="building-with-ccache">Building with ccache</h4>
-<p>The OpenJDK build supports building with ccache when using gcc or clang. Using ccache can radically speed up compilation of native code if you often rebuild the same sources. Your milage may vary however so we recommend evaluating it for yourself. To enable it, make sure it's on the path and configure with <code>--enable-ccache</code>.</p>
-<h4 id="building-on-local-disk">Building on local disk</h4>
-<p>If you are using network shares, e.g. via NFS, for your source code, make sure the build directory is situated on local disk. The performance penalty is extremely high for building on a network share, close to unusable.</p>
-<h4 id="building-only-one-jvm">Building only one JVM</h4>
-<p>The old build builds multiple JVMs on 32-bit systems (client and server; and on Windows kernel as well). In the new build we have changed this default to only build server when it's available. This improves build times for those not interested in multiple JVMs. To mimic the old behavior on platforms that support it, use <code>--with-jvm-variants=client,server</code>.</p>
-<h4 id="selecting-the-number-of-cores-to-build-on">Selecting the number of cores to build on</h4>
-<p>By default, <code>configure</code> will analyze your machine and run the make process in parallel with as many threads as you have cores. This behavior can be overridden, either "permanently" (on a <code>configure</code> basis) using <code>--with-num-cores=N</code> or for a single build only (on a make basis), using <code>make JOBS=N</code>.</p>
-<p>If you want to make a slower build just this time, to save some CPU power for other processes, you can run e.g. <code>make JOBS=2</code>. This will force the makefiles to only run 2 parallel processes, or even <code>make JOBS=1</code> which will disable parallelism.</p>
-<p>If you want to have it the other way round, namely having slow builds default and override with fast if you're impatient, you should call <code>configure</code> with <code>--with-num-cores=2</code>, making 2 the default. If you want to run with more cores, run <code>make JOBS=8</code></p>
-<h3 id="troubleshooting">Troubleshooting</h3>
-<h4 id="solving-build-problems">Solving build problems</h4>
-<p>If the build fails (and it's not due to a compilation error in a source file you've changed), the first thing you should do is to re-run the build with more verbosity. Do this by adding <code>LOG=debug</code> to your make command line.</p>
-<p>The build log (with both stdout and stderr intermingled, basically the same as you see on your console) can be found as <code>build.log</code> in your build directory.</p>
-<p>You can ask for help on build problems with the new build system on either the <a href="http://mail.openjdk.java.net/mailman/listinfo/build-dev">build-dev</a> or the <a href="http://mail.openjdk.java.net/mailman/listinfo/build-infra-dev">build-infra-dev</a> mailing lists. Please include the relevant parts of the build log.</p>
-<p>A build can fail for any number of reasons. Most failures are a result of trying to build in an environment in which all the pre-build requirements have not been met. The first step in troubleshooting a build failure is to recheck that you have satisfied all the pre-build requirements for your platform. Scanning the <code>configure</code> log is a good first step, making sure that what it found makes sense for your system. Look for strange error messages or any difficulties that <code>configure</code> had in finding things.</p>
-<p>Some of the more common problems with builds are briefly described below, with suggestions for remedies.</p>
-<ul>
-<li><p><strong>Corrupted Bundles on Windows:</strong><br />
-Some virus scanning software has been known to corrupt the downloading of zip bundles. It may be necessary to disable the 'on access' or 'real time' virus scanning features to prevent this corruption. This type of 'real time' virus scanning can also slow down the build process significantly. Temporarily disabling the feature, or excluding the build output directory may be necessary to get correct and faster builds.</p></li>
-<li><p><strong>Slow Builds:</strong><br />
-If your build machine seems to be overloaded from too many simultaneous C++ compiles, try setting the <code>JOBS=1</code> on the <code>make</code> command line. Then try increasing the count slowly to an acceptable level for your system. Also:</p></li>
-</ul>
-<p>Creating the javadocs can be very slow, if you are running javadoc, consider skipping that step.</p>
-<p>Faster CPUs, more RAM, and a faster DISK usually helps. The VM build tends to be CPU intensive (many C++ compiles), and the rest of the JDK will often be disk intensive.</p>
-<p>Faster compiles are possible using a tool called <a href="http://ccache.samba.org/">ccache</a>.</p>
-<ul>
-<li><strong>File time issues:</strong><br />
-If you see warnings that refer to file time stamps, e.g.</li>
-</ul>
-<blockquote>
-<p><em>Warning message:</em> <code>File 'xxx' has modification time in the future.</code><br />
-<em>Warning message:</em> <code>Clock skew detected. Your build may be incomplete.</code></p>
-</blockquote>
-<p>These warnings can occur when the clock on the build machine is out of sync with the timestamps on the source files. Other errors, apparently unrelated but in fact caused by the clock skew, can occur along with the clock skew warnings. These secondary errors may tend to obscure the fact that the true root cause of the problem is an out-of-sync clock.</p>
-<p>If you see these warnings, reset the clock on the build machine, run "<code>gmake clobber</code>" or delete the directory containing the build output, and restart the build from the beginning.</p>
-<ul>
-<li><strong>Error message: <code>Trouble writing out table to disk</code></strong><br />
-Increase the amount of swap space on your build machine. This could be caused by overloading the system and it may be necessary to use:</li>
-</ul>
-<blockquote>
-<p><code>make JOBS=1</code></p>
-</blockquote>
-<p>to reduce the load on the system.</p>
-<ul>
-<li><p><strong>Error Message: <code>libstdc++ not found</code>:</strong><br />
-This is caused by a missing libstdc++.a library. This is installed as part of a specific package (e.g. libstdc++.so.devel.386). By default some 64-bit Linux versions (e.g. Fedora) only install the 64-bit version of the libstdc++ package. Various parts of the JDK build require a static link of the C++ runtime libraries to allow for maximum portability of the built images.</p></li>
-<li><p><strong>Linux Error Message: <code>cannot restore segment prot after reloc</code></strong><br />
-This is probably an issue with SELinux (See <a href="http://en.wikipedia.org/wiki/SELinux">SELinux on Wikipedia</a>). Parts of the VM is built without the <code>-fPIC</code> for performance reasons.</p></li>
-</ul>
-<p>To completely disable SELinux:</p>
-<ol type="1">
-<li><code>$ su root</code></li>
-<li><code># system-config-securitylevel</code></li>
-<li><code>In the window that appears, select the SELinux tab</code></li>
-<li><code>Disable SELinux</code></li>
-</ol>
-<p>Alternatively, instead of completely disabling it you could disable just this one check.</p>
-<ol type="1">
-<li>Select System->Administration->SELinux Management</li>
-<li>In the SELinux Management Tool which appears, select "Boolean" from the menu on the left</li>
-<li>Expand the "Memory Protection" group</li>
-<li>Check the first item, labeled "Allow all unconfined executables to use libraries requiring text relocation ..."</li>
-</ol>
-<ul>
-<li><strong>Windows Error Messages:</strong><br />
-<code>*** fatal error - couldn't allocate heap, ...</code><br />
-<code>rm fails with "Directory not empty"</code><br />
-<code>unzip fails with "cannot create ... Permission denied"</code><br />
-<code>unzip fails with "cannot create ... Error 50"</code></li>
-</ul>
-<p>The CYGWIN software can conflict with other non-CYGWIN software. See the CYGWIN FAQ section on <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda">BLODA (applications that interfere with CYGWIN)</a>.</p>
-<ul>
-<li><strong>Windows Error Message: <code>spawn failed</code></strong><br />
-Try rebooting the system, or there could be some kind of issue with the disk or disk partition being used. Sometimes it comes with a "Permission Denied" message.</li>
-</ul>
-<hr />
-<h2 id="appendix-b-gnu-make">Appendix B: GNU make</h2>
-<p>The Makefiles in the OpenJDK are only valid when used with the GNU version of the utility command <code>make</code> (usually called <code>gmake</code> on Solaris). A few notes about using GNU make:</p>
-<ul>
-<li>You need GNU make version 3.81 or newer. On Windows 4.0 or newer is recommended. If the GNU make utility on your systems is not of a suitable version, see "<a href="#buildgmake">Building GNU make</a>".</li>
-<li>Place the location of the GNU make binary in the <code>PATH</code>.</li>
-<li><strong>Solaris:</strong> Do NOT use <code>/usr/bin/make</code> on Solaris. If your Solaris system has the software from the Solaris Developer Companion CD installed, you should try and use <code>/usr/bin/gmake</code> or <code>/usr/gnu/bin/make</code>.</li>
-<li><strong>Windows:</strong> Make sure you start your build inside a bash shell.</li>
-<li><strong>Mac OS X:</strong> The XCode "command line tools" must be installed on your Mac.</li>
+<li><p><code>--with-num-cores</code> -- number of cores in the build system, e.g. <code>--with-num-cores=8</code>.</p></li>
+<li><p><code>--with-memory-size</code> -- memory (in MB) available in the build system, e.g. <code>--with-memory-size=1024</code></p></li>
</ul>
-<p>Information on GNU make, and access to ftp download sites, are available on the <a href="http://www.gnu.org/software/make/make.html">GNU make web site</a>. The latest source to GNU make is available at <a href="http://ftp.gnu.org/pub/gnu/make/">ftp.gnu.org/pub/gnu/make/</a>.</p>
-<h3 id="building-gnu-make">Building GNU make</h3>
-<p>First step is to get the GNU make 3.81 or newer source from <a href="http://ftp.gnu.org/pub/gnu/make/">ftp.gnu.org/pub/gnu/make/</a>. Building is a little different depending on the OS but is basically done with:</p>
-<pre><code> bash ./configure
- make</code></pre>
-<hr />
-<h2 id="appendix-c-build-environments">Appendix C: Build Environments</h2>
-<h3 id="minimum-build-environments">Minimum Build Environments</h3>
-<p>This file often describes specific requirements for what we call the "minimum build environments" (MBE) for this specific release of the JDK. What is listed below is what the Oracle Release Engineering Team will use to build the Oracle JDK product. Building with the MBE will hopefully generate the most compatible bits that install on, and run correctly on, the most variations of the same base OS and hardware architecture. In some cases, these represent what is often called the least common denominator, but each Operating System has different aspects to it.</p>
-<p>In all cases, the Bootstrap JDK version minimum is critical, we cannot guarantee builds will work with older Bootstrap JDK's. Also in all cases, more RAM and more processors is better, the minimums listed below are simply recommendations.</p>
-<p>With Solaris and Mac OS X, the version listed below is the oldest release we can guarantee builds and works, and the specific version of the compilers used could be critical.</p>
-<p>With Windows the critical aspect is the Visual Studio compiler used, which due to it's runtime, generally dictates what Windows systems can do the builds and where the resulting bits can be used.</p>
-<p><strong>NOTE: We expect a change here off these older Windows OS releases and to a 'less older' one, probably Windows 2008R2 X64.</strong></p>
-<p>With Linux, it was just a matter of picking a stable distribution that is a good representative for Linux in general.</p>
-<p>It is understood that most developers will NOT be using these specific versions, and in fact creating these specific versions may be difficult due to the age of some of this software. It is expected that developers are more often using the more recent releases and distributions of these operating systems.</p>
-<p>Compilation problems with newer or different C/C++ compilers is a common problem. Similarly, compilation problems related to changes to the <code>/usr/include</code> or system header files is also a common problem with older, newer, or unreleased OS versions. Please report these types of problems as bugs so that they can be dealt with accordingly.</p>
-<p>Bootstrap JDK: JDK 8</p>
-<table>
-<thead>
-<tr class="header">
-<th style="text-align: left;">Base OS and Architecture</th>
-<th style="text-align: left;">OS</th>
-<th style="text-align: left;">C/C++ Compiler</th>
-<th style="text-align: left;">Processors</th>
-<th style="text-align: left;">RAM Minimum</th>
-<th style="text-align: left;">DISK Needs</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td style="text-align: left;">Linux X86 (32-bit) and X64 (64-bit)</td>
-<td style="text-align: left;">Oracle Enterprise Linux 6.4</td>
-<td style="text-align: left;">gcc 4.9.2</td>
-<td style="text-align: left;">2 or more</td>
-<td style="text-align: left;">1 GB</td>
-<td style="text-align: left;">6 GB</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">Solaris SPARCV9 (64-bit)</td>
-<td style="text-align: left;">Solaris 11 Update 1</td>
-<td style="text-align: left;">Studio 12 Update 4 + patches</td>
-<td style="text-align: left;">4 or more</td>
-<td style="text-align: left;">4 GB</td>
-<td style="text-align: left;">8 GB</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">Solaris X64 (64-bit)</td>
-<td style="text-align: left;">Solaris 11 Update 1</td>
-<td style="text-align: left;">Studio 12 Update 4 + patches</td>
-<td style="text-align: left;">4 or more</td>
-<td style="text-align: left;">4 GB</td>
-<td style="text-align: left;">8 GB</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">Windows X86 (32-bit)</td>
-<td style="text-align: left;">Windows Server 2012 R2 x64</td>
-<td style="text-align: left;">Microsoft Visual Studio C++ 2013 Professional Edition</td>
-<td style="text-align: left;">2 or more</td>
-<td style="text-align: left;">2 GB</td>
-<td style="text-align: left;">6 GB</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">Windows X64 (64-bit)</td>
-<td style="text-align: left;">Windows Server 2012 R2 x64</td>
-<td style="text-align: left;">Microsoft Visual Studio C++ 2013 Professional Edition</td>
-<td style="text-align: left;">2 or more</td>
-<td style="text-align: left;">2 GB</td>
-<td style="text-align: left;">6 GB</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">Mac OS X X64 (64-bit)</td>
-<td style="text-align: left;">Mac OS X 10.9 "Mavericks"</td>
-<td style="text-align: left;">Xcode 6.3 or newer</td>
-<td style="text-align: left;">2 or more</td>
-<td style="text-align: left;">4 GB</td>
-<td style="text-align: left;">6 GB</td>
-</tr>
-</tbody>
-</table>
-<hr />
-<h3 id="specific-developer-build-environments">Specific Developer Build Environments</h3>
-<p>We won't be listing all the possible environments, but we will try to provide what information we have available to us.</p>
-<p><strong>NOTE: The community can help out by updating this part of the document.</strong></p>
-<h4 id="fedora">Fedora</h4>
-<p>After installing the latest <a href="http://fedoraproject.org">Fedora</a> you need to install several build dependencies. The simplest way to do it is to execute the following commands as user <code>root</code>:</p>
-<pre><code> yum-builddep java-1.7.0-openjdk
- yum install gcc gcc-c++</code></pre>
-<p>In addition, it's necessary to set a few environment variables for the build:</p>
-<pre><code> export LANG=C
- export PATH="/usr/lib/jvm/java-openjdk/bin:${PATH}"</code></pre>
-<h4 id="centos-5.5">CentOS 5.5</h4>
-<p>After installing <a href="http://www.centos.org/">CentOS 5.5</a> you need to make sure you have the following Development bundles installed:</p>
+<p>You can also specify directly the number of build jobs to use with <code>--with-jobs=N</code> to <code>configure</code>, or <code>JOBS=N</code> to <code>make</code>. Do not use the <code>-j</code> flag to <code>make</code>. In most cases it will be ignored by the makefiles, but it can cause problems for some make targets.</p>
+<p>It might also be necessary to specify the JVM arguments passed to the Boot JDK, using e.g. <code>--with-boot-jdk-jvmargs="-Xmx8G"</code>. Doing so will override the default JVM arguments passed to the Boot JDK.</p>
+<p>At the end of a successful execution of <code>configure</code>, you will get a performance summary, indicating how well the build will perform. Here you will also get performance hints. If you want to build fast, pay attention to those!</p>
+<p>If you want to tweak build performance, run with <code>make LOG=info</code> to get a build time summary at the end of the build process.</p>
+<h3 id="disk-speed">Disk Speed</h3>
+<p>If you are using network shares, e.g. via NFS, for your source code, make sure the build directory is situated on local disk (e.g. by <code>ln -s /localdisk/jdk-build $JDK-SHARE/build</code>). The performance penalty is extremely high for building on a network share; close to unusable.</p>
+<p>Also, make sure that your build tools (including Boot JDK and toolchain) is located on a local disk and not a network share.</p>
+<p>As has been stressed elsewhere, do use SSD for source code and build directory, as well as (if possible) the build tools.</p>
+<h3 id="virus-checking">Virus Checking</h3>
+<p>The use of virus checking software, especially on Windows, can <em>significantly</em> slow down building of OpenJDK. If possible, turn off such software, or exclude the directory containing the OpenJDK source code from on-the-fly checking.</p>
+<h3 id="ccache">Ccache</h3>
+<p>The OpenJDK build supports building with ccache when using gcc or clang. Using ccache can radically speed up compilation of native code if you often rebuild the same sources. Your milage may vary however, so we recommend evaluating it for yourself. To enable it, make sure it's on the path and configure with <code>--enable-ccache</code>.</p>
+<h3 id="precompiled-headers">Precompiled Headers</h3>
+<p>By default, the Hotspot build uses preccompiled headers (PCH) on the toolchains were it is properly supported (clang, gcc, and Visual Studio). Normally, this speeds up the build process, but in some circumstances, it can actually slow things down.</p>
+<p>You can experiment by disabling precompiled headers using <code>--disable-precompiled-headers</code>.</p>
+<h3 id="icecc-icecream">Icecc / icecream</h3>
+<p><a href="http://github.com/icecc/icecream">icecc/icecream</a> is a simple way to setup a distributed compiler network. If you have multiple machines available for building OpenJDK, you can drastically cut individual build times by utilizing it.</p>
+<p>To use, setup an icecc network, and install icecc on the build machine. Then run <code>configure</code> using <code>--enable-icecc</code>.</p>
+<h3 id="using-sjavac">Using sjavac</h3>
+<p>To speed up Java compilation, especially incremental compilations, you can try the experimental sjavac compiler by using <code>--enable-sjavac</code>.</p>
+<h3 id="building-the-right-target">Building the Right Target</h3>
+<p>Selecting the proper target to build can have dramatic impact on build time. For normal usage, <code>jdk</code> or the default target is just fine. You only need to build <code>images</code> for shipping, or if your tests require it.</p>
+<p>See also <a href="#using-fine-grained-make-targets">Using Fine-Grained Make Targets</a> on how to build an even smaller subset of the product.</p>
+<h2 id="troubleshooting">Troubleshooting</h2>
+<p>If your build fails, it can sometimes be difficult to pinpoint the problem or find a proper solution.</p>
+<h3 id="locating-the-source-of-the-error">Locating the Source of the Error</h3>
+<p>When a build fails, it can be hard to pinpoint the actual cause of the error. In a typical build process, different parts of the product build in parallel, with the output interlaced.</p>
+<h4 id="build-failure-summary">Build Failure Summary</h4>
+<p>To help you, the build system will print a failure summary at the end. It looks like this:</p>
+<pre><code>ERROR: Build failed for target 'hotspot' in configuration 'linux-x64' (exit code 2)
+
+=== Output from failing command(s) repeated here ===
+* For target hotspot_variant-server_libjvm_objs_psMemoryPool.o:
+/localhome/hg/jdk9-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: 'failhere' does not name a type
+ ... (rest of output omitted)
+
+* All command lines available in /localhome/hg/jdk9-sandbox/build/linux-x64/make-support/failure-logs.
+=== End of repeated output ===
+
+=== Make failed targets repeated here ===
+lib/CompileJvm.gmk:207: recipe for target '/localhome/hg/jdk9-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o' failed
+make/Main.gmk:263: recipe for target 'hotspot-server-libs' failed
+=== End of repeated output ===
+
+Hint: Try searching the build log for the name of the first failed target.
+Hint: If caused by a warning, try configure --disable-warnings-as-errors.</code></pre>
+<p>Let's break it down! First, the selected configuration, and the top-level target you entered on the command line that caused the failure is printed.</p>
+<p>Then, between the <code>Output from failing command(s) repeated here</code> and <code>End of repeated output</code> the first lines of output (stdout and stderr) from the actual failing command is repeated. In most cases, this is the error message that caused the build to fail. If multiple commands were failing (this can happen in a parallel build), output from all failed commands will be printed here.</p>
+<p>The path to the <code>failure-logs</code> directory is printed. In this file you will find a <code><target>.log</code> file that contains the output from this command in its entirety, and also a <code><target>.cmd</code>, which contain the complete command line used for running this command. You can re-run the failing command by executing <code>. <path to failure-logs>/<target>.cmd</code> in your shell.</p>
+<p>Another way to trace the failure is to follow the chain of make targets, from top-level targets to individual file targets. Between <code>Make failed targets repeated here</code> and <code>End of repeated output</code> the output from make showing this chain is repeated. The first failed recipe will typically contain the full path to the file in question that failed to compile. Following lines will show a trace of make targets why we ended up trying to compile that file.</p>
+<p>Finally, some hints are given on how to locate the error in the complete log. In this example, we would try searching the log file for "<code>psMemoryPool.o</code>". Another way to quickly locate make errors in the log is to search for "<code>] Error</code>" or "<code>***</code>".</p>
+<p>Note that the build failure summary will only help you if the issue was a compilation failure or similar. If the problem is more esoteric, or is due to errors in the build machinery, you will likely get empty output logs, and <code>No indication of failed target found</code> instead of the make target chain.</p>
+<h4 id="checking-the-build-log-file">Checking the Build Log File</h4>
+<p>The output (stdout and stderr) from the latest build is always stored in <code>$BUILD/build.log</code>. The previous build log is stored as <code>build.log.old</code>. This means that it is not necessary to redirect the build output yourself if you want to process it.</p>
+<p>You can increase the verbosity of the log file, by the <code>LOG</code> control variable to <code>make</code>. If you want to see the command lines used in compilations, use <code>LOG=cmdlines</code>. To increase the general verbosity, use <code>LOG=info</code>, <code>LOG=debug</code> or <code>LOG=trace</code>. Both of these can be combined with <code>cmdlines</code>, e.g. <code>LOG=info,cmdlines</code>. The <code>debug</code> log level will show most shell commands executed by make, and <code>trace</code> will show all. Beware that both these log levels will produce a massive build log!</p>
+<h3 id="fixing-unexpected-build-failures">Fixing Unexpected Build Failures</h3>
+<p>Most of the time, the build will fail due to incorrect changes in the source code.</p>
+<p>Sometimes the build can fail with no apparent changes that have caused the failure. If this is the first time you are building OpenJDK on this particular computer, and the build fails, the problem is likely with your build environment. But even if you have previously built OpenJDK with success, and it now fails, your build environment might have changed (perhaps due to OS upgrades or similar). But most likely, such failures are due to problems with the incremental rebuild.</p>
+<h4 id="problems-with-the-build-environment">Problems with the Build Environment</h4>
+<p>Make sure your configuration is correct. Re-run <code>configure</code>, and look for any warnings. Warnings that appear in the middle of the <code>configure</code> output is also repeated at the end, after the summary. The entire log is stored in <code>$BUILD/configure.log</code>.</p>
+<p>Verify that the summary at the end looks correct. Are you indeed using the Boot JDK and native toolchain that you expect?</p>
+<p>By default, OpenJDK has a strict approach where warnings from the compiler is considered errors which fail the build. For very new or very old compiler versions, this can trigger new classes of warnings, which thus fails the build. Run <code>configure</code> with <code>--disable-warnings-as-errors</code> to turn of this behavior. (The warnings will still show, but not make the build fail.)</p>
+<h4 id="problems-with-incremental-rebuilds">Problems with Incremental Rebuilds</h4>
+<p>Incremental rebuilds mean that when you modify part of the product, only the affected parts get rebuilt. While this works great in most cases, and significantly speed up the development process, from time to time complex interdependencies will result in an incorrect build result. This is the most common cause for unexpected build problems, together with inconsistencies between the different Mercurial repositories in the forest.</p>
+<p>Here are a suggested list of things to try if you are having unexpected build problems. Each step requires more time than the one before, so try them in order. Most issues will be solved at step 1 or 2.</p>
+<ol type="1">
+<li><p>Make sure your forest is up-to-date</p>
+<p>Run <code>bash get_source.sh</code> to make sure you have the latest version of all repositories.</p></li>
+<li><p>Clean build results</p>
+<p>The simplest way to fix incremental rebuild issues is to run <code>make clean</code>. This will remove all build results, but not the configuration or any build system support artifacts. In most cases, this will solve build errors resulting from incremental build mismatches.</p></li>
+<li><p>Completely clean the build directory.</p>
+<p>If this does not work, the next step is to run <code>make dist-clean</code>, or removing the build output directory (<code>$BUILD</code>). This will clean all generated output, including your configuration. You will need to re-run <code>configure</code> after this step. A good idea is to run <code>make print-configuration</code> before running <code>make dist-clean</code>, as this will print your current <code>configure</code> command line. Here's a way to do this:</p>
+<pre><code>make print-configuration > current-configuration
+make dist-clean
+bash configure $(cat current-configuration)
+make</code></pre></li>
+<li><p>Re-clone the Mercurial forest</p>
+<p>Sometimes the Mercurial repositories themselves gets in a state that causes the product to be un-buildable. In such a case, the simplest solution is often the "sledgehammer approach": delete the entire forest, and re-clone it. If you have local changes, save them first to a different location using <code>hg export</code>.</p></li>
+</ol>
+<h3 id="specific-build-issues">Specific Build Issues</h3>
+<h4 id="clock-skew">Clock Skew</h4>
+<p>If you get an error message like this:</p>
+<pre><code>File 'xxx' has modification time in the future.
+Clock skew detected. Your build may be incomplete.</code></pre>
+<p>then the clock on your build machine is out of sync with the timestamps on the source files. Other errors, apparently unrelated but in fact caused by the clock skew, can occur along with the clock skew warnings. These secondary errors may tend to obscure the fact that the true root cause of the problem is an out-of-sync clock.</p>
+<p>If you see these warnings, reset the clock on the build machine, run <code>make clean</code> and restart the build.</p>
+<h4 id="out-of-memory-errors">Out of Memory Errors</h4>
+<p>On Solaris, you might get an error message like this:</p>
+<pre><code>Trouble writing out table to disk</code></pre>
+<p>To solve this, increase the amount of swap space on your build machine.</p>
+<p>On Windows, you might get error messages like this:</p>
+<pre><code>fatal error - couldn't allocate heap
+cannot create ... Permission denied
+spawn failed</code></pre>
+<p>This can be a sign of a Cygwin problem. See the information about solving problems in the <a href="#cygwin">Cygwin</a> section. Rebooting the computer might help temporarily.</p>
+<h3 id="getting-help">Getting Help</h3>
+<p>If none of the suggestions in this document helps you, or if you find what you believe is a bug in the build system, please contact the Build Group by sending a mail to <a href="mailto:build-dev@openjdk.java.net">build-dev@openjdk.java.net</a>. Please include the relevant parts of the configure and/or build log.</p>
+<p>If you need general help or advice about developing for OpenJDK, you can also contact the Adoption Group. See the section on <a href="#contributing-to-openjdk">Contributing to OpenJDK</a> for more information.</p>
+<h2 id="hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</h2>
+<h3 id="setting-up-a-forest-for-pushing-changes-defpath">Setting Up a Forest for Pushing Changes (defpath)</h3>
+<p>To help you prepare a proper push path for a Mercurial repository, there exists a useful tool known as <a href="http://openjdk.java.net/projects/code-tools/defpath">defpath</a>. It will help you setup a proper push path for pushing changes to OpenJDK.</p>
+<p>Install the extension by cloning <code>http://hg.openjdk.java.net/code-tools/defpath</code> and updating your <code>.hgrc</code> file. Here's one way to do this:</p>
+<pre><code>cd ~
+mkdir hg-ext
+cd hg-ext
+hg clone http://hg.openjdk.java.net/code-tools/defpath
+cat << EOT >> ~/.hgrc
+[extensions]
+defpath=~/hg-ext/defpath/defpath.py
+EOT</code></pre>
+<p>You can now setup a proper push path using:</p>
+<pre><code>hg defpath -d -u <your OpenJDK username></code></pre>
+<p>If you also have the <code>trees</code> extension installed in Mercurial, you will automatically get a <code>tdefpath</code> command, which is even more useful. By running <code>hg tdefpath -du <username></code> in the top repository of your forest, all repos will get setup automatically. This is the recommended usage.</p>
+<h3 id="bash-completion">Bash Completion</h3>
+<p>The <code>configure</code> and <code>make</code> commands tries to play nice with bash command-line completion (using <code><tab></code> or <code><tab><tab></code>). To use this functionality, make sure you enable completion in your <code>~/.bashrc</code> (see instructions for bash in your operating system).</p>
+<p>Make completion will work out of the box, and will complete valid make targets. For instance, typing <code>make jdk-i<tab></code> will complete to <code>make jdk-image</code>.</p>
+<p>The <code>configure</code> script can get completion for options, but for this to work you need to help <code>bash</code> on the way. The standard way of running the script, <code>bash configure</code>, will not be understood by bash completion. You need <code>configure</code> to be the command to run. One way to achieve this is to add a simple helper script to your path:</p>
+<pre><code>cat << EOT > /tmp/configure
+#!/bin/bash
+if [ \$(pwd) = \$(cd \$(dirname \$0); pwd) ] ; then
+ echo >&2 "Abort: Trying to call configure helper recursively"
+ exit 1
+fi
+
+bash \$PWD/configure "\$@"
+EOT
+chmod +x /tmp/configure
+sudo mv /tmp/configure /usr/local/bin</code></pre>
+<p>Now <code>configure --en<tab>-dt<tab></code> will result in <code>configure --enable-dtrace</code>.</p>
+<h3 id="using-multiple-configurations">Using Multiple Configurations</h3>
+<p>You can have multiple configurations for a single source forest. When you create a new configuration, run <code>configure --with-conf-name=<name></code> to create a configuration with the name <code><name></code>. Alternatively, you can create a directory under <code>build</code> and run <code>configure</code> from there, e.g. <code>mkdir build/<name> && cd build/<name> && bash ../../configure</code>.</p>
+<p>Then you can build that configuration using <code>make CONF_NAME=<name></code> or <code>make CONF=<pattern></code>, where <code><pattern></code> is a substring matching one or several configurations, e.g. <code>CONF=debug</code>. The special empty pattern (<code>CONF=</code>) will match <em>all</em> available configuration, so <code>make CONF= hotspot</code> will build the <code>hotspot</code> target for all configurations. Alternatively, you can execute <code>make</code> in the configuration directory, e.g. <code>cd build/<name> && make</code>.</p>
+<h3 id="handling-reconfigurations">Handling Reconfigurations</h3>
+<p>If you update the forest and part of the configure script has changed, the build system will force you to re-run <code>configure</code>.</p>
+<p>Most of the time, you will be fine by running <code>configure</code> again with the same arguments as the last time, which can easily be performed by <code>make reconfigure</code>. To simplify this, you can use the <code>CONF_CHECK</code> make control variable, either as <code>make CONF_CHECK=auto</code>, or by setting an environment variable. For instance, if you add <code>export CONF_CHECK=auto</code> to your <code>.bashrc</code> file, <code>make</code> will always run <code>reconfigure</code> automatically whenever the configure script has changed.</p>
+<p>You can also use <code>CONF_CHECK=ignore</code> to skip the check for a needed configure update. This might speed up the build, but comes at the risk of an incorrect build result. This is only recommended if you know what you're doing.</p>
+<p>From time to time, you will also need to modify the command line to <code>configure</code> due to changes. Use <code>make print-configure</code> to show the command line used for your current configuration.</p>
+<h3 id="using-fine-grained-make-targets">Using Fine-Grained Make Targets</h3>
+<p>The default behavior for make is to create consistent and correct output, at the expense of build speed, if necessary.</p>
+<p>If you are prepared to take some risk of an incorrect build, and know enough of the system to understand how things build and interact, you can speed up the build process considerably by instructing make to only build a portion of the product.</p>
+<h4 id="building-individual-modules">Building Individual Modules</h4>
+<p>The safe way to use fine-grained make targets is to use the module specific make targets. All source code in JDK 9 is organized so it belongs to a module, e.g. <code>java.base</code> or <code>jdk.jdwp.agent</code>. You can build only a specific module, by giving it as make target: <code>make jdk.jdwp.agent</code>. If the specified module depends on other modules (e.g. <code>java.base</code>), those modules will be built first.</p>
+<p>You can also specify a set of modules, just as you can always specify a set of make targets: <code>make jdk.crypto.cryptoki jdk.crypto.ec jdk.crypto.mscapi jdk.crypto.ucrypto</code></p>
+<h4 id="building-individual-module-phases">Building Individual Module Phases</h4>
+<p>The build process for each module is divided into separate phases. Not all modules need all phases. Which are needed depends on what kind of source code and other artifact the module consists of. The phases are:</p>
<ul>
-<li>Development Libraries</li>
-<li>Development Tools</li>
-<li>Java Development</li>
-<li>X Software Development (Including XFree86-devel)</li>
+<li><code>gensrc</code> (Generate source code to compile)</li>
+<li><code>gendata</code> (Generate non-source code artifacts)</li>
+<li><code>copy</code> (Copy resource artifacts)</li>
+<li><code>java</code> (Compile Java code)</li>
+<li><code>launchers</code> (Compile native executables)</li>
+<li><code>libs</code> (Compile native libraries)</li>
+<li><code>rmic</code> (Run the <code>rmic</code> tool)</li>
</ul>
-<p>Plus the following packages:</p>
+<p>You can build only a single phase for a module by using the notation <code>$MODULE-$PHASE</code>. For instance, to build the <code>gensrc</code> phase for <code>java.base</code>, use <code>make java.base-gensrc</code>.</p>
+<p>Note that some phases may depend on others, e.g. <code>java</code> depends on <code>gensrc</code> (if present). Make will build all needed prerequisites before building the requested phase.</p>
+<h4 id="skipping-the-dependency-check">Skipping the Dependency Check</h4>
+<p>When using an iterative development style with frequent quick rebuilds, the dependency check made by make can take up a significant portion of the time spent on the rebuild. In such cases, it can be useful to bypass the dependency check in make.</p>
+<blockquote>
+<p><strong>Note that if used incorrectly, this can lead to a broken build!</strong></p>
+</blockquote>
+<p>To achieve this, append <code>-only</code> to the build target. For instance, <code>make jdk.jdwp.agent-java-only</code> will <em>only</em> build the <code>java</code> phase of the <code>jdk.jdwp.agent</code> module. If the required dependencies are not present, the build can fail. On the other hand, the execution time measures in milliseconds.</p>
+<p>A useful pattern is to build the first time normally (e.g. <code>make jdk.jdwp.agent</code>) and then on subsequent builds, use the <code>-only</code> make target.</p>
+<h4 id="rebuilding-part-of-java.base-jdk_filter">Rebuilding Part of java.base (JDK_FILTER)</h4>
+<p>If you are modifying files in <code>java.base</code>, which is the by far largest module in OpenJDK, then you need to rebuild all those files whenever a single file has changed. (This inefficiency will hopefully be addressed in JDK 10.)</p>
+<p>As a hack, you can use the make control variable <code>JDK_FILTER</code> to specify a pattern that will be used to limit the set of files being recompiled. For instance, <code>make java.base JDK_FILTER=javax/crypto</code> (or, to combine methods, <code>make java.base-java-only JDK_FILTER=javax/crypto</code>) will limit the compilation to files in the <code>javax.crypto</code> package.</p>
+<h3 id="learn-about-mercurial">Learn About Mercurial</h3>
+<p>To become an efficient OpenJDK developer, it is recommended that you invest in learning Mercurial properly. Here are some links that can get you started:</p>
<ul>
-<li>cups devel: Cups Development Package</li>
-<li>alsa devel: Alsa Development Package</li>
-<li>Xi devel: libXi.so Development Package</li>
+<li><a href="http://www.mercurial-scm.org/wiki/GitConcepts">Mercurial for git users</a></li>
+<li><a href="http://www.mercurial-scm.org/wiki/Tutorial">The official Mercurial tutorial</a></li>
+<li><a href="http://hginit.com/">hg init</a></li>
+<li><a href="http://hgbook.red-bean.com/read/">Mercurial: The Definitive Guide</a></li>
</ul>
-<p>The freetype 2.3 packages don't seem to be available, but the freetype 2.3 sources can be downloaded, built, and installed easily enough from <a href="http://downloads.sourceforge.net/freetype">the freetype site</a>. Build and install with something like:</p>
-<pre><code> bash ./configure
- make
- sudo -u root make install</code></pre>
-<p>Mercurial packages could not be found easily, but a Google search should find ones, and they usually include Python if it's needed.</p>
-<h4 id="debian-5.0-lenny">Debian 5.0 (Lenny)</h4>
-<p>After installing <a href="http://debian.org">Debian</a> 5 you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands as user <code>root</code>:</p>
-<pre><code> aptitude build-dep openjdk-7
- aptitude install openjdk-7-jdk libmotif-dev</code></pre>
-<p>In addition, it's necessary to set a few environment variables for the build:</p>
-<pre><code> export LANG=C
- export PATH="/usr/lib/jvm/java-7-openjdk/bin:${PATH}"</code></pre>
-<h4 id="ubuntu-12.04">Ubuntu 12.04</h4>
-<p>After installing <a href="http://ubuntu.org">Ubuntu</a> 12.04 you need to install several build dependencies. The simplest way to do it is to execute the following commands:</p>
-<pre><code> sudo aptitude build-dep openjdk-7
- sudo aptitude install openjdk-7-jdk</code></pre>
-<p>In addition, it's necessary to set a few environment variables for the build:</p>
-<pre><code> export LANG=C
- export PATH="/usr/lib/jvm/java-7-openjdk/bin:${PATH}"</code></pre>
-<h4 id="opensuse-11.1">OpenSUSE 11.1</h4>
-<p>After installing <a href="http://opensuse.org">OpenSUSE</a> 11.1 you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands:</p>
-<pre><code> sudo zypper source-install -d java-1_7_0-openjdk
- sudo zypper install make</code></pre>
-<p>In addition, it is necessary to set a few environment variables for the build:</p>
-<pre><code> export LANG=C
- export PATH="/usr/lib/jvm/java-1.7.0-openjdk/bin:$[PATH}"</code></pre>
-<p>Finally, you need to unset the <code>JAVA_HOME</code> environment variable:</p>
-<pre><code> export -n JAVA_HOME`</code></pre>
-<h4 id="mandriva-linux-one-2009-spring">Mandriva Linux One 2009 Spring</h4>
-<p>After installing <a href="http://mandriva.org">Mandriva</a> Linux One 2009 Spring you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands as user <code>root</code>:</p>
-<pre><code> urpmi java-1.7.0-openjdk-devel make gcc gcc-c++ freetype-devel zip unzip
- libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel
- libxtst6-devel libxi-devel</code></pre>
-<p>In addition, it is necessary to set a few environment variables for the build:</p>
-<pre><code> export LANG=C
- export PATH="/usr/lib/jvm/java-1.7.0-openjdk/bin:${PATH}"</code></pre>
-<h4 id="opensolaris-2009.06">OpenSolaris 2009.06</h4>
-<p>After installing <a href="http://opensolaris.org">OpenSolaris</a> 2009.06 you need to install several build dependencies. The simplest way to install the build dependencies is to execute the following commands:</p>
-<pre><code> pfexec pkg install SUNWgmake SUNWj7dev sunstudioexpress SUNWcups SUNWzip
- SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2</code></pre>
-<p>In addition, it is necessary to set a few environment variables for the build:</p>
-<pre><code> export LANG=C
- export PATH="/opt/SunStudioExpress/bin:${PATH}"</code></pre>
-<hr />
-<p>End of the OpenJDK build README document.</p>
-<p>Please come again!</p>
+<h2 id="understanding-the-build-system">Understanding the Build System</h2>
+<p>This section will give you a more technical description on the details of the build system.</p>
+<h3 id="configurations">Configurations</h3>
+<p>The build system expects to find one or more configuration. These are technically defined by the <code>spec.gmk</code> in a subdirectory to the <code>build</code> subdirectory. The <code>spec.gmk</code> file is generated by <code>configure</code>, and contains in principle the configuration (directly or by files included by <code>spec.gmk</code>).</p>
+<p>You can, in fact, select a configuration to build by pointing to the <code>spec.gmk</code> file with the <code>SPEC</code> make control variable, e.g. <code>make SPEC=$BUILD/spec.gmk</code>. While this is not the recommended way to call <code>make</code> as a user, it is what is used under the hood by the build system.</p>
+<h3 id="build-output-structure">Build Output Structure</h3>
+<p>The build output for a configuration will end up in <code>build/<configuration name></code>, which we refer to as <code>$BUILD</code> in this document. The <code>$BUILD</code> directory contains the following important directories:</p>
+<pre><code>buildtools/
+configure-support/
+hotspot/
+images/
+jdk/
+make-support/
+support/
+test-results/
+test-support/</code></pre>
+<p>This is what they are used for:</p>
+<ul>
+<li><p><code>images</code>: This is the directory were the output of the <code>*-image</code> make targets end up. For instance, <code>make jdk-image</code> ends up in <code>images/jdk</code>.</p></li>
+<li><p><code>jdk</code>: This is the "exploded image". After <code>make jdk</code>, you will be able to launch the newly built JDK by running <code>$BUILD/jdk/bin/java</code>.</p></li>
+<li><p><code>test-results</code>: This directory contains the results from running tests.</p></li>
+<li><p><code>support</code>: This is an area for intermediate files needed during the build, e.g. generated source code, object files and class files. Some noteworthy directories in <code>support</code> is <code>gensrc</code>, which contains the generated source code, and the <code>modules_*</code> directories, which contains the files in a per-module hierarchy that will later be collapsed into the <code>jdk</code> directory of the exploded image.</p></li>
+<li><p><code>buildtools</code>: This is an area for tools compiled for the build platform that are used during the rest of the build.</p></li>
+<li><p><code>hotspot</code>: This is an area for intermediate files needed when building hotspot.</p></li>
+<li><p><code>configure-support</code>, <code>make-support</code> and <code>test-support</code>: These directories contain files that are needed by the build system for <code>configure</code>, <code>make</code> and for running tests.</p></li>
+</ul>
+<h3 id="fixpath">Fixpath</h3>
+<p>Windows path typically look like <code>C:\User\foo</code>, while Unix paths look like <code>/home/foo</code>. Tools with roots from Unix often experience issues related to this mismatch when running on Windows.</p>
+<p>In the OpenJDK build, we always use Unix paths internally, and only just before calling a tool that does not understand Unix paths do we convert them to Windows paths.</p>
+<p>This conversion is done by the <code>fixpath</code> tool, which is a small wrapper that modifies unix-style paths to Windows-style paths in command lines. Fixpath is compiled automatically by <code>configure</code>.</p>
+<h3 id="native-debug-symbols">Native Debug Symbols</h3>
+<p>Native libraries and executables can have debug symbol (and other debug information) associated with them. How this works is very much platform dependent, but a common problem is that debug symbol information takes a lot of disk space, but is rarely needed by the end user.</p>
+<p>The OpenJDK supports different methods on how to handle debug symbols. The method used is selected by <code>--with-native-debug-symbols</code>, and available methods are <code>none</code>, <code>internal</code>, <code>external</code>, <code>zipped</code>.</p>
+<ul>
+<li><p><code>none</code> means that no debug symbols will be generated during the build.</p></li>
+<li><p><code>internal</code> means that debug symbols will be generated during the build, and they will be stored in the generated binary.</p></li>
+<li><p><code>external</code> means that debug symbols will be generated during the build, and after the compilation, they will be moved into a separate <code>.debuginfo</code> file. (This was previously known as FDS, Full Debug Symbols).</p></li>
+<li><p><code>zipped</code> is like <code>external</code>, but the .debuginfo file will also be zipped into a <code>.diz</code> file.</p></li>
+</ul>
+<p>When building for distribution, <code>zipped</code> is a good solution. Binaries built with <code>internal</code> is suitable for use by developers, since they facilitate debugging, but should be stripped before distributed to end users.</p>
+<h3 id="autoconf-details">Autoconf Details</h3>
+<p>The <code>configure</code> script is based on the autoconf framework, but in some details deviate from a normal autoconf <code>configure</code> script.</p>
+<p>The <code>configure</code> script in the top level directory of OpenJDK is just a thin wrapper that calls <code>common/autoconf/configure</code>. This in turn provides functionality that is not easily expressed in the normal Autoconf framework, and then calls into the core of the <code>configure</code> script, which is the <code>common/autoconf/generated-configure.sh</code> file.</p>
+<p>As the name implies, this file is generated by Autoconf. It is checked in after regeneration, to alleviate the common user to have to install Autoconf.</p>
+<p>The build system will detect if the Autoconf source files have changed, and will trigger a regeneration of <code>common/autoconf/generated-configure.sh</code> if needed. You can also manually request such an update by <code>bash common/autoconf/autogen.sh</code>.</p>
+<p>If you make changes to the build system that requires a re-generation, note the following:</p>
+<ul>
+<li><p>You must use <em>exactly</em> version 2.69 of autoconf for your patch to be accepted. This is to avoid spurious changes in the generated file. Note that Ubuntu 16.04 ships a patched version of autoconf which claims to be 2.69, but is not.</p></li>
+<li><p>You do not need to include the generated file in reviews.</p></li>
+<li><p>If the generated file needs updating, the Oracle JDK closed counter-part will also need to be updated. It is very much appreciated if you ask for an Oracle engineer to sponsor your push so this can be made in tandem.</p></li>
+</ul>
+<h3 id="developing-the-build-system-itself">Developing the Build System Itself</h3>
+<p>This section contains a few remarks about how to develop for the build system itself. It is not relevant if you are only making changes in the product source code.</p>
+<p>While technically using <code>make</code>, the make source files of the OpenJDK does not resemble most other Makefiles. Instead of listing specific targets and actions (perhaps using patterns), the basic modus operandi is to call a high-level function (or properly, macro) from the API in <code>make/common</code>. For instance, to compile all classes in the <code>jdk.internal.foo</code> package in the <code>jdk.foo</code> module, a call like this would be made:</p>
+<pre><code>$(eval $(call SetupJavaCompilation, BUILD_FOO_CLASSES, \
+ SETUP := GENERATE_OLDBYTECODE, \
+ SRC := $(JDK_TOPDIR)/src/jkd.foo/share/classes, \
+ INCLUDES := jdk/internal/foo, \
+ BIN := $(SUPPORT_OUTPUTDIR)/foo_classes, \
+))</code></pre>
+<p>By encapsulating and expressing the high-level knowledge of <em>what</em> should be done, rather than <em>how</em> it should be done (as is normal in Makefiles), we can build a much more powerful and flexible build system.</p>
+<p>Correct dependency tracking is paramount. Sloppy dependency tracking will lead to improper parallelization, or worse, race conditions.</p>
+<p>To test for/debug race conditions, try running <code>make JOBS=1</code> and <code>make JOBS=100</code> and see if it makes any difference. (It shouldn't).</p>
+<p>To compare the output of two different builds and see if, and how, they differ, run <code>$BUILD1/compare.sh -o $BUILD2</code>, where <code>$BUILD1</code> and <code>$BUILD2</code> are the two builds you want to compare.</p>
+<p>To automatically build two consecutive versions and compare them, use <code>COMPARE_BUILD</code>. The value of <code>COMPARE_BUILD</code> is a set of variable=value assignments, like this:</p>
+<pre><code>make COMPARE_BUILD=CONF=--enable-new-hotspot-feature:MAKE=hotspot</code></pre>
+<p>See <code>make/InitSupport.gmk</code> for details on how to use <code>COMPARE_BUILD</code>.</p>
+<p>To analyze build performance, run with <code>LOG=trace</code> and check <code>$BUILD/build-trace-time.log</code>. Use <code>JOBS=1</code> to avoid parallelism.</p>
+<p>Please check that you adhere to the <a href="http://openjdk.java.net/groups/build/doc/code-conventions.html">Code Conventions for the Build System</a> before submitting patches. Also see the section in <a href="#autoconf-details">Autoconf Details</a> about the generated configure script.</p>
+<h2 id="contributing-to-openjdk">Contributing to OpenJDK</h2>
+<p>So, now you've build your OpenJDK, and made your first patch, and want to contribute it back to the OpenJDK community.</p>
+<p>First of all: Thank you! We gladly welcome your contribution to the OpenJDK. However, please bear in mind that OpenJDK is a massive project, and we must ask you to follow our rules and guidelines to be able to accept your contribution.</p>
+<p>The official place to start is the <a href="http://openjdk.java.net/contribute/">'How to contribute' page</a>. There is also an official (but somewhat outdated and skimpy on details) <a href="http://openjdk.java.net/guide/">Developer's Guide</a>.</p>
+<p>If this seems overwhelming to you, the Adoption Group is there to help you! A good place to start is their <a href="https://wiki.openjdk.java.net/display/Adoption/New+Contributor">'New Contributor' page</a>, or start reading the comprehensive <a href="https://adoptopenjdk.gitbooks.io/adoptopenjdk-getting-started-kit/en/">Getting Started Kit</a>. The Adoption Group will also happily answer any questions you have about contributing. Contact them by <a href="http://mail.openjdk.java.net/mailman/listinfo/adoption-discuss">mail</a> or <a href="http://openjdk.java.net/irc/">IRC</a>.</p>
</body>
</html>
--- a/common/doc/building.md Thu Jul 06 09:36:17 2017 -0700
+++ b/common/doc/building.md Mon Jul 17 09:13:49 2017 -0700
@@ -1,715 +1,1185 @@
-% OpenJDK Build README
+% Building OpenJDK
+
+## TL;DR (Instructions for the Impatient)
+
+If you are eager to try out building OpenJDK, these simple steps works most of
+the time. They assume that you have installed Mercurial (and Cygwin if running
+on Windows) and cloned the top-level OpenJDK repository that you want to build.
+
+ 1. [Get the complete source code](#getting-the-source-code): \
+ `bash get_source.sh`
+
+ 2. [Run configure](#running-configure): \
+ `bash configure`
-
+ If `configure` fails due to missing dependencies (to either the
+ [toolchain](#native-compiler-toolchain-requirements), [external libraries](
+ #external-library-requirements) or the [boot JDK](#boot-jdk-requirements)),
+ most of the time it prints a suggestion on how to resolve the situation on
+ your platform. Follow the instructions, and try running `bash configure`
+ again.
---------------------------------------------------------------------------------
+ 3. [Run make](#running-make): \
+ `make images`
+
+ 4. Verify your newly built JDK: \
+ `./build/*/images/jdk/bin/java -version`
+
+ 5. [Run basic tests](##running-tests): \
+ `make run-test-tier1`
+
+If any of these steps failed, or if you want to know more about build
+requirements or build functionality, please continue reading this document.
## Introduction
-This README file contains build instructions for the
-[OpenJDK](http://openjdk.java.net). Building the source code for the OpenJDK
-requires a certain degree of technical expertise.
-
-### !!!!!!!!!!!!!!! THIS IS A MAJOR RE-WRITE of this document. !!!!!!!!!!!!!
-
-Some Headlines:
-
- * The build is now a "`configure && make`" style build
- * Any GNU make 3.81 or newer should work, except on Windows where 4.0 or newer
- is recommended.
- * The build should scale, i.e. more processors should cause the build to be
- done in less wall-clock time
- * Nested or recursive make invocations have been significantly reduced, as
- has the total fork/exec or spawning of sub processes during the build
- * Windows MKS usage is no longer supported
- * Windows Visual Studio `vsvars*.bat` and `vcvars*.bat` files are run
- automatically
- * Ant is no longer used when building the OpenJDK
- * Use of ALT\_\* environment variables for configuring the build is no longer
- supported
-
--------------------------------------------------------------------------------
-
-## Contents
-
- * [Introduction](#introduction)
- * [Use of Mercurial](#hg)
- * [Getting the Source](#get_source)
- * [Repositories](#repositories)
- * [Building](#building)
- * [System Setup](#setup)
- * [Linux](#linux)
- * [Solaris](#solaris)
- * [Mac OS X](#macosx)
- * [Windows](#windows)
- * [Configure](#configure)
- * [Make](#make)
- * [Testing](#testing)
-
--------------------------------------------------------------------------------
-
- * [Appendix A: Hints and Tips](#hints)
- * [FAQ](#faq)
- * [Build Performance Tips](#performance)
- * [Troubleshooting](#troubleshooting)
- * [Appendix B: GNU Make Information](#gmake)
- * [Appendix C: Build Environments](#buildenvironments)
-
--------------------------------------------------------------------------------
-
-## Use of Mercurial
-
-The OpenJDK sources are maintained with the revision control system
-[Mercurial](http://mercurial.selenic.com/wiki/Mercurial). If you are new to
-Mercurial, please see the [Beginner
-Guides](http://mercurial.selenic.com/wiki/BeginnersGuides) or refer to the
-[Mercurial Book](http://hgbook.red-bean.com/). The first few chapters of the
-book provide an excellent overview of Mercurial, what it is and how it works.
-
-For using Mercurial with the OpenJDK refer to the [Developer Guide: Installing
-and Configuring
-Mercurial](http://openjdk.java.net/guide/repositories.html#installConfig)
-section for more information.
-
-### Getting the Source
-
-To get the entire set of OpenJDK Mercurial repositories use the script
-`get_source.sh` located in the root repository:
-
- hg clone http://hg.openjdk.java.net/jdk9/jdk9 YourOpenJDK
- cd YourOpenJDK
- bash ./get_source.sh
-
-Once you have all the repositories, keep in mind that each repository is its
-own independent repository. You can also re-run `./get_source.sh` anytime to
-pull over all the latest changesets in all the repositories. This set of nested
-repositories has been given the term "forest" and there are various ways to
-apply the same `hg` command to each of the repositories. For example, the
-script `make/scripts/hgforest.sh` can be used to repeat the same `hg` command
-on every repository, e.g.
-
- cd YourOpenJDK
- bash ./make/scripts/hgforest.sh status
-
-### Repositories
-
-The set of repositories and what they contain:
-
- * **. (root)** contains common configure and makefile logic
- * **hotspot** contains source code and make files for building the OpenJDK
- Hotspot Virtual Machine
- * **langtools** contains source code for the OpenJDK javac and language tools
- * **jdk** contains source code and make files for building the OpenJDK runtime
- libraries and misc files
- * **jaxp** contains source code for the OpenJDK JAXP functionality
- * **jaxws** contains source code for the OpenJDK JAX-WS functionality
- * **corba** contains source code for the OpenJDK Corba functionality
- * **nashorn** contains source code for the OpenJDK JavaScript implementation
-
-### Repository Source Guidelines
-
-There are some very basic guidelines:
+OpenJDK is a complex software project. Building it requires a certain amount of
+technical expertise, a fair number of dependencies on external software, and
+reasonably powerful hardware.
- * Use of whitespace in source files (.java, .c, .h, .cpp, and .hpp files) is
- restricted. No TABs, no trailing whitespace on lines, and files should not
- terminate in more than one blank line.
- * Files with execute permissions should not be added to the source
- repositories.
- * All generated files need to be kept isolated from the files maintained or
- managed by the source control system. The standard area for generated files
- is the top level `build/` directory.
- * The default build process should be to build the product and nothing else,
- in one form, e.g. a product (optimized), debug (non-optimized, -g plus
- assert logic), or fastdebug (optimized, -g plus assert logic).
- * The `.hgignore` file in each repository must exist and should include
- `^build/`, `^dist/` and optionally any `nbproject/private` directories. **It
- should NEVER** include anything in the `src/` or `test/` or any managed
- directory area of a repository.
- * Directory names and file names should never contain blanks or non-printing
- characters.
- * Generated source or binary files should NEVER be added to the repository
- (that includes `javah` output). There are some exceptions to this rule, in
- particular with some of the generated configure scripts.
- * Files not needed for typical building or testing of the repository should
- not be added to the repository.
-
--------------------------------------------------------------------------------
-
-## Building
-
-The very first step in building the OpenJDK is making sure the system itself
-has everything it needs to do OpenJDK builds. Once a system is setup, it
-generally doesn't need to be done again.
-
-Building the OpenJDK is now done with running a `configure` script which will
-try and find and verify you have everything you need, followed by running
-`make`, e.g.
-
-> **`bash ./configure`** \
-> **`make all`**
-
-Where possible the `configure` script will attempt to located the various
-components in the default locations or via component specific variable
-settings. When the normal defaults fail or components cannot be found,
-additional `configure` options may be necessary to help `configure` find the
-necessary tools for the build, or you may need to re-visit the setup of your
-system due to missing software packages.
-
-**NOTE:** The `configure` script file does not have execute permissions and
-will need to be explicitly run with `bash`, see the source guidelines.
-
--------------------------------------------------------------------------------
-
-### System Setup
-
-Before even attempting to use a system to build the OpenJDK there are some very
-basic system setups needed. For all systems:
-
- * Be sure the GNU make utility is version 3.81 (4.0 on windows) or newer, e.g.
- run "`make -version`"
-
- <a name="bootjdk"></a>
- * Install a Bootstrap JDK. All OpenJDK builds require access to a previously
- released JDK called the *bootstrap JDK* or *boot JDK.* The general rule is
- that the bootstrap JDK must be an instance of the previous major release of
- the JDK. In addition, there may be a requirement to use a release at or
- beyond a particular update level.
-
- ***Building JDK 9 requires JDK 8. JDK 9 developers should not use JDK 9 as
- the boot JDK, to ensure that JDK 9 dependencies are not introduced into the
- parts of the system that are built with JDK 8.***
-
- The JDK 8 binaries can be downloaded from Oracle's [JDK 8 download
- site](http://www.oracle.com/technetwork/java/javase/downloads/index.html).
- For build performance reasons it is very important that this bootstrap JDK
- be made available on the local disk of the machine doing the build. You
- should add its `bin` directory to the `PATH` environment variable. If
- `configure` has any issues finding this JDK, you may need to use the
- `configure` option `--with-boot-jdk`.
-
- * Ensure that GNU make, the Bootstrap JDK, and the compilers are all in your
- PATH environment variable.
-
-And for specific systems:
-
- * **Linux**
-
- Install all the software development packages needed including
- [alsa](#alsa), [freetype](#freetype), [cups](#cups), and
- [xrender](#xrender). See [specific system packages](#SDBE).
-
- * **Solaris**
-
- Install all the software development packages needed including [Studio
- Compilers](#studio), [freetype](#freetype), [cups](#cups), and
- [xrender](#xrender). See [specific system packages](#SDBE).
-
- * **Windows**
-
- * Install one of [CYGWIN](#cygwin) or [MinGW/MSYS](#msys)
- * Install [Visual Studio 2013](#vs2013)
-
- * **Mac OS X**
-
- Install [XCode 6.3](https://developer.apple.com/xcode/)
-
-#### Linux
-
-With Linux, try and favor the system packages over building your own or getting
-packages from other areas. Most Linux builds should be possible with the
-system's available packages.
-
-Note that some Linux systems have a habit of pre-populating your environment
-variables for you, for example `JAVA_HOME` might get pre-defined for you to
-refer to the JDK installed on your Linux system. You will need to unset
-`JAVA_HOME`. It's a good idea to run `env` and verify the environment variables
-you are getting from the default system settings make sense for building the
+If you just want to use OpenJDK and not build it yourself, this document is not
+for you. See for instance [OpenJDK installation](
+http://openjdk.java.net/install) for some methods of installing a prebuilt
OpenJDK.
-#### Solaris
+## Getting the Source Code
+
+OpenJDK uses [Mercurial](http://www.mercurial-scm.org) for source control. The
+source code is contained not in a single Mercurial repository, but in a tree
+("forest") of interrelated repositories. You will need to check out all of the
+repositories to be able to build OpenJDK. To assist you in dealing with this
+somewhat unusual arrangement, there are multiple tools available, which are
+explained below.
+
+In any case, make sure you are getting the correct version. At the [OpenJDK
+Mercurial server](http://hg.openjdk.java.net/) you can see a list of all
+available forests. If you want to build an older version, e.g. JDK 8, it is
+recommended that you get the `jdk8u` forest, which contains incremental
+updates, instead of the `jdk8` forest, which was frozen at JDK 8 GA.
+
+If you are new to Mercurial, a good place to start is the [Mercurial Beginner's
+Guide](http://www.mercurial-scm.org/guide). The rest of this document assumes a
+working knowledge of Mercurial.
+
+### Special Considerations
+
+For a smooth building experience, it is recommended that you follow these rules
+on where and how to check out the source code.
+
+ * Do not check out the source code in a path which contains spaces. Chances
+ are the build will not work. This is most likely to be an issue on Windows
+ systems.
+
+ * Do not check out the source code in a path which has a very long name or is
+ nested many levels deep. Chances are you will hit an OS limitation during
+ the build.
+
+ * Put the source code on a local disk, not a network share. If possible, use
+ an SSD. The build process is very disk intensive, and having slow disk
+ access will significantly increase build times. If you need to use a
+ network share for the source code, see below for suggestions on how to keep
+ the build artifacts on a local disk.
+
+ * On Windows, extra care must be taken to make sure the [Cygwin](#cygwin)
+ environment is consistent. It is recommended that you follow this
+ procedure:
+
+ * Create the directory that is going to contain the top directory of the
+ OpenJDK clone by using the `mkdir` command in the Cygwin bash shell.
+ That is, do *not* create it using Windows Explorer. This will ensure
+ that it will have proper Cygwin attributes, and that it's children will
+ inherit those attributes.
+
+ * Do not put the OpenJDK clone in a path under your Cygwin home
+ directory. This is especially important if your user name contains
+ spaces and/or mixed upper and lower case letters.
+
+ * Clone the OpenJDK repository using the Cygwin command line `hg` client
+ as instructed in this document. That is, do *not* use another Mercurial
+ client such as TortoiseHg.
+
+ Failure to follow this procedure might result in hard-to-debug build
+ problems.
+
+### Using get\_source.sh
+
+The simplest way to get the entire forest is probably to clone the top-level
+repository and then run the `get_source.sh` script, like this:
+
+```
+hg clone http://hg.openjdk.java.net/jdk9/jdk9
+cd jdk9
+bash get_source.sh
+```
+
+The first time this is run, it will clone all the sub-repositories. Any
+subsequent execution of the script will update all sub-repositories to the
+latest revision.
+
+### Using hgforest.sh
+
+The `hgforest.sh` script is more expressive than `get_source.sh`. It takes any
+number of arguments, and runs `hg` with those arguments on each sub-repository
+in the forest. The `get_source.sh` script is basically a simple wrapper that
+runs either `hgforest.sh clone` or `hgforest.sh pull -u`.
+
+ * Cloning the forest:
+ ```
+ hg clone http://hg.openjdk.java.net/jdk9/jdk9
+ cd jdk9
+ bash common/bin/hgforest.sh clone
+ ```
+
+ * Pulling and updating the forest:
+ ```
+ bash common/bin/hgforest.sh pull -u
+ ```
+
+ * Merging over the entire forest:
+ ```
+ bash common/bin/hgforest.sh merge
+ ```
-##### Studio Compilers
+### Using the Trees Extension
+
+The trees extension is a Mercurial add-on that helps you deal with the forest.
+More information is available on the [Code Tools trees page](
+http://openjdk.java.net/projects/code-tools/trees).
+
+#### Installing the Extension
+
+Install the extension by cloning `http://hg.openjdk.java.net/code-tools/trees`
+and updating your `.hgrc` file. Here's one way to do this:
+
+```
+cd ~
+mkdir hg-ext
+cd hg-ext
+hg clone http://hg.openjdk.java.net/code-tools/trees
+cat << EOT >> ~/.hgrc
+[extensions]
+trees=~/hg-ext/trees/trees.py
+EOT
+```
+
+#### Initializing the Tree
+
+The trees extension needs to know the structure of the forest. If you have
+already cloned the entire forest using another method, you can initialize the
+forest like this:
+
+```
+hg tconf --set --walk --depth
+```
+
+Or you can clone the entire forest at once, if you substitute `clone` with
+`tclone` when cloning the top-level repository, e.g. like this:
+
+```
+hg tclone http://hg.openjdk.java.net/jdk9/jdk9
+```
+
+In this case, the forest will be properly initialized from the start.
+
+#### Other Operations
+
+The trees extensions supplement many common operations with a trees version by
+prefixing a `t` to the normal Mercurial command, e.g. `tcommit`, `tstatus` or
+`tmerge`. For instance, to update the entire forest:
+
+```
+hg tpull -u
+```
+
+## Build Hardware Requirements
+
+OpenJDK is a massive project, and require machines ranging from decent to
+powerful to be able to build in a reasonable amount of time, or to be able to
+complete a build at all.
+
+We *strongly* recommend usage of an SSD disk for the build, since disk speed is
+one of the limiting factors for build performance.
+
+### Building on x86
+
+At a minimum, a machine with 2-4 cores is advisable, as well as 2-4 GB of RAM.
+(The more cores to use, the more memory you need.) At least 6 GB of free disk
+space is required (8 GB minimum for building on Solaris).
+
+Even for 32-bit builds, it is recommended to use a 64-bit build machine, and
+instead create a 32-bit target using `--with-target-bits=32`.
+
+### Building on sparc
+
+At a minimum, a machine with 4 cores is advisable, as well as 4 GB of RAM. (The
+more cores to use, the more memory you need.) At least 8 GB of free disk space
+is required.
+
+### Building on arm/aarch64
+
+This is not recommended. Instead, see the section on [Cross-compiling](
+#cross-compiling).
+
+## Operating System Requirements
+
+The mainline OpenJDK project supports Linux, Solaris, macOS, AIX and Windows.
+Support for other operating system, e.g. BSD, exists in separate "port"
+projects.
+
+In general, OpenJDK can be built on a wide range of versions of these operating
+systems, but the further you deviate from what is tested on a daily basis, the
+more likely you are to run into problems.
+
+This table lists the OS versions used by Oracle when building JDK 9. Such
+information is always subject to change, but this table is up to date at the
+time of writing.
+
+ Operating system Vendor/version used
+ ----------------- -------------------------------------------------------
+ Linux Oracle Enterprise Linux 6.4 / 7.1 (using kernel 3.8.13)
+ Solaris Solaris 11.1 SRU 21.4.1 / 11.2 SRU 5.5
+ macOS Mac OS X 10.9 (Mavericks) / 10.10 (Yosemite)
+ Windows Windows Server 2012 R2
-At a minimum, the [Studio 12 Update 4
-Compilers](http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index.htm)
-(containing version 5.13 of the C and C++ compilers) is required, including
-specific patches.
+The double version numbers for Linux, Solaris and macOS is due to the hybrid
+model used at Oracle, where header files and external libraries from an older
+version is used when building on a more modern version of the OS.
+
+The Build Group has a wiki page with [Supported Build Platforms](
+https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms). From
+time to time, this is updated by the community to list successes or failures of
+building on different platforms.
+
+### Windows
+
+Windows XP is not a supported platform, but all newer Windows should be able to
+build OpenJDK.
+
+On Windows, it is important that you pay attention to the instructions in the
+[Special Considerations](#special-considerations).
+
+Windows is the only non-POSIX OS supported by OpenJDK, and as such, requires
+some extra care. A POSIX support layer is required to build on Windows. For
+OpenJDK 9, the only supported such layer is Cygwin. (Msys is no longer
+supported due to a too old bash; msys2 and the new Windows Subsystem for Linux
+(WSL) would likely be possible to support in a future version but that would
+require a community effort to implement.)
+
+Internally in the build system, all paths are represented as Unix-style paths,
+e.g. `/cygdrive/c/hg/jdk9/Makefile` rather than `C:\hg\jdk9\Makefile`. This
+rule also applies to input to the build system, e.g. in arguments to
+`configure`. So, use `--with-freetype=/cygdrive/c/freetype` rather than
+`--with-freetype=c:\freetype`. For details on this conversion, see the section
+on [Fixpath](#fixpath).
+
+#### Cygwin
+
+A functioning [Cygwin](http://www.cygwin.com/) environment is thus required for
+building OpenJDK on Windows. If you have a 64-bit OS, we strongly recommend
+using the 64-bit version of Cygwin.
+
+**Note:** Cygwin has a model of continuously updating all packages without any
+easy way to install or revert to a specific version of a package. This means
+that whenever you add or update a package in Cygwin, you might (inadvertently)
+update tools that are used by the OpenJDK build process, and that can cause
+unexpected build problems.
+
+OpenJDK requires GNU Make 4.0 or greater on Windows. This is usually not a
+problem, since Cygwin currently only distributes GNU Make at a version above
+4.0.
+
+Apart from the basic Cygwin installation, the following packages must also be
+installed:
+
+ * `make`
+ * `zip`
+ * `unzip`
+
+Often, you can install these packages using the following command line:
+```
+<path to Cygwin setup>/setup-x86_64 -q -P make -P unzip -P zip
+```
+
+Unfortunately, Cygwin can be unreliable in certain circumstances. If you
+experience build tool crashes or strange issues when building on Windows,
+please check the Cygwin FAQ on the ["BLODA" list](
+https://cygwin.com/faq/faq.html#faq.using.bloda) and the section on [fork()
+failures](https://cygwin.com/faq/faq.html#faq.using.fixing-fork-failures).
+
+### Solaris
+
+See `make/devkit/solaris11.1-package-list.txt` for a list of recommended
+packages to install when building on Solaris. The versions specified in this
+list is the versions used by the daily builds at Oracle, and is likely to work
+properly.
+
+Older versions of Solaris shipped a broken version of `objcopy`. At least
+version 2.21.1 is needed, which is provided by Solaris 11 Update 1. Objcopy is
+needed if you want to have external debug symbols. Please make sure you are
+using at least version 2.21.1 of objcopy, or that you disable external debug
+symbols.
+
+### macOS
+
+Apple is using a quite aggressive scheme of pushing OS updates, and coupling
+these updates with required updates of Xcode. Unfortunately, this makes it
+difficult for a project like OpenJDK to keep pace with a continuously updated
+machine running macOS. See the section on [Apple Xcode](#apple-xcode) on some
+strategies to deal with this.
+
+It is recommended that you use at least Mac OS X 10.9 (Mavericks). At the time
+of writing, OpenJDK has been successfully compiled on macOS versions up to
+10.12.5 (Sierra), using XCode 8.3.2 and `--disable-warnings-as-errors`.
+
+The standard macOS environment contains the basic tooling needed to build, but
+for external libraries a package manager is recommended. OpenJDK uses
+[homebrew](https://brew.sh/) in the examples, but feel free to use whatever
+manager you want (or none).
+
+### Linux
+
+It is often not much problem to build OpenJDK on Linux. The only general advice
+is to try to use the compilers, external libraries and header files as provided
+by your distribution.
+
+The basic tooling is provided as part of the core operating system, but you
+will most likely need to install developer packages.
+
+For apt-based distributions (Debian, Ubuntu, etc), try this:
+```
+sudo apt-get install build-essential
+```
+
+For rpm-based distributions (Fedora, Red Hat, etc), try this:
+```
+sudo yum groupinstall "Development Tools"
+```
+
+### AIX
+
+The regular builds by SAP is using AIX version 7.1, but AIX 5.3 is also
+supported. See the [OpenJDK PowerPC Port Status Page](
+http://cr.openjdk.java.net/~simonis/ppc-aix-port) for details.
+
+## Native Compiler (Toolchain) Requirements
+
+Large portions of OpenJDK consists of native code, that needs to be compiled to
+be able to run on the target platform. In theory, toolchain and operating
+system should be independent factors, but in practice there's more or less a
+one-to-one correlation between target operating system and toolchain.
+
+ Operating system Supported toolchain
+ ------------------ -------------------------
+ Linux gcc, clang
+ macOS Apple Xcode (using clang)
+ Solaris Oracle Solaris Studio
+ AIX IBM XL C/C++
+ Windows Microsoft Visual Studio
+
+Please see the individual sections on the toolchains for version
+recommendations. As a reference, these versions of the toolchains are used, at
+the time of writing, by Oracle for the daily builds of OpenJDK. It should be
+possible to compile OpenJDK with both older and newer versions, but the closer
+you stay to this list, the more likely you are to compile successfully without
+issues.
+
+ Operating system Toolchain version
+ ------------------ -------------------------------------------------------
+ Linux gcc 4.9.2
+ macOS Apple Xcode 6.3 (using clang 6.1.0)
+ Solaris Oracle Solaris Studio 12.4 (with compiler version 5.13)
+ Windows Microsoft Visual Studio 2013 update 4
+
+### gcc
+
+The minimum accepted version of gcc is 4.3. Older versions will not be accepted
+by `configure`.
+
+However, gcc 4.3 is quite old and OpenJDK is not regularly tested on this
+version, so it is recommended to use a more modern gcc.
+
+OpenJDK 9 includes patches that should allow gcc 6 to compile, but this should
+be considered experimental.
+
+In general, any version between these two should be usable.
+
+### clang
+
+The minimum accepted version of clang is 3.2. Older versions will not be
+accepted by `configure`.
+
+To use clang instead of gcc on Linux, use `--with-toolchain-type=clang`.
+
+### Apple Xcode
+
+The oldest supported version of Xcode is 5.
+
+You will need the Xcode command lines developers tools to be able to build
+OpenJDK. (Actually, *only* the command lines tools are needed, not the IDE.)
+The simplest way to install these is to run:
+```
+xcode-select --install
+```
+
+It is advisable to keep an older version of Xcode for building OpenJDK when
+updating Xcode. This [blog page](
+http://iosdevelopertips.com/xcode/install-multiple-versions-of-xcode.html) has
+good suggestions on managing multiple Xcode versions. To use a specific version
+of Xcode, use `xcode-select -s` before running `configure`, or use
+`--with-toolchain-path` to point to the version of Xcode to use, e.g.
+`configure --with-toolchain-path=/Applications/Xcode5.app/Contents/Developer/usr/bin`
+
+If you have recently (inadvertently) updated your OS and/or Xcode version, and
+OpenJDK can no longer be built, please see the section on [Problems with the
+Build Environment](#problems-with-the-build-environment), and [Getting
+Help](#getting-help) to find out if there are any recent, non-merged patches
+available for this update.
+
+### Oracle Solaris Studio
+
+The minimum accepted version of the Solaris Studio compilers is 5.13
+(corresponding to Solaris Studio 12.4). Older versions will not be accepted by
+configure.
The Solaris Studio installation should contain at least these packages:
- Package Version
- -------------------------------------------------- ---------------
- developer/solarisstudio-124/backend 12.4-1.0.6.0
- developer/solarisstudio-124/c++ 12.4-1.0.10.0
- developer/solarisstudio-124/cc 12.4-1.0.4.0
- developer/solarisstudio-124/library/c++-libs 12.4-1.0.10.0
- developer/solarisstudio-124/library/math-libs 12.4-1.0.0.1
- developer/solarisstudio-124/library/studio-gccrt 12.4-1.0.0.1
- developer/solarisstudio-124/studio-common 12.4-1.0.0.1
- developer/solarisstudio-124/studio-ja 12.4-1.0.0.1
- developer/solarisstudio-124/studio-legal 12.4-1.0.0.1
- developer/solarisstudio-124/studio-zhCN 12.4-1.0.0.1
+ Package Version
+ -------------------------------------------------- -------------
+ developer/solarisstudio-124/backend 12.4-1.0.6.0
+ developer/solarisstudio-124/c++ 12.4-1.0.10.0
+ developer/solarisstudio-124/cc 12.4-1.0.4.0
+ developer/solarisstudio-124/library/c++-libs 12.4-1.0.10.0
+ developer/solarisstudio-124/library/math-libs 12.4-1.0.0.1
+ developer/solarisstudio-124/library/studio-gccrt 12.4-1.0.0.1
+ developer/solarisstudio-124/studio-common 12.4-1.0.0.1
+ developer/solarisstudio-124/studio-ja 12.4-1.0.0.1
+ developer/solarisstudio-124/studio-legal 12.4-1.0.0.1
+ developer/solarisstudio-124/studio-zhCN 12.4-1.0.0.1
+
+Compiling with Solaris Studio can sometimes be finicky. This is the exact
+version used by Oracle, which worked correctly at the time of writing:
+```
+$ cc -V
+cc: Sun C 5.13 SunOS_i386 2014/10/20
+$ CC -V
+CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30
+```
+
+### Microsoft Visual Studio
+
+The minimum accepted version of Visual Studio is 2010. Older versions will not
+be accepted by `configure`. The maximum accepted version of Visual Studio is
+2013.
+
+If you have multiple versions of Visual Studio installed, `configure` will by
+default pick the latest. You can request a specific version to be used by
+setting `--with-toolchain-version`, e.g. `--with-toolchain-version=2010`.
-In particular backend 12.4-1.0.6.0 contains a critical patch for the sparc
-version.
+If you get `LINK: fatal error LNK1123: failure during conversion to COFF: file
+invalid` when building using Visual Studio 2010, you have encountered
+[KB2757355](http://support.microsoft.com/kb/2757355), a bug triggered by a
+specific installation order. However, the solution suggested by the KB article
+does not always resolve the problem. See [this stackoverflow discussion](
+https://stackoverflow.com/questions/10888391) for other suggestions.
-Place the `bin` directory in `PATH`.
+### IBM XL C/C++
+
+The regular builds by SAP is using version 12.1, described as `IBM XL C/C++ for
+AIX, V12.1 (5765-J02, 5725-C72) Version: 12.01.0000.0017`.
+
+See the [OpenJDK PowerPC Port Status Page](
+http://cr.openjdk.java.net/~simonis/ppc-aix-port) for details.
+
+## Boot JDK Requirements
-The Oracle Solaris Studio Express compilers at: [Oracle Solaris Studio Express
-Download
-site](http://www.oracle.com/technetwork/server-storage/solarisstudio/downloads/index-jsp-142582.html)
-are also an option, although these compilers have not been extensively used
-yet.
+Paradoxically, building OpenJDK requires a pre-existing JDK. This is called the
+"boot JDK". The boot JDK does not have to be OpenJDK, though. If you are
+porting OpenJDK to a new platform, chances are that there already exists
+another JDK for that platform that is usable as boot JDK.
-#### Windows
+The rule of thumb is that the boot JDK for building JDK major version *N*
+should be an JDK of major version *N-1*, so for building JDK 9 a JDK 8 would be
+suitable as boot JDK. However, OpenJDK should be able to "build itself", so an
+up-to-date build of the current OpenJDK source is an acceptable alternative. If
+you are following the *N-1* rule, make sure you got the latest update version,
+since JDK 8 GA might not be able to build JDK 9 on all platforms.
-##### Windows Unix Toolkit
+If the Boot JDK is not automatically detected, or the wrong JDK is picked, use
+`--with-boot-jdk` to point to the JDK to use.
+
+### JDK 8 on Linux
+
+On apt-based distros (like Debian and Ubuntu), `sudo apt-get install
+openjdk-8-jdk` is typically enough to install OpenJDK 8. On rpm-based distros
+(like Fedora and Red Hat), try `sudo yum install java-1.8.0-openjdk-devel`.
-Building on Windows requires a Unix-like environment, notably a Unix-like
-shell. There are several such environments available of which
-[Cygwin](http://www.cygwin.com/) and
-[MinGW/MSYS](http://www.mingw.org/wiki/MSYS) are currently supported for the
-OpenJDK build. One of the differences of these systems from standard Windows
-tools is the way they handle Windows path names, particularly path names which
-contain spaces, backslashes as path separators and possibly drive letters.
-Depending on the use case and the specifics of each environment these path
-problems can be solved by a combination of quoting whole paths, translating
-backslashes to forward slashes, escaping backslashes with additional
-backslashes and translating the path names to their ["8.3"
-version](http://en.wikipedia.org/wiki/8.3_filename).
+### JDK 8 on Windows
+
+No pre-compiled binaries of OpenJDK 8 are readily available for Windows at the
+time of writing. An alternative is to download the [Oracle JDK](
+http://www.oracle.com/technetwork/java/javase/downloads). Another is the [Adopt
+OpenJDK Project](https://adoptopenjdk.net/), which publishes experimental
+prebuilt binaries for Windows.
+
+### JDK 8 on macOS
+
+No pre-compiled binaries of OpenJDK 8 are readily available for macOS at the
+time of writing. An alternative is to download the [Oracle JDK](
+http://www.oracle.com/technetwork/java/javase/downloads), or to install it
+using `brew cask install java`. Another option is the [Adopt OpenJDK Project](
+https://adoptopenjdk.net/), which publishes experimental prebuilt binaries for
+macOS.
-###### CYGWIN
+### JDK 8 on AIX
+
+No pre-compiled binaries of OpenJDK 8 are readily available for AIX at the
+time of writing. A starting point for working with OpenJDK on AIX is
+the [PowerPC/AIX Port Project](http://openjdk.java.net/projects/ppc-aix-port/).
+
+## External Library Requirements
+
+Different platforms require different external libraries. In general, libraries
+are not optional - that is, they are either required or not used.
+
+If a required library is not detected by `configure`, you need to provide the
+path to it. There are two forms of the `configure` arguments to point to an
+external library: `--with-<LIB>=<path>` or `--with-<LIB>-include=<path to
+include> --with-<LIB>-lib=<path to lib>`. The first variant is more concise,
+but require the include files an library files to reside in a default hierarchy
+under this directory. In most cases, it works fine.
-CYGWIN is an open source, Linux-like environment which tries to emulate a
-complete POSIX layer on Windows. It tries to be smart about path names and can
-usually handle all kinds of paths if they are correctly quoted or escaped
-although internally it maps drive letters `<drive>:` to a virtual directory
-`/cygdrive/<drive>`.
+As a fallback, the second version allows you to point to the include directory
+and the lib directory separately.
+
+### FreeType
+
+FreeType2 from [The FreeType Project](http://www.freetype.org/) is required on
+all platforms. At least version 2.3 is required.
-You can always use the `cygpath` utility to map pathnames with spaces or the
-backslash character into the `C:/` style of pathname (called 'mixed'), e.g.
-`cygpath -s -m "<path>"`.
+ * To install on an apt-based Linux, try running `sudo apt-get install
+ libcups2-dev`.
+ * To install on an rpm-based Linux, try running `sudo yum install
+ cups-devel`.
+ * To install on Solaris, try running `pkg install system/library/freetype-2`.
+ * To install on macOS, try running `brew install freetype`.
+ * To install on Windows, see [below](#building-freetype-on-windows).
-Note that the use of CYGWIN creates a unique problem with regards to setting
-[`PATH`](#path). Normally on Windows the `PATH` variable contains directories
-separated with the ";" character (Solaris and Linux use ":"). With CYGWIN, it
-uses ":", but that means that paths like "C:/path" cannot be placed in the
-CYGWIN version of `PATH` and instead CYGWIN uses something like
-`/cygdrive/c/path` which CYGWIN understands, but only CYGWIN understands.
+Use `--with-freetype=<path>` if `configure` does not properly locate your
+FreeType files.
+
+#### Building FreeType on Windows
+
+On Windows, there is no readily available compiled version of FreeType. OpenJDK
+can help you compile FreeType from source. Download the FreeType sources and
+unpack them into an arbitrary directory:
-The OpenJDK build requires CYGWIN version 1.7.16 or newer. Information about
-CYGWIN can be obtained from the CYGWIN website at
-[www.cygwin.com](http://www.cygwin.com).
+```
+wget http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.gz
+tar -xzf freetype-2.5.3.tar.gz
+```
-By default CYGWIN doesn't install all the tools required for building the
-OpenJDK. Along with the default installation, you need to install the following
-tools.
+Then run `configure` with `--with-freetype-src=<freetype_src>`. This will
+automatically build the freetype library into `<freetype_src>/lib64` for 64-bit
+builds or into `<freetype_src>/lib32` for 32-bit builds. Afterwards you can
+always use `--with-freetype-include=<freetype_src>/include` and
+`--with-freetype-lib=<freetype_src>/lib[32|64]` for other builds.
- Binary Name Category Package Description
- ------------- -------------- ---------- ------------------------------------------------------------
- ar.exe Devel binutils The GNU assembler, linker and binary utilities
- make.exe Devel make The GNU version of the 'make' utility built for CYGWIN
- m4.exe Interpreters m4 GNU implementation of the traditional Unix macro processor
- cpio.exe Utils cpio A program to manage archives of files
- gawk.exe Utils awk Pattern-directed scanning and processing language
- file.exe Utils file Determines file type using 'magic' numbers
- zip.exe Archive zip Package and compress (archive) files
- unzip.exe Archive unzip Extract compressed files in a ZIP archive
- free.exe System procps Display amount of free and used memory in the system
+Alternatively you can unpack the sources like this to use the default
+directory:
+
+```
+tar --one-top-level=$HOME/freetype --strip-components=1 -xzf freetype-2.5.3.tar.gz
+```
+
+### CUPS
+
+CUPS, [Common UNIX Printing System](http://www.cups.org) header files are
+required on all platforms, except Windows. Often these files are provided by
+your operating system.
-Note that the CYGWIN software can conflict with other non-CYGWIN software on
-your Windows system. CYGWIN provides a
-[FAQ](http://cygwin.com/faq/faq.using.html) for known issues and problems,
-of particular interest is the section on [BLODA (applications that interfere
-with CYGWIN)](http://cygwin.com/faq/faq.using.html#faq.using.bloda).
+ * To install on an apt-based Linux, try running `sudo apt-get install
+ libcups2-dev`.
+ * To install on an rpm-based Linux, try running `sudo yum install
+ cups-devel`.
+ * To install on Solaris, try running `pkg install print/cups`.
-###### MinGW/MSYS
+Use `--with-cups=<path>` if `configure` does not properly locate your CUPS
+files.
+
+### X11
+
+Certain [X11](http://www.x.org/) libraries and include files are required on
+Linux and Solaris.
-MinGW ("Minimalist GNU for Windows") is a collection of free Windows specific
-header files and import libraries combined with GNU toolsets that allow one to
-produce native Windows programs that do not rely on any 3rd-party C runtime
-DLLs. MSYS is a supplement to MinGW which allows building applications and
-programs which rely on traditional UNIX tools to be present. Among others this
-includes tools like `bash` and `make`. See
-[MinGW/MSYS](http://www.mingw.org/wiki/MSYS) for more information.
+ * To install on an apt-based Linux, try running `sudo apt-get install
+ libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev`.
+ * To install on an rpm-based Linux, try running `sudo yum install
+ libXtst-devel libXt-devel libXrender-devel libXi-devel`.
+ * To install on Solaris, try running `pkg install x11/header/x11-protocols
+ x11/library/libice x11/library/libpthread-stubs x11/library/libsm
+ x11/library/libx11 x11/library/libxau x11/library/libxcb
+ x11/library/libxdmcp x11/library/libxevie x11/library/libxext
+ x11/library/libxrender x11/library/libxscrnsaver x11/library/libxtst
+ x11/library/toolkit/libxt`.
+
+Use `--with-x=<path>` if `configure` does not properly locate your X11 files.
+
+### ALSA
+
+ALSA, [Advanced Linux Sound Architecture](https://www.alsa-project.org/) is
+required on Linux. At least version 0.9.1 of ALSA is required.
-Like Cygwin, MinGW/MSYS can handle different types of path formats. They are
-internally converted to paths with forward slashes and drive letters `<drive>:`
-replaced by a virtual directory `/<drive>`. Additionally, MSYS automatically
-detects binaries compiled for the MSYS environment and feeds them with the
-internal, Unix-style path names. If native Windows applications are called from
-within MSYS programs their path arguments are automatically converted back to
-Windows style path names with drive letters and backslashes as path separators.
-This may cause problems for Windows applications which use forward slashes as
-parameter separator (e.g. `cl /nologo /I`) because MSYS may wrongly [replace
-such parameters by drive
-letters](http://mingw.org/wiki/Posix_path_conversion).
+ * To install on an apt-based Linux, try running `sudo apt-get install
+ libasound2-dev`.
+ * To install on an rpm-based Linux, try running `sudo yum install
+ alsa-lib-devel`.
+
+Use `--with-alsa=<path>` if `configure` does not properly locate your ALSA
+files.
+
+### libffi
+
+libffi, the [Portable Foreign Function Interface Library](
+http://sourceware.org/libffi) is required when building the Zero version of
+Hotspot.
+
+ * To install on an apt-based Linux, try running `sudo apt-get install
+ libffi-dev`.
+ * To install on an rpm-based Linux, try running `sudo yum install
+ libffi-devel`.
+
+Use `--with-libffi=<path>` if `configure` does not properly locate your libffi
+files.
+
+### libelf
+
+libelf from the [elfutils project](http://sourceware.org/elfutils) is required
+when building the AOT feature of Hotspot.
-In addition to the tools which will be installed by default, you have to
-manually install the `msys-zip` and `msys-unzip` packages. This can be easily
-done with the MinGW command line installer:
+ * To install on an apt-based Linux, try running `sudo apt-get install
+ libelf-dev`.
+ * To install on an rpm-based Linux, try running `sudo yum install
+ elfutils-libelf-devel`.
- mingw-get.exe install msys-zip
- mingw-get.exe install msys-unzip
+Use `--with-libelf=<path>` if `configure` does not properly locate your libelf
+files.
+
+## Other Tooling Requirements
-##### Visual Studio 2013 Compilers
+### GNU Make
+
+OpenJDK requires [GNU Make](http://www.gnu.org/software/make). No other flavors
+of make are supported.
-The 32-bit and 64-bit OpenJDK Windows build requires Microsoft Visual Studio
-C++ 2013 (VS2013) Professional Edition or Express compiler. The compiler and
-other tools are expected to reside in the location defined by the variable
-`VS120COMNTOOLS` which is set by the Microsoft Visual Studio installer.
+At least version 3.81 of GNU Make must be used. For distributions supporting
+GNU Make 4.0 or above, we strongly recommend it. GNU Make 4.0 contains useful
+functionality to handle parallel building (supported by `--with-output-sync`)
+and speed and stability improvements.
-Only the C++ part of VS2013 is needed. Try to let the installation go to the
-default install directory. Always reboot your system after installing VS2013.
-The system environment variable VS120COMNTOOLS should be set in your
-environment.
+Note that `configure` locates and verifies a properly functioning version of
+`make` and stores the path to this `make` binary in the configuration. If you
+start a build using `make` on the command line, you will be using the version
+of make found first in your `PATH`, and not necessarily the one stored in the
+configuration. This initial make will be used as "bootstrap make", and in a
+second stage, the make located by `configure` will be called. Normally, this
+will present no issues, but if you have a very old `make`, or a non-GNU Make
+`make` in your path, this might cause issues.
+
+If you want to override the default make found by `configure`, use the `MAKE`
+configure variable, e.g. `configure MAKE=/opt/gnu/make`.
+
+On Solaris, it is common to call the GNU version of make by using `gmake`.
+
+### GNU Bash
-Make sure that TMP and TEMP are also set in the environment and refer to
-Windows paths that exist, like `C:\temp`, not `/tmp`, not `/cygdrive/c/temp`,
-and not `C:/temp`. `C:\temp` is just an example, it is assumed that this area
-is private to the user, so by default after installs you should see a unique
-user path in these variables.
+OpenJDK requires [GNU Bash](http://www.gnu.org/software/bash). No other shells
+are supported.
+
+At least version 3.2 of GNU Bash must be used.
+
+### Autoconf
-#### Mac OS X
+If you want to modify the build system itself, you need to install [Autoconf](
+http://www.gnu.org/software/autoconf).
-Make sure you get the right XCode version.
+However, if you only need to build OpenJDK or if you only edit the actual
+OpenJDK source files, there is no dependency on autoconf, since the source
+distribution includes a pre-generated `configure` shell script.
+
+See the section on [Autoconf Details](#autoconf-details) for details on how
+OpenJDK uses autoconf. This is especially important if you plan to contribute
+changes to OpenJDK that modifies the build system.
--------------------------------------------------------------------------------
+## Running Configure
-### Configure
+To build OpenJDK, you need a "configuration", which consists of a directory
+where to store the build output, coupled with information about the platform,
+the specific build machine, and choices that affect how OpenJDK is built.
-The basic invocation of the `configure` script looks like:
+The configuration is created by the `configure` script. The basic invocation of
+the `configure` script looks like this:
-> **`bash ./configure [options]`**
+```
+bash configure [options]
+```
-This will create an output directory containing the "configuration" and setup
-an area for the build result. This directory typically looks like:
-
-> **`build/linux-x64-normal-server-release`**
+This will create an output directory containing the configuration and setup an
+area for the build result. This directory typically looks like
+`build/linux-x64-normal-server-release`, but the actual name depends on your
+specific configuration. (It can also be set directly, see [Using Multiple
+Configurations](#using-multiple-configurations)). This directory is referred to
+as `$BUILD` in this documentation.
`configure` will try to figure out what system you are running on and where all
necessary build components are. If you have all prerequisites for building
installed, it should find everything. If it fails to detect any component
-automatically, it will exit and inform you about the problem. When this
-happens, read more below in [the `configure` options](#configureoptions).
+automatically, it will exit and inform you about the problem.
-Some examples:
-
-> **Windows 32bit build with freetype specified:** \
-> `bash ./configure --with-freetype=/cygdrive/c/freetype-i586 --with-target-bits=32`
+Some command line examples:
-> **Debug 64bit Build:** \
-> `bash ./configure --enable-debug --with-target-bits=64`
+ * Create a 32-bit build for Windows with FreeType2 in `C:\freetype-i586`:
+ ```
+ bash configure --with-freetype=/cygdrive/c/freetype-i586 --with-target-bits=32
+ ```
-#### Configure Options
-
-Complete details on all the OpenJDK `configure` options can be seen with:
-
-> **`bash ./configure --help=short`**
+ * Create a debug build with the `server` JVM and DTrace enabled:
+ ```
+ bash configure --enable-debug --with-jvm-variants=server --enable-dtrace
+ ```
-Use `-help` to see all the `configure` options available. You can generate any
-number of different configurations, e.g. debug, release, 32, 64, etc.
+### Common Configure Arguments
-Some of the more commonly used `configure` options are:
-
-> **`--enable-debug`** \
-> set the debug level to fastdebug (this is a shorthand for
-> `--with-debug-level=fastdebug`)
+Here follows some of the most common and important `configure` argument.
-<a name="alsa"></a>
-
-> **`--with-alsa=`**_path_ \
-> select the location of the Advanced Linux Sound Architecture (ALSA)
+To get up-to-date information on *all* available `configure` argument, please
+run:
+```
+bash configure --help
+```
-> Version 0.9.1 or newer of the ALSA files are required for building the
- OpenJDK on Linux. These Linux files are usually available from an "alsa" of
- "libasound" development package, and it's highly recommended that you try
- and use the package provided by the particular version of Linux that you are
- using.
+(Note that this help text also include general autoconf options, like
+`--dvidir`, that is not relevant to OpenJDK. To list only OpenJDK specific
+features, use `bash configure --help=short` instead.)
+
+#### Configure Arguments for Tailoring the Build
-> **`--with-boot-jdk=`**_path_ \
-> select the [Bootstrap JDK](#bootjdk)
+ * `--enable-debug` - Set the debug level to `fastdebug` (this is a shorthand
+ for `--with-debug-level=fastdebug`)
+ * `--with-debug-level=<level>` - Set the debug level, which can be `release`,
+ `fastdebug`, `slowdebug` or `optimized`. Default is `release`. `optimized`
+ is variant of `release` with additional Hotspot debug code.
+ * `--with-native-debug-symbols=<method>` - Specify if and how native debug
+ symbols should be built. Available methods are `none`, `internal`,
+ `external`, `zipped`. Default behavior depends on platform. See [Native
+ Debug Symbols](#native-debug-symbols) for more details.
+ * `--with-version-string=<string>` - Specify the version string this build
+ will be identified with.
+ * `--with-version-<part>=<value>` - A group of options, where `<part>` can be
+ any of `pre`, `opt`, `build`, `major`, `minor`, `security` or `patch`. Use
+ these options to modify just the corresponding part of the version string
+ from the default, or the value provided by `--with-version-string`.
+ * `--with-jvm-variants=<variant>[,<variant>...]` - Build the specified variant
+ (or variants) of Hotspot. Valid variants are: `server`, `client`,
+ `minimal`, `core`, `zero`, `zeroshark`, `custom`. Note that not all
+ variants are possible to combine in a single build.
+ * `--with-jvm-features=<feature>[,<feature>...]` - Use the specified JVM
+ features when building Hotspot. The list of features will be enabled on top
+ of the default list. For the `custom` JVM variant, this default list is
+ empty. A complete list of available JVM features can be found using `bash
+ configure --help`.
+ * `--with-target-bits=<bits>` - Create a target binary suitable for running
+ on a `<bits>` platform. Use this to create 32-bit output on a 64-bit build
+ platform, instead of doing a full cross-compile. (This is known as a
+ *reduced* build.)
-> **`--with-boot-jdk-jvmargs=`**"_args_" \
-> provide the JVM options to be used to run the [Bootstrap JDK](#bootjdk)
-
-> **`--with-cacerts=`**_path_ \
-> select the path to the cacerts file.
+#### Configure Arguments for Native Compilation
-> See [Certificate Authority on
- Wikipedia](http://en.wikipedia.org/wiki/Certificate_Authority) for a
- better understanding of the Certificate Authority (CA). A certificates file
- named "cacerts" represents a system-wide keystore with CA certificates. In
- JDK and JRE binary bundles, the "cacerts" file contains root CA certificates
- from several public CAs (e.g., VeriSign, Thawte, and Baltimore). The source
- contain a cacerts file without CA root certificates. Formal JDK builders will
- need to secure permission from each public CA and include the certificates
- into their own custom cacerts file. Failure to provide a populated cacerts
- file will result in verification errors of a certificate chain during
- runtime. By default an empty cacerts file is provided and that should be fine
- for most JDK developers.
+ * `--with-devkit=<path>` - Use this devkit for compilers, tools and resources
+ * `--with-sysroot=<path>` - Use this directory as sysroot
+ * `--with-extra-path=<path>[;<path>]` - Prepend these directories to the
+ default path when searching for all kinds of binaries
+ * `--with-toolchain-path=<path>[;<path>]` - Prepend these directories when
+ searching for toolchain binaries (compilers etc)
+ * `--with-extra-cflags=<flags>` - Append these flags when compiling JDK C
+ files
+ * `--with-extra-cxxflags=<flags>` - Append these flags when compiling JDK C++
+ files
+ * `--with-extra-ldflags=<flags>` - Append these flags when linking JDK
+ libraries
-<a name="cups"></a>
+#### Configure Arguments for External Dependencies
-> **`--with-cups=`**_path_ \
-> select the CUPS install location
-
-> The Common UNIX Printing System (CUPS) Headers are required for building the
- OpenJDK on Solaris and Linux. The Solaris header files can be obtained by
- installing the package **print/cups**.
+ * `--with-boot-jdk=<path>` - Set the path to the [Boot JDK](
+ #boot-jdk-requirements)
+ * `--with-freetype=<path>` - Set the path to [FreeType](#freetype)
+ * `--with-cups=<path>` - Set the path to [CUPS](#cups)
+ * `--with-x=<path>` - Set the path to [X11](#x11)
+ * `--with-alsa=<path>` - Set the path to [ALSA](#alsa)
+ * `--with-libffi=<path>` - Set the path to [libffi](#libffi)
+ * `--with-libelf=<path>` - Set the path to [libelf](#libelf)
+ * `--with-jtreg=<path>` - Set the path to JTReg. See [Running Tests](
+ #running-tests)
-> The CUPS header files can always be downloaded from
- [www.cups.org](http://www.cups.org).
+Certain third-party libraries used by OpenJDK (libjpeg, giflib, libpng, lcms
+and zlib) are included in the OpenJDK repository. The default behavior of the
+OpenJDK build is to use this version of these libraries, but they might be
+replaced by an external version. To do so, specify `system` as the `<source>`
+option in these arguments. (The default is `bundled`).
-> **`--with-cups-include=`**_path_ \
-> select the CUPS include directory location
+ * `--with-libjpeg=<source>` - Use the specified source for libjpeg
+ * `--with-giflib=<source>` - Use the specified source for giflib
+ * `--with-libpng=<source>` - Use the specified source for libpng
+ * `--with-lcms=<source>` - Use the specified source for lcms
+ * `--with-zlib=<source>` - Use the specified source for zlib
-> **`--with-debug-level=`**_level_ \
-> select the debug information level of release, fastdebug, or slowdebug
+On Linux, it is possible to select either static or dynamic linking of the C++
+runtime. The default is static linking, with dynamic linking as fallback if the
+static library is not found.
+
+ * `--with-stdc++lib=<method>` - Use the specified method (`static`, `dynamic`
+ or `default`) for linking the C++ runtime.
+
+### Configure Control Variables
-> **`--with-dev-kit=`**_path_ \
-> select location of the compiler install or developer install location
+It is possible to control certain aspects of `configure` by overriding the
+value of `configure` variables, either on the command line or in the
+environment.
-<a name="freetype"></a>
-
-> **`--with-freetype=`**_path_ \
-> select the freetype files to use.
+Normally, this is **not recommended**. If used improperly, it can lead to a
+broken configuration. Unless you're well versed in the build system, this is
+hard to use properly. Therefore, `configure` will print a warning if this is
+detected.
-> Expecting the freetype libraries under `lib/` and the headers under
- `include/`.
+However, there are a few `configure` variables, known as *control variables*
+that are supposed to be overriden on the command line. These are variables that
+describe the location of tools needed by the build, like `MAKE` or `GREP`. If
+any such variable is specified, `configure` will use that value instead of
+trying to autodetect the tool. For instance, `bash configure
+MAKE=/opt/gnumake4.0/bin/make`.
-> Version 2.3 or newer of FreeType is required. On Unix systems required files
- can be available as part of your distribution (while you still may need to
- upgrade them). Note that you need development version of package that
- includes both the FreeType library and header files.
+If a configure argument exists, use that instead, e.g. use `--with-jtreg`
+instead of setting `JTREGEXE`.
+
+Also note that, despite what autoconf claims, setting `CFLAGS` will not
+accomplish anything. Instead use `--with-extra-cflags` (and similar for
+`cxxflags` and `ldflags`).
+
+## Running Make
-> You can always download latest FreeType version from the [FreeType
- website](http://www.freetype.org). Building the freetype 2 libraries from
- scratch is also possible, however on Windows refer to the [Windows FreeType
- DLL build instructions](http://freetype.freedesktop.org/wiki/FreeType_DLL).
+When you have a proper configuration, all you need to do to build OpenJDK is to
+run `make`. (But see the warning at [GNU Make](#gnu-make) about running the
+correct version of make.)
-> Note that by default FreeType is built with byte code hinting support
- disabled due to licensing restrictions. In this case, text appearance and
- metrics are expected to differ from Sun's official JDK build. See the
- [SourceForge FreeType2 Home Page](http://freetype.sourceforge.net/freetype2)
- for more information.
+When running `make` without any arguments, the default target is used, which is
+the same as running `make default` or `make jdk`. This will build a minimal (or
+roughly minimal) set of compiled output (known as an "exploded image") needed
+for a developer to actually execute the newly built JDK. The idea is that in an
+incremental development fashion, when doing a normal make, you should only
+spend time recompiling what's changed (making it purely incremental) and only
+do the work that's needed to actually run and test your code.
+
+The output of the exploded image resides in `$BUILD/jdk`. You can test the
+newly built JDK like this: `$BUILD/jdk/bin/java -version`.
-> **`--with-import-hotspot=`**_path_ \
-> select the location to find hotspot binaries from a previous build to avoid
- building hotspot
+### Common Make Targets
-> **`--with-target-bits=`**_arg_ \
-> select 32 or 64 bit build
+Apart from the default target, here are some common make targets:
-> **`--with-jvm-variants=`**_variants_ \
-> select the JVM variants to build from, comma separated list that can
- include: server, client, kernel, zero and zeroshark
-
-> **`--with-memory-size=`**_size_ \
-> select the RAM size that GNU make will think this system has
+ * `hotspot` - Build all of hotspot (but only hotspot)
+ * `hotspot-<variant>` - Build just the specified jvm variant
+ * `images` or `product-images` - Build the JRE and JDK images
+ * `docs` or `docs-image` - Build the documentation image
+ * `test-image` - Build the test image
+ * `all` or `all-images` - Build all images (product, docs and test)
+ * `bootcycle-images` - Build images twice, second time with newly built JDK
+ (good for testing)
+ * `clean` - Remove all files generated by make, but not those generated by
+ configure
+ * `dist-clean` - Remove all files, including configuration
-> **`--with-msvcr-dll=`**_path_ \
-> select the `msvcr100.dll` file to include in the Windows builds (C/C++
- runtime library for Visual Studio).
+Run `make help` to get an up-to-date list of important make targets and make
+control variables.
-> This is usually picked up automatically from the redist directories of
- Visual Studio 2013.
+It is possible to build just a single module, a single phase, or a single phase
+of a single module, by creating make targets according to these followin
+patterns. A phase can be either of `gensrc`, `gendata`, `copy`, `java`,
+`launchers`, `libs` or `rmic`. See [Using Fine-Grained Make Targets](
+#using-fine-grained-make-targets) for more details about this functionality.
+
+ * `<phase>` - Build the specified phase and everything it depends on
+ * `<module>` - Build the specified module and everything it depends on
+ * `<module>-<phase>` - Compile the specified phase for the specified module
+ and everything it depends on
-> **`--with-num-cores=`**_cores_ \
-> select the number of cores to use (processor count or CPU count)
+Similarly, it is possible to clean just a part of the build by creating make
+targets according to these patterns:
-<a name="xrender"></a>
+ * `clean-<outputdir>` - Remove the subdir in the output dir with the name
+ * `clean-<phase>` - Remove all build results related to a certain build
+ phase
+ * `clean-<module>` - Remove all build results related to a certain module
+ * `clean-<module>-<phase>` - Remove all build results related to a certain
+ module and phase
-> **`--with-x=`**_path_ \
-> select the location of the X11 and xrender files.
+### Make Control Variables
+
+It is possible to control `make` behavior by overriding the value of `make`
+variables, either on the command line or in the environment.
-> The XRender Extension Headers are required for building the OpenJDK on
- Solaris and Linux. The Linux header files are usually available from a
- "Xrender" development package, it's recommended that you try and use the
- package provided by the particular distribution of Linux that you are using.
- The Solaris XRender header files is included with the other X11 header files
- in the package **SFWxwinc** on new enough versions of Solaris and will be
- installed in `/usr/X11/include/X11/extensions/Xrender.h` or
- `/usr/openwin/share/include/X11/extensions/Xrender.h`
+Normally, this is **not recommended**. If used improperly, it can lead to a
+broken build. Unless you're well versed in the build system, this is hard to
+use properly. Therefore, `make` will print a warning if this is detected.
--------------------------------------------------------------------------------
+However, there are a few `make` variables, known as *control variables* that
+are supposed to be overriden on the command line. These make up the "make time"
+configuration, as opposed to the "configure time" configuration.
-### Make
+#### General Make Control Variables
-The basic invocation of the `make` utility looks like:
+ * `JOBS` - Specify the number of jobs to build with. See [Build
+ Performance](#build-performance).
+ * `LOG` - Specify the logging level and functionality. See [Checking the
+ Build Log File](#checking-the-build-log-file)
+ * `CONF` and `CONF_NAME` - Selecting the configuration(s) to use. See [Using
+ Multiple Configurations](#using-multiple-configurations)
-> **`make all`**
+#### Test Make Control Variables
-This will start the build to the output directory containing the
-"configuration" that was created by the `configure` script. Run `make help` for
-more information on the available targets.
+These make control variables only make sense when running tests. Please see
+[Testing OpenJDK](testing.html) for details.
-There are some of the make targets that are of general interest:
+ * `TEST`
+ * `TEST_JOBS`
+ * `JTREG`
+ * `GTEST`
-> _empty_ \
-> build everything but no images
+#### Advanced Make Control Variables
-> **`all`** \
-> build everything including images
+These advanced make control variables can be potentially unsafe. See [Hints and
+Suggestions for Advanced Users](#hints-and-suggestions-for-advanced-users) and
+[Understanding the Build System](#understanding-the-build-system) for details.
-> **`all-conf`** \
-> build all configurations
+ * `SPEC`
+ * `CONF_CHECK`
+ * `COMPARE_BUILD`
+ * `JDK_FILTER`
-> **`images`** \
-> create complete j2sdk and j2re images
+## Running Tests
-> **`install`** \
-> install the generated images locally, typically in `/usr/local`
+Most of the OpenJDK tests are using the [JTReg](http://openjdk.java.net/jtreg)
+test framework. Make sure that your configuration knows where to find your
+installation of JTReg. If this is not picked up automatically, use the
+`--with-jtreg=<path to jtreg home>` option to point to the JTReg framework.
+Note that this option should point to the JTReg home, i.e. the top directory,
+containing `lib/jtreg.jar` etc.
-> **`clean`** \
-> remove all files generated by make, but not those generated by `configure`
+To execute the most basic tests (tier 1), use:
+```
+make run-test-tier1
+```
-> **`dist-clean`** \
-> remove all files generated by both and `configure` (basically killing the
- configuration)
+For more details on how to run tests, please see the [Testing
+OpenJDK](testing.html) document.
-> **`help`** \
-> give some help on using `make`, including some interesting make targets
+## Cross-compiling
+
+Cross-compiling means using one platform (the *build* platform) to generate
+output that can ran on another platform (the *target* platform).
--------------------------------------------------------------------------------
-
-## Testing
+The typical reason for cross-compiling is that the build is performed on a more
+powerful desktop computer, but the resulting binaries will be able to run on a
+different, typically low-performing system. Most of the complications that
+arise when building for embedded is due to this separation of *build* and
+*target* systems.
-When the build is completed, you should see the generated binaries and
-associated files in the `j2sdk-image` directory in the output directory. In
-particular, the `build/*/images/j2sdk-image/bin` directory should contain
-executables for the OpenJDK tools and utilities for that configuration. The
-testing tool `jtreg` will be needed and can be found at: [the jtreg
-site](http://openjdk.java.net/jtreg/). The provided regression tests in the
-repositories can be run with the command:
+This requires a more complex setup and build procedure. This section assumes
+you are familiar with cross-compiling in general, and will only deal with the
+particularities of cross-compiling OpenJDK. If you are new to cross-compiling,
+please see the [external links at Wikipedia](
+https://en.wikipedia.org/wiki/Cross_compiler#External_links) for a good start
+on reading materials.
-> **``cd test && make PRODUCT_HOME=`pwd`/../build/*/images/j2sdk-image all``**
+Cross-compiling OpenJDK requires you to be able to build both for the build
+platform and for the target platform. The reason for the former is that we need
+to build and execute tools during the build process, both native tools and Java
+tools.
--------------------------------------------------------------------------------
+If all you want to do is to compile a 32-bit version, for the same OS, on a
+64-bit machine, consider using `--with-target-bits=32` instead of doing a
+full-blown cross-compilation. (While this surely is possible, it's a lot more
+work and will take much longer to build.)
-## Appendix A: Hints and Tips
+### Boot JDK and Build JDK
-### FAQ
+When cross-compiling, make sure you use a boot JDK that runs on the *build*
+system, and not on the *target* system.
-**Q:** The `generated-configure.sh` file looks horrible! How are you going to
-edit it? \
-**A:** The `generated-configure.sh` file is generated (think "compiled") by the
-autoconf tools. The source code is in `configure.ac` and various .m4 files in
-common/autoconf, which are much more readable.
+To be able to build, we need a "Build JDK", which is a JDK built from the
+current sources (that is, the same as the end result of the entire build
+process), but able to run on the *build* system, and not the *target* system.
+(In contrast, the Boot JDK should be from an older release, e.g. JDK 8 when
+building JDK 9.)
-**Q:** Why is the `generated-configure.sh` file checked in, if it is
-generated? \
-**A:** If it was not generated, every user would need to have the autoconf
-tools installed, and re-generate the `configure` file as the first step. Our
-goal is to minimize the work needed to be done by the user to start building
-OpenJDK, and to minimize the number of external dependencies required.
+The build process will create a minimal Build JDK for you, as part of building.
+To speed up the build, you can use `--with-build-jdk` to `configure` to point
+to a pre-built Build JDK. Please note that the build result is unpredictable,
+and can possibly break in subtle ways, if the Build JDK does not **exactly**
+match the current sources.
+
+### Specifying the Target Platform
-**Q:** Do you require a specific version of autoconf for regenerating
-`generated-configure.sh`? \
-**A:** Yes, version 2.69 is required and should be easy enough to aquire on all
-supported operating systems. The reason for this is to avoid large spurious
-changes in `generated-configure.sh`.
+You *must* specify the target platform when cross-compiling. Doing so will also
+automatically turn the build into a cross-compiling mode. The simplest way to
+do this is to use the `--openjdk-target` argument, e.g.
+`--openjdk-target=arm-linux-gnueabihf`. or `--openjdk-target=aarch64-oe-linux`.
+This will automatically set the `--build`, `--host` and `--target` options for
+autoconf, which can otherwise be confusing. (In autoconf terminology, the
+"target" is known as "host", and "target" is used for building a Canadian
+cross-compiler.)
+
+### Toolchain Considerations
-**Q:** How do you regenerate `generated-configure.sh` after making changes to
-the input files? \
-**A:** Regnerating `generated-configure.sh` should always be done using the
-script `common/autoconf/autogen.sh` to ensure that the correct files get
-updated. This script should also be run after mercurial tries to merge
-`generated-configure.sh` as a merge of the generated file is not guaranteed to
-be correct.
+You will need two copies of your toolchain, one which generates output that can
+run on the target system (the normal, or *target*, toolchain), and one that
+generates output that can run on the build system (the *build* toolchain). Note
+that cross-compiling is only supported for gcc at the time being. The gcc
+standard is to prefix cross-compiling toolchains with the target denominator.
+If you follow this standard, `configure` is likely to pick up the toolchain
+correctly.
-**Q:** What are the files in `common/makefiles/support/*` for? They look like
-gibberish. \
-**A:** They are a somewhat ugly hack to compensate for command line length
-limitations on certain platforms (Windows, Solaris). Due to a combination of
-limitations in make and the shell, command lines containing too many files will
-not work properly. These helper files are part of an elaborate hack that will
-compress the command line in the makefile and then uncompress it safely. We're
-not proud of it, but it does fix the problem. If you have any better
-suggestions, we're all ears! :-)
+The *build* toolchain will be autodetected just the same way the normal
+*build*/*target* toolchain will be autodetected when not cross-compiling. If
+this is not what you want, or if the autodetection fails, you can specify a
+devkit containing the *build* toolchain using `--with-build-devkit` to
+`configure`, or by giving `BUILD_CC` and `BUILD_CXX` arguments.
+
+It is often helpful to locate the cross-compilation tools, headers and
+libraries in a separate directory, outside the normal path, and point out that
+directory to `configure`. Do this by setting the sysroot (`--with-sysroot`) and
+appending the directory when searching for cross-compilations tools
+(`--with-toolchain-path`). As a compact form, you can also use `--with-devkit`
+to point to a single directory, if it is correctly setup. (See `basics.m4` for
+details.)
+
+If you are unsure what toolchain and versions to use, these have been proved
+working at the time of writing:
-**Q:** I want to see the output of the commands that make runs, like in the old
-build. How do I do that? \
-**A:** You specify the `LOG` variable to make. There are several log levels:
+ * [aarch64](
+https://releases.linaro.org/archive/13.11/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux.tar.xz)
+ * [arm 32-bit hardware floating point](
+https://launchpad.net/linaro-toolchain-unsupported/trunk/2012.09/+download/gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux.tar.bz2)
+
+### Native Libraries
+
+You will need copies of external native libraries for the *target* system,
+present on the *build* machine while building.
- * **`warn`** -- Default and very quiet.
- * **`info`** -- Shows more progress information than warn.
- * **`debug`** -- Echos all command lines and prints all macro calls for
- compilation definitions.
- * **`trace`** -- Echos all \$(shell) command lines as well.
+Take care not to replace the *build* system's version of these libraries by
+mistake, since that can render the *build* machine unusable.
-**Q:** When do I have to re-run `configure`? \
-**A:** Normally you will run `configure` only once for creating a
-configuration. You need to re-run configuration only if you want to change any
-configuration options, or if you pull down changes to the `configure` script.
+Make sure that the libraries you point to (ALSA, X11, etc) are for the
+*target*, not the *build*, platform.
+
+#### ALSA
+
+You will need alsa libraries suitable for your *target* system. For most cases,
+using Debian's pre-built libraries work fine.
-**Q:** I have added a new source file. Do I need to modify the makefiles? \
-**A:** Normally, no. If you want to create e.g. a new native library, you will
-need to modify the makefiles. But for normal file additions or removals, no
-changes are needed. There are certan exceptions for some native libraries where
-the source files are spread over many directories which also contain sources
-for other libraries. In these cases it was simply easier to create include
-lists rather than excludes.
+Note that alsa is needed even if you only want to build a headless JDK.
+
+ * Go to [Debian Package Search](https://www.debian.org/distrib/packages) and
+ search for the `libasound2` and `libasound2-dev` packages for your *target*
+ system. Download them to /tmp.
-**Q:** When I run `configure --help`, I see many strange options, like
-`--dvidir`. What is this? \
-**A:** Configure provides a slew of options by default, to all projects that
-use autoconf. Most of them are not used in OpenJDK, so you can safely ignore
-them. To list only OpenJDK specific features, use `configure --help=short`
-instead.
+ * Install the libraries into the cross-compilation toolchain. For instance:
+```
+cd /tools/gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux/arm-linux-gnueabihf/libc
+dpkg-deb -x /tmp/libasound2_1.0.25-4_armhf.deb .
+dpkg-deb -x /tmp/libasound2-dev_1.0.25-4_armhf.deb .
+```
-**Q:** `configure` provides OpenJDK-specific features such as
-`--with-builddeps-server` that are not described in this document. What about
-those? \
-**A:** Try them out if you like! But be aware that most of these are
-experimental features. Many of them don't do anything at all at the moment; the
-option is just a placeholder. Others depend on pieces of code or infrastructure
-that is currently not ready for prime time.
+ * If alsa is not properly detected by `configure`, you can point it out by
+ `--with-alsa`.
+
+#### X11
+
+You will need X11 libraries suitable for your *target* system. For most cases,
+using Debian's pre-built libraries work fine.
+
+Note that X11 is needed even if you only want to build a headless JDK.
-**Q:** How will you make sure you don't break anything? \
-**A:** We have a script that compares the result of the new build system with
-the result of the old. For most part, we aim for (and achieve) byte-by-byte
-identical output. There are however technical issues with e.g. native binaries,
-which might differ in a byte-by-byte comparison, even when building twice with
-the old build system. For these, we compare relevant aspects (e.g. the symbol
-table and file size). Note that we still don't have 100% equivalence, but we're
-close.
+ * Go to [Debian Package Search](https://www.debian.org/distrib/packages),
+ search for the following packages for your *target* system, and download them
+ to /tmp/target-x11:
+ * libxi
+ * libxi-dev
+ * x11proto-core-dev
+ * x11proto-input-dev
+ * x11proto-kb-dev
+ * x11proto-render-dev
+ * x11proto-xext-dev
+ * libice-dev
+ * libxrender
+ * libxrender-dev
+ * libsm-dev
+ * libxt-dev
+ * libx11
+ * libx11-dev
+ * libxtst
+ * libxtst-dev
+ * libxext
+ * libxext-dev
-**Q:** I noticed this thing X in the build that looks very broken by design.
-Why don't you fix it? \
-**A:** Our goal is to produce a build output that is as close as technically
-possible to the old build output. If things were weird in the old build, they
-will be weird in the new build. Often, things were weird before due to
-obscurity, but in the new build system the weird stuff comes up to the surface.
-The plan is to attack these things at a later stage, after the new build system
-is established.
+ * Install the libraries into the cross-compilation toolchain. For instance:
+ ```
+ cd /tools/gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux/arm-linux-gnueabihf/libc/usr
+ mkdir X11R6
+ cd X11R6
+ for deb in /tmp/target-x11/*.deb ; do dpkg-deb -x $deb . ; done
+ mv usr/* .
+ cd lib
+ cp arm-linux-gnueabihf/* .
+ ```
-**Q:** The code in the new build system is not that well-structured. Will you
-fix this? \
-**A:** Yes! The new build system has grown bit by bit as we converted the old
-system. When all of the old build system is converted, we can take a step back
-and clean up the structure of the new build system. Some of this we plan to do
-before replacing the old build system and some will need to wait until after.
+ You can ignore the following messages. These libraries are not needed to
+ successfully complete a full JDK build.
+ ```
+ cp: cannot stat `arm-linux-gnueabihf/libICE.so': No such file or directory
+ cp: cannot stat `arm-linux-gnueabihf/libSM.so': No such file or directory
+ cp: cannot stat `arm-linux-gnueabihf/libXt.so': No such file or directory
+ ```
+
+ * If the X11 libraries are not properly detected by `configure`, you can
+ point them out by `--with-x`.
+
+### Building for ARM/aarch64
+
+A common cross-compilation target is the ARM CPU. When building for ARM, it is
+useful to set the ABI profile. A number of pre-defined ABI profiles are
+available using `--with-abi-profile`: arm-vfp-sflt, arm-vfp-hflt, arm-sflt,
+armv5-vfp-sflt, armv6-vfp-hflt. Note that soft-float ABIs are no longer
+properly supported on OpenJDK.
-**Q:** Is anything able to use the results of the new build's default make
-target? \
-**A:** Yes, this is the minimal (or roughly minimal) set of compiled output
-needed for a developer to actually execute the newly built JDK. The idea is
-that in an incremental development fashion, when doing a normal make, you
-should only spend time recompiling what's changed (making it purely
-incremental) and only do the work that's needed to actually run and test your
-code. The packaging stuff that is part of the `images` target is not needed for
-a normal developer who wants to test his new code. Even if it's quite fast,
-it's still unnecessary. We're targeting sub-second incremental rebuilds! ;-)
-(Or, well, at least single-digit seconds...)
+OpenJDK contains two different ports for the aarch64 platform, one is the
+original aarch64 port from the [AArch64 Port Project](
+http://openjdk.java.net/projects/aarch64-port) and one is a 64-bit version of
+the Oracle contributed ARM port. When targeting aarch64, by the default the
+original aarch64 port is used. To select the Oracle ARM 64 port, use
+`--with-cpu-port=arm64`. Also set the corresponding value (`aarch64` or
+`arm64`) to --with-abi-profile, to ensure a consistent build.
+
+### Verifying the Build
-**Q:** I usually set a specific environment variable when building, but I can't
-find the equivalent in the new build. What should I do? \
-**A:** It might very well be that we have neglected to add support for an
-option that was actually used from outside the build system. Email us and we
-will add support for it!
+The build will end up in a directory named like
+`build/linux-arm-normal-server-release`.
-### Build Performance Tips
+Inside this build output directory, the `images/jdk` and `images/jre` will
+contain the newly built JDK and JRE, respectively, for your *target* system.
+
+Copy these folders to your *target* system. Then you can run e.g.
+`images/jdk/bin/java -version`.
+
+## Build Performance
Building OpenJDK requires a lot of horsepower. Some of the build tools can be
adjusted to utilize more or less of resources such as parallel threads and
@@ -718,398 +1188,696 @@
problems, such as out of memory conditions, you can modify the detected values
with:
- * **`--with-num-cores`** -- number of cores in the build system, e.g.
- `--with-num-cores=8`
- * **`--with-memory-size`** -- memory (in MB) available in the build system,
- e.g. `--with-memory-size=1024`
+ * `--with-num-cores` -- number of cores in the build system, e.g.
+ `--with-num-cores=8`.
+
+ * `--with-memory-size` -- memory (in MB) available in the build system, e.g.
+ `--with-memory-size=1024`
-It might also be necessary to specify the JVM arguments passed to the Bootstrap
-JDK, using e.g. `--with-boot-jdk-jvmargs="-Xmx8G -enableassertions"`. Doing
-this will override the default JVM arguments passed to the Bootstrap JDK.
+You can also specify directly the number of build jobs to use with
+`--with-jobs=N` to `configure`, or `JOBS=N` to `make`. Do not use the `-j` flag
+to `make`. In most cases it will be ignored by the makefiles, but it can cause
+problems for some make targets.
-One of the top goals of the new build system is to improve the build
-performance and decrease the time needed to build. This will soon also apply to
-the java compilation when the Smart Javac wrapper is fully supported.
+It might also be necessary to specify the JVM arguments passed to the Boot JDK,
+using e.g. `--with-boot-jdk-jvmargs="-Xmx8G"`. Doing so will override the
+default JVM arguments passed to the Boot JDK.
At the end of a successful execution of `configure`, you will get a performance
summary, indicating how well the build will perform. Here you will also get
performance hints. If you want to build fast, pay attention to those!
-#### Building with ccache
+If you want to tweak build performance, run with `make LOG=info` to get a build
+time summary at the end of the build process.
+
+### Disk Speed
+
+If you are using network shares, e.g. via NFS, for your source code, make sure
+the build directory is situated on local disk (e.g. by `ln -s
+/localdisk/jdk-build $JDK-SHARE/build`). The performance penalty is extremely
+high for building on a network share; close to unusable.
+
+Also, make sure that your build tools (including Boot JDK and toolchain) is
+located on a local disk and not a network share.
+
+As has been stressed elsewhere, do use SSD for source code and build directory,
+as well as (if possible) the build tools.
+
+### Virus Checking
+
+The use of virus checking software, especially on Windows, can *significantly*
+slow down building of OpenJDK. If possible, turn off such software, or exclude
+the directory containing the OpenJDK source code from on-the-fly checking.
+
+### Ccache
The OpenJDK build supports building with ccache when using gcc or clang. Using
ccache can radically speed up compilation of native code if you often rebuild
-the same sources. Your milage may vary however so we recommend evaluating it
+the same sources. Your milage may vary however, so we recommend evaluating it
for yourself. To enable it, make sure it's on the path and configure with
`--enable-ccache`.
-#### Building on local disk
+### Precompiled Headers
+
+By default, the Hotspot build uses preccompiled headers (PCH) on the toolchains
+were it is properly supported (clang, gcc, and Visual Studio). Normally, this
+speeds up the build process, but in some circumstances, it can actually slow
+things down.
-If you are using network shares, e.g. via NFS, for your source code, make sure
-the build directory is situated on local disk. The performance penalty is
-extremely high for building on a network share, close to unusable.
+You can experiment by disabling precompiled headers using
+`--disable-precompiled-headers`.
+
+### Icecc / icecream
-#### Building only one JVM
+[icecc/icecream](http://github.com/icecc/icecream) is a simple way to setup a
+distributed compiler network. If you have multiple machines available for
+building OpenJDK, you can drastically cut individual build times by utilizing
+it.
-The old build builds multiple JVMs on 32-bit systems (client and server; and on
-Windows kernel as well). In the new build we have changed this default to only
-build server when it's available. This improves build times for those not
-interested in multiple JVMs. To mimic the old behavior on platforms that
-support it, use `--with-jvm-variants=client,server`.
+To use, setup an icecc network, and install icecc on the build machine. Then
+run `configure` using `--enable-icecc`.
+
+### Using sjavac
+
+To speed up Java compilation, especially incremental compilations, you can try
+the experimental sjavac compiler by using `--enable-sjavac`.
-#### Selecting the number of cores to build on
+### Building the Right Target
+
+Selecting the proper target to build can have dramatic impact on build time.
+For normal usage, `jdk` or the default target is just fine. You only need to
+build `images` for shipping, or if your tests require it.
+
+See also [Using Fine-Grained Make Targets](#using-fine-grained-make-targets) on
+how to build an even smaller subset of the product.
+
+## Troubleshooting
-By default, `configure` will analyze your machine and run the make process in
-parallel with as many threads as you have cores. This behavior can be
-overridden, either "permanently" (on a `configure` basis) using
-`--with-num-cores=N` or for a single build only (on a make basis), using
-`make JOBS=N`.
+If your build fails, it can sometimes be difficult to pinpoint the problem or
+find a proper solution.
+
+### Locating the Source of the Error
-If you want to make a slower build just this time, to save some CPU power for
-other processes, you can run e.g. `make JOBS=2`. This will force the makefiles
-to only run 2 parallel processes, or even `make JOBS=1` which will disable
-parallelism.
+When a build fails, it can be hard to pinpoint the actual cause of the error.
+In a typical build process, different parts of the product build in parallel,
+with the output interlaced.
+
+#### Build Failure Summary
+
+To help you, the build system will print a failure summary at the end. It looks
+like this:
+
+```
+ERROR: Build failed for target 'hotspot' in configuration 'linux-x64' (exit code 2)
-If you want to have it the other way round, namely having slow builds default
-and override with fast if you're impatient, you should call `configure` with
-`--with-num-cores=2`, making 2 the default. If you want to run with more cores,
-run `make JOBS=8`
+=== Output from failing command(s) repeated here ===
+* For target hotspot_variant-server_libjvm_objs_psMemoryPool.o:
+/localhome/hg/jdk9-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: 'failhere' does not name a type
+ ... (rest of output omitted)
-### Troubleshooting
+* All command lines available in /localhome/hg/jdk9-sandbox/build/linux-x64/make-support/failure-logs.
+=== End of repeated output ===
-#### Solving build problems
+=== Make failed targets repeated here ===
+lib/CompileJvm.gmk:207: recipe for target '/localhome/hg/jdk9-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o' failed
+make/Main.gmk:263: recipe for target 'hotspot-server-libs' failed
+=== End of repeated output ===
-If the build fails (and it's not due to a compilation error in a source file
-you've changed), the first thing you should do is to re-run the build with more
-verbosity. Do this by adding `LOG=debug` to your make command line.
+Hint: Try searching the build log for the name of the first failed target.
+Hint: If caused by a warning, try configure --disable-warnings-as-errors.
+```
-The build log (with both stdout and stderr intermingled, basically the same as
-you see on your console) can be found as `build.log` in your build directory.
+Let's break it down! First, the selected configuration, and the top-level
+target you entered on the command line that caused the failure is printed.
-You can ask for help on build problems with the new build system on either the
-[build-dev](http://mail.openjdk.java.net/mailman/listinfo/build-dev) or the
-[build-infra-dev](http://mail.openjdk.java.net/mailman/listinfo/build-infra-dev)
-mailing lists. Please include the relevant parts of the build log.
+Then, between the `Output from failing command(s) repeated here` and `End of
+repeated output` the first lines of output (stdout and stderr) from the actual
+failing command is repeated. In most cases, this is the error message that
+caused the build to fail. If multiple commands were failing (this can happen in
+a parallel build), output from all failed commands will be printed here.
+
+The path to the `failure-logs` directory is printed. In this file you will find
+a `<target>.log` file that contains the output from this command in its
+entirety, and also a `<target>.cmd`, which contain the complete command line
+used for running this command. You can re-run the failing command by executing
+`. <path to failure-logs>/<target>.cmd` in your shell.
-A build can fail for any number of reasons. Most failures are a result of
-trying to build in an environment in which all the pre-build requirements have
-not been met. The first step in troubleshooting a build failure is to recheck
-that you have satisfied all the pre-build requirements for your platform.
-Scanning the `configure` log is a good first step, making sure that what it
-found makes sense for your system. Look for strange error messages or any
-difficulties that `configure` had in finding things.
+Another way to trace the failure is to follow the chain of make targets, from
+top-level targets to individual file targets. Between `Make failed targets
+repeated here` and `End of repeated output` the output from make showing this
+chain is repeated. The first failed recipe will typically contain the full path
+to the file in question that failed to compile. Following lines will show a
+trace of make targets why we ended up trying to compile that file.
+
+Finally, some hints are given on how to locate the error in the complete log.
+In this example, we would try searching the log file for "`psMemoryPool.o`".
+Another way to quickly locate make errors in the log is to search for "`]
+Error`" or "`***`".
-Some of the more common problems with builds are briefly described below, with
-suggestions for remedies.
+Note that the build failure summary will only help you if the issue was a
+compilation failure or similar. If the problem is more esoteric, or is due to
+errors in the build machinery, you will likely get empty output logs, and `No
+indication of failed target found` instead of the make target chain.
+
+#### Checking the Build Log File
+
+The output (stdout and stderr) from the latest build is always stored in
+`$BUILD/build.log`. The previous build log is stored as `build.log.old`. This
+means that it is not necessary to redirect the build output yourself if you
+want to process it.
- * **Corrupted Bundles on Windows:** \
- Some virus scanning software has been known to corrupt the downloading of
- zip bundles. It may be necessary to disable the 'on access' or 'real time'
- virus scanning features to prevent this corruption. This type of 'real time'
- virus scanning can also slow down the build process significantly.
- Temporarily disabling the feature, or excluding the build output directory
- may be necessary to get correct and faster builds.
+You can increase the verbosity of the log file, by the `LOG` control variable
+to `make`. If you want to see the command lines used in compilations, use
+`LOG=cmdlines`. To increase the general verbosity, use `LOG=info`, `LOG=debug`
+or `LOG=trace`. Both of these can be combined with `cmdlines`, e.g.
+`LOG=info,cmdlines`. The `debug` log level will show most shell commands
+executed by make, and `trace` will show all. Beware that both these log levels
+will produce a massive build log!
+
+### Fixing Unexpected Build Failures
- * **Slow Builds:** \
- If your build machine seems to be overloaded from too many simultaneous C++
- compiles, try setting the `JOBS=1` on the `make` command line. Then try
- increasing the count slowly to an acceptable level for your system. Also:
+Most of the time, the build will fail due to incorrect changes in the source
+code.
+
+Sometimes the build can fail with no apparent changes that have caused the
+failure. If this is the first time you are building OpenJDK on this particular
+computer, and the build fails, the problem is likely with your build
+environment. But even if you have previously built OpenJDK with success, and it
+now fails, your build environment might have changed (perhaps due to OS
+upgrades or similar). But most likely, such failures are due to problems with
+the incremental rebuild.
+
+#### Problems with the Build Environment
- Creating the javadocs can be very slow, if you are running javadoc, consider
- skipping that step.
+Make sure your configuration is correct. Re-run `configure`, and look for any
+warnings. Warnings that appear in the middle of the `configure` output is also
+repeated at the end, after the summary. The entire log is stored in
+`$BUILD/configure.log`.
- Faster CPUs, more RAM, and a faster DISK usually helps. The VM build tends
- to be CPU intensive (many C++ compiles), and the rest of the JDK will often
- be disk intensive.
+Verify that the summary at the end looks correct. Are you indeed using the Boot
+JDK and native toolchain that you expect?
- Faster compiles are possible using a tool called
- [ccache](http://ccache.samba.org/).
+By default, OpenJDK has a strict approach where warnings from the compiler is
+considered errors which fail the build. For very new or very old compiler
+versions, this can trigger new classes of warnings, which thus fails the build.
+Run `configure` with `--disable-warnings-as-errors` to turn of this behavior.
+(The warnings will still show, but not make the build fail.)
- * **File time issues:** \
- If you see warnings that refer to file time stamps, e.g.
+#### Problems with Incremental Rebuilds
- > _Warning message:_ ` File 'xxx' has modification time in the future.` \
- > _Warning message:_ ` Clock skew detected. Your build may be incomplete.`
+Incremental rebuilds mean that when you modify part of the product, only the
+affected parts get rebuilt. While this works great in most cases, and
+significantly speed up the development process, from time to time complex
+interdependencies will result in an incorrect build result. This is the most
+common cause for unexpected build problems, together with inconsistencies
+between the different Mercurial repositories in the forest.
- These warnings can occur when the clock on the build machine is out of sync
- with the timestamps on the source files. Other errors, apparently unrelated
- but in fact caused by the clock skew, can occur along with the clock skew
- warnings. These secondary errors may tend to obscure the fact that the true
- root cause of the problem is an out-of-sync clock.
+Here are a suggested list of things to try if you are having unexpected build
+problems. Each step requires more time than the one before, so try them in
+order. Most issues will be solved at step 1 or 2.
+
+ 1. Make sure your forest is up-to-date
+
+ Run `bash get_source.sh` to make sure you have the latest version of all
+ repositories.
+
+ 2. Clean build results
+
+ The simplest way to fix incremental rebuild issues is to run `make clean`.
+ This will remove all build results, but not the configuration or any build
+ system support artifacts. In most cases, this will solve build errors
+ resulting from incremental build mismatches.
- If you see these warnings, reset the clock on the build machine, run
- "`gmake clobber`" or delete the directory containing the build output, and
- restart the build from the beginning.
+ 3. Completely clean the build directory.
+
+ If this does not work, the next step is to run `make dist-clean`, or
+ removing the build output directory (`$BUILD`). This will clean all
+ generated output, including your configuration. You will need to re-run
+ `configure` after this step. A good idea is to run `make
+ print-configuration` before running `make dist-clean`, as this will print
+ your current `configure` command line. Here's a way to do this:
- * **Error message: `Trouble writing out table to disk`** \
- Increase the amount of swap space on your build machine. This could be
- caused by overloading the system and it may be necessary to use:
+ ```
+ make print-configuration > current-configuration
+ make dist-clean
+ bash configure $(cat current-configuration)
+ make
+ ```
- > `make JOBS=1`
-
- to reduce the load on the system.
+ 4. Re-clone the Mercurial forest
- * **Error Message: `libstdc++ not found`:** \
- This is caused by a missing libstdc++.a library. This is installed as part
- of a specific package (e.g. libstdc++.so.devel.386). By default some 64-bit
- Linux versions (e.g. Fedora) only install the 64-bit version of the
- libstdc++ package. Various parts of the JDK build require a static link of
- the C++ runtime libraries to allow for maximum portability of the built
- images.
+ Sometimes the Mercurial repositories themselves gets in a state that causes
+ the product to be un-buildable. In such a case, the simplest solution is
+ often the "sledgehammer approach": delete the entire forest, and re-clone
+ it. If you have local changes, save them first to a different location
+ using `hg export`.
+
+### Specific Build Issues
+
+#### Clock Skew
- * **Linux Error Message: `cannot restore segment prot after reloc`** \
- This is probably an issue with SELinux (See [SELinux on
- Wikipedia](http://en.wikipedia.org/wiki/SELinux)). Parts of the VM is built
- without the `-fPIC` for performance reasons.
-
- To completely disable SELinux:
+If you get an error message like this:
+```
+File 'xxx' has modification time in the future.
+Clock skew detected. Your build may be incomplete.
+```
+then the clock on your build machine is out of sync with the timestamps on the
+source files. Other errors, apparently unrelated but in fact caused by the
+clock skew, can occur along with the clock skew warnings. These secondary
+errors may tend to obscure the fact that the true root cause of the problem is
+an out-of-sync clock.
- 1. `$ su root`
- 2. `# system-config-securitylevel`
- 3. `In the window that appears, select the SELinux tab`
- 4. `Disable SELinux`
+If you see these warnings, reset the clock on the build machine, run `make
+clean` and restart the build.
+
+#### Out of Memory Errors
+
+On Solaris, you might get an error message like this:
+```
+Trouble writing out table to disk
+```
+To solve this, increase the amount of swap space on your build machine.
- Alternatively, instead of completely disabling it you could disable just
- this one check.
+On Windows, you might get error messages like this:
+```
+fatal error - couldn't allocate heap
+cannot create ... Permission denied
+spawn failed
+```
+This can be a sign of a Cygwin problem. See the information about solving
+problems in the [Cygwin](#cygwin) section. Rebooting the computer might help
+temporarily.
- 1. Select System->Administration->SELinux Management
- 2. In the SELinux Management Tool which appears, select "Boolean" from the
- menu on the left
- 3. Expand the "Memory Protection" group
- 4. Check the first item, labeled "Allow all unconfined executables to use
- libraries requiring text relocation ..."
+### Getting Help
- * **Windows Error Messages:** \
- `*** fatal error - couldn't allocate heap, ... ` \
- `rm fails with "Directory not empty"` \
- `unzip fails with "cannot create ... Permission denied"` \
- `unzip fails with "cannot create ... Error 50"`
+If none of the suggestions in this document helps you, or if you find what you
+believe is a bug in the build system, please contact the Build Group by sending
+a mail to [build-dev@openjdk.java.net](mailto:build-dev@openjdk.java.net).
+Please include the relevant parts of the configure and/or build log.
+
+If you need general help or advice about developing for OpenJDK, you can also
+contact the Adoption Group. See the section on [Contributing to OpenJDK](
+#contributing-to-openjdk) for more information.
- The CYGWIN software can conflict with other non-CYGWIN software. See the
- CYGWIN FAQ section on [BLODA (applications that interfere with
- CYGWIN)](http://cygwin.com/faq/faq.using.html#faq.using.bloda).
+## Hints and Suggestions for Advanced Users
+
+### Setting Up a Forest for Pushing Changes (defpath)
+
+To help you prepare a proper push path for a Mercurial repository, there exists
+a useful tool known as [defpath](
+http://openjdk.java.net/projects/code-tools/defpath). It will help you setup a
+proper push path for pushing changes to OpenJDK.
- * **Windows Error Message: `spawn failed`** \
- Try rebooting the system, or there could be some kind of issue with the disk
- or disk partition being used. Sometimes it comes with a "Permission Denied"
- message.
+Install the extension by cloning
+`http://hg.openjdk.java.net/code-tools/defpath` and updating your `.hgrc` file.
+Here's one way to do this:
--------------------------------------------------------------------------------
-
-## Appendix B: GNU make
+```
+cd ~
+mkdir hg-ext
+cd hg-ext
+hg clone http://hg.openjdk.java.net/code-tools/defpath
+cat << EOT >> ~/.hgrc
+[extensions]
+defpath=~/hg-ext/defpath/defpath.py
+EOT
+```
-The Makefiles in the OpenJDK are only valid when used with the GNU version of
-the utility command `make` (usually called `gmake` on Solaris). A few notes
-about using GNU make:
+You can now setup a proper push path using:
+```
+hg defpath -d -u <your OpenJDK username>
+```
- * You need GNU make version 3.81 or newer. On Windows 4.0 or newer is
- recommended. If the GNU make utility on your systems is not of a suitable
- version, see "[Building GNU make](#buildgmake)".
- * Place the location of the GNU make binary in the `PATH`.
- * **Solaris:** Do NOT use `/usr/bin/make` on Solaris. If your Solaris system
- has the software from the Solaris Developer Companion CD installed, you
- should try and use `/usr/bin/gmake` or `/usr/gnu/bin/make`.
- * **Windows:** Make sure you start your build inside a bash shell.
- * **Mac OS X:** The XCode "command line tools" must be installed on your Mac.
+If you also have the `trees` extension installed in Mercurial, you will
+automatically get a `tdefpath` command, which is even more useful. By running
+`hg tdefpath -du <username>` in the top repository of your forest, all repos
+will get setup automatically. This is the recommended usage.
+
+### Bash Completion
+
+The `configure` and `make` commands tries to play nice with bash command-line
+completion (using `<tab>` or `<tab><tab>`). To use this functionality, make
+sure you enable completion in your `~/.bashrc` (see instructions for bash in
+your operating system).
+
+Make completion will work out of the box, and will complete valid make targets.
+For instance, typing `make jdk-i<tab>` will complete to `make jdk-image`.
+
+The `configure` script can get completion for options, but for this to work you
+need to help `bash` on the way. The standard way of running the script, `bash
+configure`, will not be understood by bash completion. You need `configure` to
+be the command to run. One way to achieve this is to add a simple helper script
+to your path:
-Information on GNU make, and access to ftp download sites, are available on the
-[GNU make web site](http://www.gnu.org/software/make/make.html). The latest
-source to GNU make is available at
-[ftp.gnu.org/pub/gnu/make/](http://ftp.gnu.org/pub/gnu/make/).
-
-### Building GNU make
+```
+cat << EOT > /tmp/configure
+#!/bin/bash
+if [ \$(pwd) = \$(cd \$(dirname \$0); pwd) ] ; then
+ echo >&2 "Abort: Trying to call configure helper recursively"
+ exit 1
+fi
-First step is to get the GNU make 3.81 or newer source from
-[ftp.gnu.org/pub/gnu/make/](http://ftp.gnu.org/pub/gnu/make/). Building is a
-little different depending on the OS but is basically done with:
+bash \$PWD/configure "\$@"
+EOT
+chmod +x /tmp/configure
+sudo mv /tmp/configure /usr/local/bin
+```
+
+Now `configure --en<tab>-dt<tab>` will result in `configure --enable-dtrace`.
- bash ./configure
- make
+### Using Multiple Configurations
--------------------------------------------------------------------------------
+You can have multiple configurations for a single source forest. When you
+create a new configuration, run `configure --with-conf-name=<name>` to create a
+configuration with the name `<name>`. Alternatively, you can create a directory
+under `build` and run `configure` from there, e.g. `mkdir build/<name> && cd
+build/<name> && bash ../../configure`.
-## Appendix C: Build Environments
+Then you can build that configuration using `make CONF_NAME=<name>` or `make
+CONF=<pattern>`, where `<pattern>` is a substring matching one or several
+configurations, e.g. `CONF=debug`. The special empty pattern (`CONF=`) will
+match *all* available configuration, so `make CONF= hotspot` will build the
+`hotspot` target for all configurations. Alternatively, you can execute `make`
+in the configuration directory, e.g. `cd build/<name> && make`.
+
+### Handling Reconfigurations
-### Minimum Build Environments
+If you update the forest and part of the configure script has changed, the
+build system will force you to re-run `configure`.
+
+Most of the time, you will be fine by running `configure` again with the same
+arguments as the last time, which can easily be performed by `make
+reconfigure`. To simplify this, you can use the `CONF_CHECK` make control
+variable, either as `make CONF_CHECK=auto`, or by setting an environment
+variable. For instance, if you add `export CONF_CHECK=auto` to your `.bashrc`
+file, `make` will always run `reconfigure` automatically whenever the configure
+script has changed.
-This file often describes specific requirements for what we call the "minimum
-build environments" (MBE) for this specific release of the JDK. What is listed
-below is what the Oracle Release Engineering Team will use to build the Oracle
-JDK product. Building with the MBE will hopefully generate the most compatible
-bits that install on, and run correctly on, the most variations of the same
-base OS and hardware architecture. In some cases, these represent what is often
-called the least common denominator, but each Operating System has different
-aspects to it.
+You can also use `CONF_CHECK=ignore` to skip the check for a needed configure
+update. This might speed up the build, but comes at the risk of an incorrect
+build result. This is only recommended if you know what you're doing.
+
+From time to time, you will also need to modify the command line to `configure`
+due to changes. Use `make print-configure` to show the command line used for
+your current configuration.
+
+### Using Fine-Grained Make Targets
-In all cases, the Bootstrap JDK version minimum is critical, we cannot
-guarantee builds will work with older Bootstrap JDK's. Also in all cases, more
-RAM and more processors is better, the minimums listed below are simply
-recommendations.
+The default behavior for make is to create consistent and correct output, at
+the expense of build speed, if necessary.
-With Solaris and Mac OS X, the version listed below is the oldest release we
-can guarantee builds and works, and the specific version of the compilers used
-could be critical.
+If you are prepared to take some risk of an incorrect build, and know enough of
+the system to understand how things build and interact, you can speed up the
+build process considerably by instructing make to only build a portion of the
+product.
+
+#### Building Individual Modules
-With Windows the critical aspect is the Visual Studio compiler used, which due
-to it's runtime, generally dictates what Windows systems can do the builds and
-where the resulting bits can be used.
+The safe way to use fine-grained make targets is to use the module specific
+make targets. All source code in JDK 9 is organized so it belongs to a module,
+e.g. `java.base` or `jdk.jdwp.agent`. You can build only a specific module, by
+giving it as make target: `make jdk.jdwp.agent`. If the specified module
+depends on other modules (e.g. `java.base`), those modules will be built first.
-**NOTE: We expect a change here off these older Windows OS releases and to a
-'less older' one, probably Windows 2008R2 X64.**
+You can also specify a set of modules, just as you can always specify a set of
+make targets: `make jdk.crypto.cryptoki jdk.crypto.ec jdk.crypto.mscapi
+jdk.crypto.ucrypto`
-With Linux, it was just a matter of picking a stable distribution that is a
-good representative for Linux in general.
+#### Building Individual Module Phases
+
+The build process for each module is divided into separate phases. Not all
+modules need all phases. Which are needed depends on what kind of source code
+and other artifact the module consists of. The phases are:
-It is understood that most developers will NOT be using these specific
-versions, and in fact creating these specific versions may be difficult due to
-the age of some of this software. It is expected that developers are more often
-using the more recent releases and distributions of these operating systems.
+ * `gensrc` (Generate source code to compile)
+ * `gendata` (Generate non-source code artifacts)
+ * `copy` (Copy resource artifacts)
+ * `java` (Compile Java code)
+ * `launchers` (Compile native executables)
+ * `libs` (Compile native libraries)
+ * `rmic` (Run the `rmic` tool)
+
+You can build only a single phase for a module by using the notation
+`$MODULE-$PHASE`. For instance, to build the `gensrc` phase for `java.base`,
+use `make java.base-gensrc`.
-Compilation problems with newer or different C/C++ compilers is a common
-problem. Similarly, compilation problems related to changes to the
-`/usr/include` or system header files is also a common problem with older,
-newer, or unreleased OS versions. Please report these types of problems as bugs
-so that they can be dealt with accordingly.
+Note that some phases may depend on others, e.g. `java` depends on `gensrc` (if
+present). Make will build all needed prerequisites before building the
+requested phase.
+
+#### Skipping the Dependency Check
-Bootstrap JDK: JDK 8
+When using an iterative development style with frequent quick rebuilds, the
+dependency check made by make can take up a significant portion of the time
+spent on the rebuild. In such cases, it can be useful to bypass the dependency
+check in make.
+
+> **Note that if used incorrectly, this can lead to a broken build!**
- Base OS and Architecture OS C/C++ Compiler Processors RAM Minimum DISK Needs
- ------------------------------------- ----------------------------- ------------------------------------------------------- ------------ ------------- ------------
- Linux X86 (32-bit) and X64 (64-bit) Oracle Enterprise Linux 6.4 gcc 4.9.2 2 or more 1 GB 6 GB
- Solaris SPARCV9 (64-bit) Solaris 11 Update 1 Studio 12 Update 4 + patches 4 or more 4 GB 8 GB
- Solaris X64 (64-bit) Solaris 11 Update 1 Studio 12 Update 4 + patches 4 or more 4 GB 8 GB
- Windows X86 (32-bit) Windows Server 2012 R2 x64 Microsoft Visual Studio C++ 2013 Professional Edition 2 or more 2 GB 6 GB
- Windows X64 (64-bit) Windows Server 2012 R2 x64 Microsoft Visual Studio C++ 2013 Professional Edition 2 or more 2 GB 6 GB
- Mac OS X X64 (64-bit) Mac OS X 10.9 "Mavericks" Xcode 6.3 or newer 2 or more 4 GB 6 GB
+To achieve this, append `-only` to the build target. For instance, `make
+jdk.jdwp.agent-java-only` will *only* build the `java` phase of the
+`jdk.jdwp.agent` module. If the required dependencies are not present, the
+build can fail. On the other hand, the execution time measures in milliseconds.
--------------------------------------------------------------------------------
+A useful pattern is to build the first time normally (e.g. `make
+jdk.jdwp.agent`) and then on subsequent builds, use the `-only` make target.
+
+#### Rebuilding Part of java.base (JDK\_FILTER)
+
+If you are modifying files in `java.base`, which is the by far largest module
+in OpenJDK, then you need to rebuild all those files whenever a single file has
+changed. (This inefficiency will hopefully be addressed in JDK 10.)
-### Specific Developer Build Environments
+As a hack, you can use the make control variable `JDK_FILTER` to specify a
+pattern that will be used to limit the set of files being recompiled. For
+instance, `make java.base JDK_FILTER=javax/crypto` (or, to combine methods,
+`make java.base-java-only JDK_FILTER=javax/crypto`) will limit the compilation
+to files in the `javax.crypto` package.
-We won't be listing all the possible environments, but we will try to provide
-what information we have available to us.
+### Learn About Mercurial
+
+To become an efficient OpenJDK developer, it is recommended that you invest in
+learning Mercurial properly. Here are some links that can get you started:
-**NOTE: The community can help out by updating this part of the document.**
-
-#### Fedora
+ * [Mercurial for git users](http://www.mercurial-scm.org/wiki/GitConcepts)
+ * [The official Mercurial tutorial](http://www.mercurial-scm.org/wiki/Tutorial)
+ * [hg init](http://hginit.com/)
+ * [Mercurial: The Definitive Guide](http://hgbook.red-bean.com/read/)
-After installing the latest [Fedora](http://fedoraproject.org) you need to
-install several build dependencies. The simplest way to do it is to execute the
-following commands as user `root`:
+## Understanding the Build System
+
+This section will give you a more technical description on the details of the
+build system.
+
+### Configurations
- yum-builddep java-1.7.0-openjdk
- yum install gcc gcc-c++
-
-In addition, it's necessary to set a few environment variables for the build:
+The build system expects to find one or more configuration. These are
+technically defined by the `spec.gmk` in a subdirectory to the `build`
+subdirectory. The `spec.gmk` file is generated by `configure`, and contains in
+principle the configuration (directly or by files included by `spec.gmk`).
- export LANG=C
- export PATH="/usr/lib/jvm/java-openjdk/bin:${PATH}"
+You can, in fact, select a configuration to build by pointing to the `spec.gmk`
+file with the `SPEC` make control variable, e.g. `make SPEC=$BUILD/spec.gmk`.
+While this is not the recommended way to call `make` as a user, it is what is
+used under the hood by the build system.
-#### CentOS 5.5
+### Build Output Structure
+
+The build output for a configuration will end up in `build/<configuration
+name>`, which we refer to as `$BUILD` in this document. The `$BUILD` directory
+contains the following important directories:
-After installing [CentOS 5.5](http://www.centos.org/) you need to make sure you
-have the following Development bundles installed:
+```
+buildtools/
+configure-support/
+hotspot/
+images/
+jdk/
+make-support/
+support/
+test-results/
+test-support/
+```
+
+This is what they are used for:
- * Development Libraries
- * Development Tools
- * Java Development
- * X Software Development (Including XFree86-devel)
+ * `images`: This is the directory were the output of the `*-image` make
+ targets end up. For instance, `make jdk-image` ends up in `images/jdk`.
+
+ * `jdk`: This is the "exploded image". After `make jdk`, you will be able to
+ launch the newly built JDK by running `$BUILD/jdk/bin/java`.
-Plus the following packages:
+ * `test-results`: This directory contains the results from running tests.
- * cups devel: Cups Development Package
- * alsa devel: Alsa Development Package
- * Xi devel: libXi.so Development Package
+ * `support`: This is an area for intermediate files needed during the build,
+ e.g. generated source code, object files and class files. Some noteworthy
+ directories in `support` is `gensrc`, which contains the generated source
+ code, and the `modules_*` directories, which contains the files in a
+ per-module hierarchy that will later be collapsed into the `jdk` directory
+ of the exploded image.
-The freetype 2.3 packages don't seem to be available, but the freetype 2.3
-sources can be downloaded, built, and installed easily enough from [the
-freetype site](http://downloads.sourceforge.net/freetype). Build and install
-with something like:
+ * `buildtools`: This is an area for tools compiled for the build platform
+ that are used during the rest of the build.
+
+ * `hotspot`: This is an area for intermediate files needed when building
+ hotspot.
+
+ * `configure-support`, `make-support` and `test-support`: These directories
+ contain files that are needed by the build system for `configure`, `make`
+ and for running tests.
- bash ./configure
- make
- sudo -u root make install
+### Fixpath
+
+Windows path typically look like `C:\User\foo`, while Unix paths look like
+`/home/foo`. Tools with roots from Unix often experience issues related to this
+mismatch when running on Windows.
+
+In the OpenJDK build, we always use Unix paths internally, and only just before
+calling a tool that does not understand Unix paths do we convert them to
+Windows paths.
-Mercurial packages could not be found easily, but a Google search should find
-ones, and they usually include Python if it's needed.
+This conversion is done by the `fixpath` tool, which is a small wrapper that
+modifies unix-style paths to Windows-style paths in command lines. Fixpath is
+compiled automatically by `configure`.
-#### Debian 5.0 (Lenny)
+### Native Debug Symbols
-After installing [Debian](http://debian.org) 5 you need to install several
-build dependencies. The simplest way to install the build dependencies is to
-execute the following commands as user `root`:
+Native libraries and executables can have debug symbol (and other debug
+information) associated with them. How this works is very much platform
+dependent, but a common problem is that debug symbol information takes a lot of
+disk space, but is rarely needed by the end user.
- aptitude build-dep openjdk-7
- aptitude install openjdk-7-jdk libmotif-dev
+The OpenJDK supports different methods on how to handle debug symbols. The
+method used is selected by `--with-native-debug-symbols`, and available methods
+are `none`, `internal`, `external`, `zipped`.
-In addition, it's necessary to set a few environment variables for the build:
+ * `none` means that no debug symbols will be generated during the build.
+
+ * `internal` means that debug symbols will be generated during the build, and
+ they will be stored in the generated binary.
- export LANG=C
- export PATH="/usr/lib/jvm/java-7-openjdk/bin:${PATH}"
+ * `external` means that debug symbols will be generated during the build, and
+ after the compilation, they will be moved into a separate `.debuginfo` file.
+ (This was previously known as FDS, Full Debug Symbols).
+
+ * `zipped` is like `external`, but the .debuginfo file will also be zipped
+ into a `.diz` file.
-#### Ubuntu 12.04
+When building for distribution, `zipped` is a good solution. Binaries built
+with `internal` is suitable for use by developers, since they facilitate
+debugging, but should be stripped before distributed to end users.
-After installing [Ubuntu](http://ubuntu.org) 12.04 you need to install several
-build dependencies. The simplest way to do it is to execute the following
-commands:
+### Autoconf Details
+
+The `configure` script is based on the autoconf framework, but in some details
+deviate from a normal autoconf `configure` script.
- sudo aptitude build-dep openjdk-7
- sudo aptitude install openjdk-7-jdk
+The `configure` script in the top level directory of OpenJDK is just a thin
+wrapper that calls `common/autoconf/configure`. This in turn provides
+functionality that is not easily expressed in the normal Autoconf framework,
+and then calls into the core of the `configure` script, which is the
+`common/autoconf/generated-configure.sh` file.
-In addition, it's necessary to set a few environment variables for the build:
+As the name implies, this file is generated by Autoconf. It is checked in after
+regeneration, to alleviate the common user to have to install Autoconf.
- export LANG=C
- export PATH="/usr/lib/jvm/java-7-openjdk/bin:${PATH}"
+The build system will detect if the Autoconf source files have changed, and
+will trigger a regeneration of `common/autoconf/generated-configure.sh` if
+needed. You can also manually request such an update by `bash
+common/autoconf/autogen.sh`.
-#### OpenSUSE 11.1
+If you make changes to the build system that requires a re-generation, note the
+following:
-After installing [OpenSUSE](http://opensuse.org) 11.1 you need to install
-several build dependencies. The simplest way to install the build dependencies
-is to execute the following commands:
+ * You must use *exactly* version 2.69 of autoconf for your patch to be
+ accepted. This is to avoid spurious changes in the generated file. Note
+ that Ubuntu 16.04 ships a patched version of autoconf which claims to be
+ 2.69, but is not.
+
+ * You do not need to include the generated file in reviews.
- sudo zypper source-install -d java-1_7_0-openjdk
- sudo zypper install make
+ * If the generated file needs updating, the Oracle JDK closed counter-part
+ will also need to be updated. It is very much appreciated if you ask for an
+ Oracle engineer to sponsor your push so this can be made in tandem.
-In addition, it is necessary to set a few environment variables for the build:
+### Developing the Build System Itself
- export LANG=C
- export PATH="/usr/lib/jvm/java-1.7.0-openjdk/bin:$[PATH}"
+This section contains a few remarks about how to develop for the build system
+itself. It is not relevant if you are only making changes in the product source
+code.
-Finally, you need to unset the `JAVA_HOME` environment variable:
+While technically using `make`, the make source files of the OpenJDK does not
+resemble most other Makefiles. Instead of listing specific targets and actions
+(perhaps using patterns), the basic modus operandi is to call a high-level
+function (or properly, macro) from the API in `make/common`. For instance, to
+compile all classes in the `jdk.internal.foo` package in the `jdk.foo` module,
+a call like this would be made:
- export -n JAVA_HOME`
-
-#### Mandriva Linux One 2009 Spring
+```
+$(eval $(call SetupJavaCompilation, BUILD_FOO_CLASSES, \
+ SETUP := GENERATE_OLDBYTECODE, \
+ SRC := $(JDK_TOPDIR)/src/jkd.foo/share/classes, \
+ INCLUDES := jdk/internal/foo, \
+ BIN := $(SUPPORT_OUTPUTDIR)/foo_classes, \
+))
+```
-After installing [Mandriva](http://mandriva.org) Linux One 2009 Spring you need
-to install several build dependencies. The simplest way to install the build
-dependencies is to execute the following commands as user `root`:
+By encapsulating and expressing the high-level knowledge of *what* should be
+done, rather than *how* it should be done (as is normal in Makefiles), we can
+build a much more powerful and flexible build system.
+
+Correct dependency tracking is paramount. Sloppy dependency tracking will lead
+to improper parallelization, or worse, race conditions.
- urpmi java-1.7.0-openjdk-devel make gcc gcc-c++ freetype-devel zip unzip
- libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel
- libxtst6-devel libxi-devel
+To test for/debug race conditions, try running `make JOBS=1` and `make
+JOBS=100` and see if it makes any difference. (It shouldn't).
+
+To compare the output of two different builds and see if, and how, they differ,
+run `$BUILD1/compare.sh -o $BUILD2`, where `$BUILD1` and `$BUILD2` are the two
+builds you want to compare.
-In addition, it is necessary to set a few environment variables for the build:
-
- export LANG=C
- export PATH="/usr/lib/jvm/java-1.7.0-openjdk/bin:${PATH}"
+To automatically build two consecutive versions and compare them, use
+`COMPARE_BUILD`. The value of `COMPARE_BUILD` is a set of variable=value
+assignments, like this:
+```
+make COMPARE_BUILD=CONF=--enable-new-hotspot-feature:MAKE=hotspot
+```
+See `make/InitSupport.gmk` for details on how to use `COMPARE_BUILD`.
-#### OpenSolaris 2009.06
+To analyze build performance, run with `LOG=trace` and check `$BUILD/build-trace-time.log`.
+Use `JOBS=1` to avoid parallelism.
-After installing [OpenSolaris](http://opensolaris.org) 2009.06 you need to
-install several build dependencies. The simplest way to install the build
-dependencies is to execute the following commands:
+Please check that you adhere to the [Code Conventions for the Build System](
+http://openjdk.java.net/groups/build/doc/code-conventions.html) before
+submitting patches. Also see the section in [Autoconf Details](
+#autoconf-details) about the generated configure script.
+
+## Contributing to OpenJDK
+
+So, now you've build your OpenJDK, and made your first patch, and want to
+contribute it back to the OpenJDK community.
- pfexec pkg install SUNWgmake SUNWj7dev sunstudioexpress SUNWcups SUNWzip
- SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2
+First of all: Thank you! We gladly welcome your contribution to the OpenJDK.
+However, please bear in mind that OpenJDK is a massive project, and we must ask
+you to follow our rules and guidelines to be able to accept your contribution.
-In addition, it is necessary to set a few environment variables for the build:
+The official place to start is the ['How to contribute' page](
+http://openjdk.java.net/contribute/). There is also an official (but somewhat
+outdated and skimpy on details) [Developer's Guide](
+http://openjdk.java.net/guide/).
- export LANG=C
- export PATH="/opt/SunStudioExpress/bin:${PATH}"
+If this seems overwhelming to you, the Adoption Group is there to help you! A
+good place to start is their ['New Contributor' page](
+https://wiki.openjdk.java.net/display/Adoption/New+Contributor), or start
+reading the comprehensive [Getting Started Kit](
+https://adoptopenjdk.gitbooks.io/adoptopenjdk-getting-started-kit/en/). The
+Adoption Group will also happily answer any questions you have about
+contributing. Contact them by [mail](
+http://mail.openjdk.java.net/mailman/listinfo/adoption-discuss) or [IRC](
+http://openjdk.java.net/irc/).
--------------------------------------------------------------------------------
-
-End of the OpenJDK build README document.
-
-Please come again!
+---
+# Override styles from the base CSS file that are not ideal for this document.
+header-includes:
+ - '<style type="text/css">pre, code, tt { color: #1d6ae5; }</style>'
+---
--- a/common/doc/testing.html Thu Jul 06 09:36:17 2017 -0700
+++ b/common/doc/testing.html Mon Jul 17 09:13:49 2017 -0700
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
<title>Testing OpenJDK</title>
<style type="text/css">code{white-space: pre;}</style>
- <link rel="stylesheet" href="../../jdk/make/data/docs-resources/specs/resources/jdk-default.css">
+ <link rel="stylesheet" href="../../jdk/make/data/docs-resources/resources/jdk-default.css">
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
<![endif]-->
--- a/common/nb_native/nbproject/configurations.xml Thu Jul 06 09:36:17 2017 -0700
+++ b/common/nb_native/nbproject/configurations.xml Mon Jul 17 09:13:49 2017 -0700
@@ -3517,7 +3517,6 @@
<Elem>COMPILER2</Elem>
<Elem>DTRACE_ENABLED</Elem>
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_gcc</Elem>
@@ -10570,7 +10569,6 @@
<Elem>COMPILER2</Elem>
<Elem>DTRACE_ENABLED</Elem>
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_gcc</Elem>
@@ -18227,7 +18225,6 @@
<Elem>COMPILER2</Elem>
<Elem>DTRACE_ENABLED</Elem>
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_gcc</Elem>
@@ -20787,7 +20784,6 @@
<Elem>COMPILER2</Elem>
<Elem>DTRACE_ENABLED</Elem>
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_gcc</Elem>
@@ -21531,7 +21527,6 @@
<Elem>ARCHPROPNAME="x86_64"</Elem>
<Elem>DEBUG</Elem>
<Elem>MACOSX</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>THIS_FILE="java_props_macosx.c"</Elem>
<Elem>_ALLBSD_SOURCE</Elem>
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
@@ -23025,7 +23020,6 @@
<Elem>ARCHPROPNAME="x86_64"</Elem>
<Elem>DEBUG</Elem>
<Elem>MACOSX</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>THIS_FILE="java_props_md.c"</Elem>
<Elem>_ALLBSD_SOURCE</Elem>
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
@@ -23104,7 +23098,6 @@
<Elem>ARCH="x86_64"</Elem>
<Elem>DEBUG</Elem>
<Elem>MACOSX</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>THIS_FILE="ExtendedOptionsImpl.c"</Elem>
<Elem>_ALLBSD_SOURCE</Elem>
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
@@ -23481,7 +23474,6 @@
<Elem>ARCH="x86_64"</Elem>
<Elem>DEBUG</Elem>
<Elem>MACOSX</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>THIS_FILE="SocketDispatcher.c"</Elem>
<Elem>_ALLBSD_SOURCE</Elem>
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
@@ -29987,7 +29979,6 @@
<Elem>COMPILER2</Elem>
<Elem>DTRACE_ENABLED</Elem>
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_gcc</Elem>
@@ -30069,7 +30060,6 @@
<Elem>COMPILER2</Elem>
<Elem>DTRACE_ENABLED</Elem>
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_gcc</Elem>
@@ -30104,7 +30094,6 @@
<Elem>ARCH="x86_64"</Elem>
<Elem>DEBUG</Elem>
<Elem>MACOSX</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>_ALLBSD_SOURCE</Elem>
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
<Elem>_GNU_SOURCE</Elem>
@@ -30147,7 +30136,6 @@
<Elem>COMPILER2</Elem>
<Elem>DTRACE_ENABLED</Elem>
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_gcc</Elem>
@@ -30211,7 +30199,6 @@
<Elem>COMPILER2</Elem>
<Elem>DTRACE_ENABLED</Elem>
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_gcc</Elem>
@@ -30274,7 +30261,6 @@
<Elem>COMPILER2</Elem>
<Elem>DTRACE_ENABLED</Elem>
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_gcc</Elem>
@@ -30341,7 +30327,6 @@
<preprocessorList>
<Elem>ARCH="x86_64"</Elem>
<Elem>MACOSX</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>THIS_FILE="agent_util.c"</Elem>
<Elem>_ALLBSD_SOURCE</Elem>
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
@@ -30354,7 +30339,6 @@
<preprocessorList>
<Elem>ARCH="x86_64"</Elem>
<Elem>MACOSX</Elem>
- <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
<Elem>THIS_FILE="Agent.cpp"</Elem>
<Elem>_ALLBSD_SOURCE</Elem>
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
--- a/corba/.hgtags Thu Jul 06 09:36:17 2017 -0700
+++ b/corba/.hgtags Mon Jul 17 09:13:49 2017 -0700
@@ -432,3 +432,6 @@
00ae6307d78bac49883ddc85d687aa88c49f3971 jdk-10+12
dc78a3dd6b3a4f11cdae8a3e3d160e6a78bc7838 jdk-9+175
564fced058bd2c8375e9104aa8f9494642cd7bdd jdk-10+13
+25d991a67cba240eeaf15c19c5857b40fdd71561 jdk-10+14
+40fb9f229471ef357d493813d34b15afcce9f32b jdk-9+176
+c72e9d3823f04cb3ef3166646dfea9e4c2769133 jdk-9+177
--- a/corba/src/java.corba/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/corba/src/java.corba/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,7 +26,7 @@
/**
* Defines the Java binding of the OMG CORBA APIs, and the RMI-IIOP API.
*
- * <p> This module is upgradeble.
+ * <p> This module is upgradeable.
*
* @moduleGraph
* @since 9
--- a/hotspot/.hgtags Thu Jul 06 09:36:17 2017 -0700
+++ b/hotspot/.hgtags Mon Jul 17 09:13:49 2017 -0700
@@ -592,3 +592,6 @@
070aa7a2eb14c4645f7eb31384cba0a2ba72a4b5 jdk-10+12
8f04d457168b9f1f4a1b2c37f49e0513ca9d33a7 jdk-9+175
a9da03357f190807591177fe9846d6e68ad64fc0 jdk-10+13
+e920b4d008d914f3414bd4630b58837cf0b7f08d jdk-10+14
+2ab74e5dbdc2b6a962c865500cafd23cf387dc60 jdk-9+176
+1ca8f038fceb88c640badf9bd18905205bc63b43 jdk-9+177
--- a/hotspot/src/share/vm/opto/arraycopynode.cpp Thu Jul 06 09:36:17 2017 -0700
+++ b/hotspot/src/share/vm/opto/arraycopynode.cpp Mon Jul 17 09:13:49 2017 -0700
@@ -748,41 +748,3 @@
return false;
}
-// We try to replace a load from the destination of an arraycopy with
-// a load from the source so the arraycopy has a chance to be
-// eliminated. It's only valid if the arraycopy doesn't change the
-// element that would be loaded from the source array.
-bool ArrayCopyNode::can_replace_dest_load_with_src_load(intptr_t offset_lo, intptr_t offset_hi, PhaseTransform* phase) const {
- assert(_kind == ArrayCopy || _kind == CopyOf || _kind == CopyOfRange, "only for real array copies");
-
- Node* src = in(Src);
- Node* dest = in(Dest);
-
- // Check whether, assuming source and destination are the same
- // array, the arraycopy modifies the element from the source we
- // would load.
- if ((src != dest && in(SrcPos) == in(DestPos)) || !modifies(offset_lo, offset_hi, phase, false)) {
- // if not the transformation is legal
- return true;
- }
-
- AllocateNode* src_alloc = AllocateNode::Ideal_allocation(src, phase);
- AllocateNode* dest_alloc = AllocateNode::Ideal_allocation(dest, phase);
-
- // Check whether source and destination can be proved to be
- // different arrays
- const TypeOopPtr* t_src = phase->type(src)->isa_oopptr();
- const TypeOopPtr* t_dest = phase->type(dest)->isa_oopptr();
-
- if (t_src != NULL && t_dest != NULL &&
- (t_src->is_known_instance() || t_dest->is_known_instance()) &&
- t_src->instance_id() != t_dest->instance_id()) {
- return true;
- }
-
- if (MemNode::detect_ptr_independence(src->uncast(), src_alloc, dest->uncast(), dest_alloc, phase)) {
- return true;
- }
-
- return false;
-}
--- a/hotspot/src/share/vm/opto/arraycopynode.hpp Thu Jul 06 09:36:17 2017 -0700
+++ b/hotspot/src/share/vm/opto/arraycopynode.hpp Mon Jul 17 09:13:49 2017 -0700
@@ -168,7 +168,6 @@
static bool may_modify(const TypeOopPtr *t_oop, MemBarNode* mb, PhaseTransform *phase, ArrayCopyNode*& ac);
bool modifies(intptr_t offset_lo, intptr_t offset_hi, PhaseTransform* phase, bool must_modify) const;
- bool can_replace_dest_load_with_src_load(intptr_t offset_lo, intptr_t offset_hi, PhaseTransform* phase) const;
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
--- a/hotspot/src/share/vm/opto/library_call.cpp Thu Jul 06 09:36:17 2017 -0700
+++ b/hotspot/src/share/vm/opto/library_call.cpp Mon Jul 17 09:13:49 2017 -0700
@@ -5171,6 +5171,10 @@
Deoptimization::Action_make_not_entrant);
assert(stopped(), "Should be stopped");
}
+
+ const TypeKlassPtr* dest_klass_t = _gvn.type(dest_klass)->is_klassptr();
+ const Type *toop = TypeOopPtr::make_from_klass(dest_klass_t->klass());
+ src = _gvn.transform(new CheckCastPPNode(control(), src, toop));
}
arraycopy_move_allocation_here(alloc, dest, saved_jvms, saved_reexecute_sp, new_idx);
--- a/hotspot/src/share/vm/opto/memnode.cpp Thu Jul 06 09:36:17 2017 -0700
+++ b/hotspot/src/share/vm/opto/memnode.cpp Mon Jul 17 09:13:49 2017 -0700
@@ -885,7 +885,7 @@
// Is the value loaded previously stored by an arraycopy? If so return
// a load node that reads from the source array so we may be able to
// optimize out the ArrayCopy node later.
-Node* LoadNode::can_see_arraycopy_value(Node* st, PhaseTransform* phase) const {
+Node* LoadNode::can_see_arraycopy_value(Node* st, PhaseGVN* phase) const {
Node* ld_adr = in(MemNode::Address);
intptr_t ld_off = 0;
AllocateNode* ld_alloc = AllocateNode::Ideal_allocation(ld_adr, phase, ld_off);
@@ -893,23 +893,27 @@
if (ac != NULL) {
assert(ac->is_ArrayCopy(), "what kind of node can this be?");
- Node* ld = clone();
+ Node* mem = ac->in(TypeFunc::Memory);
+ Node* ctl = ac->in(0);
+ Node* src = ac->in(ArrayCopyNode::Src);
+
+ if (!ac->as_ArrayCopy()->is_clonebasic() && !phase->type(src)->isa_aryptr()) {
+ return NULL;
+ }
+
+ LoadNode* ld = clone()->as_Load();
+ Node* addp = in(MemNode::Address)->clone();
if (ac->as_ArrayCopy()->is_clonebasic()) {
assert(ld_alloc != NULL, "need an alloc");
- Node* addp = in(MemNode::Address)->clone();
assert(addp->is_AddP(), "address must be addp");
assert(addp->in(AddPNode::Base) == ac->in(ArrayCopyNode::Dest)->in(AddPNode::Base), "strange pattern");
assert(addp->in(AddPNode::Address) == ac->in(ArrayCopyNode::Dest)->in(AddPNode::Address), "strange pattern");
- addp->set_req(AddPNode::Base, ac->in(ArrayCopyNode::Src)->in(AddPNode::Base));
- addp->set_req(AddPNode::Address, ac->in(ArrayCopyNode::Src)->in(AddPNode::Address));
- ld->set_req(MemNode::Address, phase->transform(addp));
- if (in(0) != NULL) {
- assert(ld_alloc->in(0) != NULL, "alloc must have control");
- ld->set_req(0, ld_alloc->in(0));
- }
+ addp->set_req(AddPNode::Base, src->in(AddPNode::Base));
+ addp->set_req(AddPNode::Address, src->in(AddPNode::Address));
} else {
- Node* src = ac->in(ArrayCopyNode::Src);
- Node* addp = in(MemNode::Address)->clone();
+ assert(ac->as_ArrayCopy()->is_arraycopy_validated() ||
+ ac->as_ArrayCopy()->is_copyof_validated() ||
+ ac->as_ArrayCopy()->is_copyofrange_validated(), "only supported cases");
assert(addp->in(AddPNode::Base) == addp->in(AddPNode::Address), "should be");
addp->set_req(AddPNode::Base, src);
addp->set_req(AddPNode::Address, src);
@@ -927,21 +931,17 @@
Node* offset = phase->transform(new AddXNode(addp->in(AddPNode::Offset), diff));
addp->set_req(AddPNode::Offset, offset);
- ld->set_req(MemNode::Address, phase->transform(addp));
-
- const TypeX *ld_offs_t = phase->type(offset)->isa_intptr_t();
-
- if (!ac->as_ArrayCopy()->can_replace_dest_load_with_src_load(ld_offs_t->_lo, ld_offs_t->_hi, phase)) {
- return NULL;
- }
-
- if (in(0) != NULL) {
- assert(ac->in(0) != NULL, "alloc must have control");
- ld->set_req(0, ac->in(0));
- }
}
+ addp = phase->transform(addp);
+#ifdef ASSERT
+ const TypePtr* adr_type = phase->type(addp)->is_ptr();
+ ld->_adr_type = adr_type;
+#endif
+ ld->set_req(MemNode::Address, addp);
+ ld->set_req(0, ctl);
+ ld->set_req(MemNode::Memory, mem);
// load depends on the tests that validate the arraycopy
- ld->as_Load()->_control_dependency = Pinned;
+ ld->_control_dependency = Pinned;
return ld;
}
return NULL;
--- a/hotspot/src/share/vm/opto/memnode.hpp Thu Jul 06 09:36:17 2017 -0700
+++ b/hotspot/src/share/vm/opto/memnode.hpp Mon Jul 17 09:13:49 2017 -0700
@@ -270,7 +270,7 @@
const Type* load_array_final_field(const TypeKlassPtr *tkls,
ciKlass* klass) const;
- Node* can_see_arraycopy_value(Node* st, PhaseTransform* phase) const;
+ Node* can_see_arraycopy_value(Node* st, PhaseGVN* phase) const;
// depends_only_on_test is almost always true, and needs to be almost always
// true to enable key hoisting & commoning optimizations. However, for the
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/arraycopy/TestLoadBypassACWithWrongMem.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2017, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8181742
+ * @summary Loads that bypass arraycopy ends up with wrong memory state
+ *
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:+StressGCM -XX:+StressLCM TestLoadBypassACWithWrongMem
+ *
+ */
+
+import java.util.Arrays;
+
+public class TestLoadBypassACWithWrongMem {
+
+ static int test1(int[] src) {
+ int[] dst = new int[10];
+ System.arraycopy(src, 0, dst, 0, 10);
+ src[1] = 0x42;
+ // dst[1] is transformed to src[1], src[1] must use the
+ // correct memory state (not the store above).
+ return dst[1];
+ }
+
+ static int test2(int[] src) {
+ int[] dst = (int[])src.clone();
+ src[1] = 0x42;
+ // Same as above for clone
+ return dst[1];
+ }
+
+ static Object test5_src = null;
+ static int test3() {
+ int[] dst = new int[10];
+ System.arraycopy(test5_src, 0, dst, 0, 10);
+ ((int[])test5_src)[1] = 0x42;
+ System.arraycopy(test5_src, 0, dst, 0, 10);
+ // dst[1] is transformed to test5_src[1]. test5_src is Object
+ // but test5_src[1] must be on the slice for int[] not
+ // Object+some offset.
+ return dst[1];
+ }
+
+ static public void main(String[] args) {
+ int[] src = new int[10];
+ for (int i = 0; i < 20000; i++) {
+ Arrays.fill(src, 0);
+ int res = test1(src);
+ if (res != 0) {
+ throw new RuntimeException("bad result: " + res + " != " + 0);
+ }
+ Arrays.fill(src, 0);
+ res = test2(src);
+ if (res != 0) {
+ throw new RuntimeException("bad result: " + res + " != " + 0);
+ }
+ Arrays.fill(src, 0);
+ test5_src = src;
+ res = test3();
+ if (res != 0x42) {
+ throw new RuntimeException("bad result: " + res + " != " + 0x42);
+ }
+ }
+ }
+}
--- a/hotspot/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java Thu Jul 06 09:36:17 2017 -0700
+++ b/hotspot/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java Mon Jul 17 09:13:49 2017 -0700
@@ -108,8 +108,8 @@
*/
static public void main(String[] args) throws Exception {
// (1) Load an anonymous version of this class using the corresponding Unsafe method
- URL classUrl = TestAnonymousClassUnloading.class.getResource(
- TestAnonymousClassUnloading.class.getName().replace('.', '/') + ".class");
+ String rn = TestAnonymousClassUnloading.class.getSimpleName() + ".class";
+ URL classUrl = TestAnonymousClassUnloading.class.getResource(rn);
URLConnection connection = classUrl.openConnection();
int length = connection.getContentLength();
--- a/hotspot/test/runtime/logging/ClassLoadUnloadTest.java Thu Jul 06 09:36:17 2017 -0700
+++ b/hotspot/test/runtime/logging/ClassLoadUnloadTest.java Mon Jul 17 09:13:49 2017 -0700
@@ -74,7 +74,7 @@
List<String> argsList = new ArrayList<>();
Collections.addAll(argsList, args);
Collections.addAll(argsList, "-Xmn8m");
- Collections.addAll(argsList, "-Dtest.classes=" + System.getProperty("test.classes","."));
+ Collections.addAll(argsList, "-Dtest.class.path=" + System.getProperty("test.class.path", "."));
Collections.addAll(argsList, ClassUnloadTestMain.class.getName());
return ProcessTools.createJavaProcessBuilder(argsList.toArray(new String[argsList.size()]));
}
--- a/hotspot/test/runtime/testlibrary/ClassUnloadCommon.java Thu Jul 06 09:36:17 2017 -0700
+++ b/hotspot/test/runtime/testlibrary/ClassUnloadCommon.java Mon Jul 17 09:13:49 2017 -0700
@@ -31,8 +31,10 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.stream.Stream;
public class ClassUnloadCommon {
public static class TestFailure extends RuntimeException {
@@ -61,14 +63,45 @@
System.gc();
}
+ /**
+ * Creates a class loader that loads classes from {@code ${test.class.path}}
+ * before delegating to the system class loader.
+ */
public static ClassLoader newClassLoader() {
+ String cp = System.getProperty("test.class.path", ".");
+ URL[] urls = Stream.of(cp.split(File.pathSeparator))
+ .map(Paths::get)
+ .map(ClassUnloadCommon::toURL)
+ .toArray(URL[]::new);
+ return new URLClassLoader(urls) {
+ @Override
+ public Class<?> loadClass(String cn, boolean resolve)
+ throws ClassNotFoundException
+ {
+ synchronized (getClassLoadingLock(cn)) {
+ Class<?> c = findLoadedClass(cn);
+ if (c == null) {
+ try {
+ c = findClass(cn);
+ } catch (ClassNotFoundException e) {
+ c = getParent().loadClass(cn);
+ }
+
+ }
+ if (resolve) {
+ resolveClass(c);
+ }
+ return c;
+ }
+ }
+ };
+ }
+
+ static URL toURL(Path path) {
try {
- return new URLClassLoader(new URL[] {
- Paths.get(System.getProperty("test.classes",".") + File.separatorChar + "classes").toUri().toURL(),
- }, null);
- } catch (MalformedURLException e){
- throw new RuntimeException("Unexpected URL conversion failure", e);
+ return path.toUri().toURL();
+ } catch (MalformedURLException e) {
+ throw new RuntimeException(e);
}
}
-
}
--- a/jaxp/.hgtags Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/.hgtags Mon Jul 17 09:13:49 2017 -0700
@@ -432,3 +432,6 @@
ff293e39e83366c40a5687dacd1ccb2305ed2c1e jdk-10+12
736412a8dccee9d439044e6b1af2e7470d0a3563 jdk-9+175
5d374af9e78d02976e0e7f8dc2706f91a020f025 jdk-10+13
+4d05f673cf773f1c20e8f5a879d64115d2f741d9 jdk-10+14
+38cf34e2328070cc691c4f136e6dde1a44c04171 jdk-9+176
+332ad9f92632f56f337b8c40edef9a95a42b26bc jdk-9+177
--- a/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime/virtual_parse_stack.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -114,7 +114,7 @@
real_next++;
/* put the state number from the Symbol onto the virtual stack */
- vstack.push(new Integer(stack_sym.parse_state));
+ vstack.push(stack_sym.parse_state);
}
/*. . . . . . . . . . . . . . . . . . . . . . . . . . . . . .*/
@@ -161,7 +161,7 @@
/** Push a state number onto the stack. */
public void push(int state_num)
{
- vstack.push(new Integer(state_num));
+ vstack.push(state_num);
}
/*-----------------------------------------------------------*/
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -104,6 +103,6 @@
/** @return Double object
*/
public Object getConstantValue(ConstantPool cp) {
- return new Double(bytes);
+ return bytes;
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -103,6 +102,6 @@
/** @return Float object
*/
public Object getConstantValue(ConstantPool cp) {
- return new Float(bytes);
+ return bytes;
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -109,6 +108,6 @@
/** @return Integer object
*/
public Object getConstantValue(ConstantPool cp) {
- return new Integer(bytes);
+ return bytes;
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -101,6 +100,6 @@
/** @return Long object
*/
public Object getConstantValue(ConstantPool cp) {
- return new Long(bytes);
+ return bytes;
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -425,7 +424,7 @@
}
if(debug != null)
- JavaClass.debug = new Boolean(debug).booleanValue();
+ JavaClass.debug = Boolean.valueOf(debug);
if(sep != null)
try {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -72,7 +71,7 @@
b = bytes.readByte();
}
- public Number getValue() { return new Integer(b); }
+ public Number getValue() { return Integer.valueOf(b); }
/** @return Type.BYTE
*/
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,7 +51,7 @@
value = f;
}
- public Number getValue() { return new Double(value); }
+ public Number getValue() { return Double.valueOf(value); }
/** @return Type.DOUBLE
*/
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -54,7 +53,7 @@
value = f;
}
- public Number getValue() { return new Float(value); }
+ public Number getValue() { return Float.valueOf(value); }
/** @return Type.FLOAT
*/
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -95,56 +94,56 @@
checkType(Type.LONG);
if(l != 0L)
- value = new Long(l);
+ value = Long.valueOf(l);
}
public void setInitValue(int i) {
checkType(Type.INT);
if(i != 0)
- value = new Integer(i);
+ value = Integer.valueOf(i);
}
public void setInitValue(short s) {
checkType(Type.SHORT);
if(s != 0)
- value = new Integer(s);
+ value = Integer.valueOf(s);
}
public void setInitValue(char c) {
checkType(Type.CHAR);
if(c != 0)
- value = new Integer(c);
+ value = Integer.valueOf(c);
}
public void setInitValue(byte b) {
checkType(Type.BYTE);
if(b != 0)
- value = new Integer(b);
+ value = Integer.valueOf(b);
}
public void setInitValue(boolean b) {
checkType(Type.BOOLEAN);
if(b)
- value = new Integer(1);
+ value = Integer.valueOf(1);
}
public void setInitValue(float f) {
checkType(Type.FLOAT);
if(f != 0.0)
- value = new Float(f);
+ value = Float.valueOf(f);
}
public void setInitValue(double d) {
checkType(Type.DOUBLE);
if(d != 0.0)
- value = new Double(d);
+ value = Double.valueOf(d);
}
/** Remove any initial value.
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ICONST.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,7 +49,7 @@
value = i;
}
- public Number getValue() { return new Integer(value); }
+ public Number getValue() { return Integer.valueOf(value); }
/** @return Type.INT
*/
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,7 +22,6 @@
import com.sun.org.apache.bcel.internal.Constants;
-import com.sun.org.apache.bcel.internal.classfile.Utility;
import com.sun.org.apache.bcel.internal.classfile.ConstantPool;
import java.io.*;
import com.sun.org.apache.bcel.internal.util.ByteSequence;
@@ -165,7 +163,7 @@
}
try {
- obj = (Instruction)clazz.newInstance();
+ obj = (Instruction)clazz.getConstructor().newInstance();
if(wide && !((obj instanceof LocalVariableInstruction) ||
(obj instanceof IINC) ||
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -455,7 +454,7 @@
Instruction i = null;
try {
- i = (Instruction)java.lang.Class.forName(name).newInstance();
+ i = (Instruction)java.lang.Class.forName(name).getConstructor().newInstance();
} catch(Exception e) {
throw new RuntimeException("Could not find instruction: " + name);
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,7 +51,7 @@
value = l;
}
- public Number getValue() { return new Long(value); }
+ public Number getValue() { return Long.valueOf(value); }
/** @return Type.LONG
*/
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -96,10 +95,10 @@
return ((com.sun.org.apache.bcel.internal.classfile.ConstantUtf8)c).getBytes();
case com.sun.org.apache.bcel.internal.Constants.CONSTANT_Float:
- return new Float(((com.sun.org.apache.bcel.internal.classfile.ConstantFloat)c).getBytes());
+ return Float.valueOf(((com.sun.org.apache.bcel.internal.classfile.ConstantFloat)c).getBytes());
case com.sun.org.apache.bcel.internal.Constants.CONSTANT_Integer:
- return new Integer(((com.sun.org.apache.bcel.internal.classfile.ConstantInteger)c).getBytes());
+ return Integer.valueOf(((com.sun.org.apache.bcel.internal.classfile.ConstantInteger)c).getBytes());
default: // Never reached
throw new RuntimeException("Unknown or invalid constant type at " + index);
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -55,10 +54,10 @@
switch(c.getTag()) {
case com.sun.org.apache.bcel.internal.Constants.CONSTANT_Long:
- return new Long(((com.sun.org.apache.bcel.internal.classfile.ConstantLong)c).getBytes());
+ return Long.valueOf(((com.sun.org.apache.bcel.internal.classfile.ConstantLong)c).getBytes());
case com.sun.org.apache.bcel.internal.Constants.CONSTANT_Double:
- return new Double(((com.sun.org.apache.bcel.internal.classfile.ConstantDouble)c).getBytes());
+ return Double.valueOf(((com.sun.org.apache.bcel.internal.classfile.ConstantDouble)c).getBytes());
default: // Never reached
throw new RuntimeException("Unknown or invalid constant type at " + index);
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -69,7 +68,7 @@
b = bytes.readShort();
}
- public Number getValue() { return new Integer(b); }
+ public Number getValue() { return Integer.valueOf(b); }
/** @return Type.SHORT
*/
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SecuritySupport.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/SecuritySupport.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -172,7 +171,7 @@
static long getLastModified(final File f) {
return ((Long) AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- return new Long(f.lastModified());
+ return f.lastModified();
}
})).longValue();
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -375,7 +374,7 @@
if (value != null)
{
- int bits = new Double(precision).intValue();
+ int bits = (int)precision;
if (bits <= value.length())
value = value.substring(0, bits);
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -124,7 +123,7 @@
ClassLoader cl = System.getSecurityManager()!=null ? null : findClassLoader();
try{
Class providerClass = findProviderClass(className, cl, doFallback);
- Object instance = providerClass.newInstance();
+ Object instance = providerClass.getConstructor().newInstance();
debugPrintln(()->"created new instance of " + providerClass +
" using ClassLoader: " + cl);
return instance;
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -177,7 +176,7 @@
static long getLastModified(final File f) {
return ((Long) AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- return new Long(f.lastModified());
+ return f.lastModified();
}
})).longValue();
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1005,7 +1005,7 @@
if (className != null) {
try {
final Class<?> clazz = ObjectFactory.findProviderClass(className, true);
- node = (SyntaxTreeNode)clazz.newInstance();
+ node = (SyntaxTreeNode)clazz.getDeclaredConstructor().newInstance();
node.setQName(qname);
node.setParser(this);
if (_locator != null) {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -875,7 +874,7 @@
case -21:
break;
case 21:
- { return newSymbol(sym.INT, new Long(yytext())); }
+ { return newSymbol(sym.INT, Long.valueOf(yytext())); }
case -22:
break;
case 22:
@@ -903,7 +902,7 @@
case -28:
break;
case 28:
- { return newSymbol(sym.REAL, new Double(yytext())); }
+ { return newSymbol(sym.REAL, Double.valueOf(yytext())); }
case -29:
break;
case 29:
@@ -929,7 +928,7 @@
case -34:
break;
case 34:
- { return newSymbol(sym.REAL, new Double(yytext())); }
+ { return newSymbol(sym.REAL, Double.valueOf(yytext())); }
case -35:
break;
case 35:
@@ -1057,11 +1056,11 @@
case -66:
break;
case 67:
- { return newSymbol(sym.INT, new Long(yytext())); }
+ { return newSymbol(sym.INT, Long.valueOf(yytext())); }
case -67:
break;
case 68:
- { return newSymbol(sym.REAL, new Double(yytext())); }
+ { return newSymbol(sym.REAL, Double.valueOf(yytext())); }
case -68:
break;
case 70:
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -1342,7 +1342,7 @@
case 120: // NodeTest ::= PI
{
Object RESULT = null;
- RESULT = new Integer(NodeTest.PI);
+ RESULT = Integer.valueOf(NodeTest.PI);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(25/*NodeTest*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1371,7 +1371,7 @@
case 118: // NodeTest ::= COMMENT
{
Object RESULT = null;
- RESULT = new Integer(NodeTest.COMMENT);
+ RESULT = Integer.valueOf(NodeTest.COMMENT);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(25/*NodeTest*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1380,7 +1380,7 @@
case 117: // NodeTest ::= TEXT
{
Object RESULT = null;
- RESULT = new Integer(NodeTest.TEXT);
+ RESULT = Integer.valueOf(NodeTest.TEXT);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(25/*NodeTest*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1389,7 +1389,7 @@
case 116: // NodeTest ::= NODE
{
Object RESULT = null;
- RESULT = new Integer(NodeTest.ANODE);
+ RESULT = Integer.valueOf(NodeTest.ANODE);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(25/*NodeTest*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1815,7 +1815,7 @@
case 96: // AxisName ::= SELF
{
Integer RESULT = null;
- RESULT = new Integer(Axis.SELF);
+ RESULT = Integer.valueOf(Axis.SELF);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1824,7 +1824,7 @@
case 95: // AxisName ::= PRECEDINGSIBLING
{
Integer RESULT = null;
- RESULT = new Integer(Axis.PRECEDINGSIBLING);
+ RESULT = Integer.valueOf(Axis.PRECEDINGSIBLING);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1833,7 +1833,7 @@
case 94: // AxisName ::= PRECEDING
{
Integer RESULT = null;
- RESULT = new Integer(Axis.PRECEDING);
+ RESULT = Integer.valueOf(Axis.PRECEDING);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1842,7 +1842,7 @@
case 93: // AxisName ::= PARENT
{
Integer RESULT = null;
- RESULT = new Integer(Axis.PARENT);
+ RESULT = Integer.valueOf(Axis.PARENT);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1851,7 +1851,7 @@
case 92: // AxisName ::= NAMESPACE
{
Integer RESULT = null;
- RESULT = new Integer(Axis.NAMESPACE);
+ RESULT = Integer.valueOf(Axis.NAMESPACE);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1860,7 +1860,7 @@
case 91: // AxisName ::= FOLLOWINGSIBLING
{
Integer RESULT = null;
- RESULT = new Integer(Axis.FOLLOWINGSIBLING);
+ RESULT = Integer.valueOf(Axis.FOLLOWINGSIBLING);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1869,7 +1869,7 @@
case 90: // AxisName ::= FOLLOWING
{
Integer RESULT = null;
- RESULT = new Integer(Axis.FOLLOWING);
+ RESULT = Integer.valueOf(Axis.FOLLOWING);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1878,7 +1878,7 @@
case 89: // AxisName ::= DESCENDANTORSELF
{
Integer RESULT = null;
- RESULT = new Integer(Axis.DESCENDANTORSELF);
+ RESULT = Integer.valueOf(Axis.DESCENDANTORSELF);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1887,7 +1887,7 @@
case 88: // AxisName ::= DESCENDANT
{
Integer RESULT = null;
- RESULT = new Integer(Axis.DESCENDANT);
+ RESULT = Integer.valueOf(Axis.DESCENDANT);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1896,7 +1896,7 @@
case 87: // AxisName ::= CHILD
{
Integer RESULT = null;
- RESULT = new Integer(Axis.CHILD);
+ RESULT = Integer.valueOf(Axis.CHILD);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1905,7 +1905,7 @@
case 86: // AxisName ::= ATTRIBUTE
{
Integer RESULT = null;
- RESULT = new Integer(Axis.ATTRIBUTE);
+ RESULT = Integer.valueOf(Axis.ATTRIBUTE);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1914,7 +1914,7 @@
case 85: // AxisName ::= ANCESTORORSELF
{
Integer RESULT = null;
- RESULT = new Integer(Axis.ANCESTORORSELF);
+ RESULT = Integer.valueOf(Axis.ANCESTORORSELF);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1923,7 +1923,7 @@
case 84: // AxisName ::= ANCESTOR
{
Integer RESULT = null;
- RESULT = new Integer(Axis.ANCESTOR);
+ RESULT = Integer.valueOf(Axis.ANCESTOR);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(40/*AxisName*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -1932,7 +1932,7 @@
case 83: // AxisSpecifier ::= ATSIGN
{
Integer RESULT = null;
- RESULT = new Integer(Axis.ATTRIBUTE);
+ RESULT = Integer.valueOf(Axis.ATTRIBUTE);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(41/*AxisSpecifier*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -2697,7 +2697,7 @@
case 35: // ChildOrAttributeAxisSpecifier ::= ATTRIBUTE DCOLON
{
Integer RESULT = null;
- RESULT = new Integer(Axis.ATTRIBUTE);
+ RESULT = Integer.valueOf(Axis.ATTRIBUTE);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(42/*ChildOrAttributeAxisSpecifier*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-1)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -2706,7 +2706,7 @@
case 34: // ChildOrAttributeAxisSpecifier ::= CHILD DCOLON
{
Integer RESULT = null;
- RESULT = new Integer(Axis.CHILD);
+ RESULT = Integer.valueOf(Axis.CHILD);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(42/*ChildOrAttributeAxisSpecifier*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-1)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -2715,7 +2715,7 @@
case 33: // ChildOrAttributeAxisSpecifier ::= ATSIGN
{
Integer RESULT = null;
- RESULT = new Integer(Axis.ATTRIBUTE);
+ RESULT = Integer.valueOf(Axis.ATTRIBUTE);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(42/*ChildOrAttributeAxisSpecifier*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -2745,7 +2745,7 @@
case 30: // NodeTestPattern ::= PI
{
Object RESULT = null;
- RESULT = new Integer(NodeTest.PI);
+ RESULT = Integer.valueOf(NodeTest.PI);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(33/*NodeTestPattern*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -2754,7 +2754,7 @@
case 29: // NodeTestPattern ::= COMMENT
{
Object RESULT = null;
- RESULT = new Integer(NodeTest.COMMENT);
+ RESULT = Integer.valueOf(NodeTest.COMMENT);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(33/*NodeTestPattern*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -2763,7 +2763,7 @@
case 28: // NodeTestPattern ::= TEXT
{
Object RESULT = null;
- RESULT = new Integer(NodeTest.TEXT);
+ RESULT = Integer.valueOf(NodeTest.TEXT);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(33/*NodeTestPattern*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
@@ -2772,7 +2772,7 @@
case 27: // NodeTestPattern ::= NODE
{
Object RESULT = null;
- RESULT = new Integer(NodeTest.ANODE);
+ RESULT = Integer.valueOf(NodeTest.ANODE);
CUP$XPathParser$result = new com.sun.java_cup.internal.runtime.Symbol(33/*NodeTestPattern*/, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).left, ((com.sun.java_cup.internal.runtime.Symbol)CUP$XPathParser$stack.elementAt(CUP$XPathParser$top-0)).right, RESULT);
}
return CUP$XPathParser$result;
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -342,7 +342,7 @@
_elements = new HashMap<>();
_attributes = new HashMap<>();
_namespaces = new HashMap<>();
- _namespaces.put("",new Integer(_nextNSType));
+ _namespaces.put("", _nextNSType);
_namesIndex = new Vector(128);
_namespaceIndex = new Vector(32);
_namespacePrefixes = new HashMap<>();
@@ -852,7 +852,7 @@
_namespaces.put(namespaceURI,code);
_namespaceIndex.addElement(namespaceURI);
}
- return code.intValue();
+ return code;
}
public int nextModeSerial() {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,7 +35,7 @@
import java.io.PrintWriter;
import java.net.URL;
import java.net.URLConnection;
-import java.net.URLDecoder;
+import java.nio.file.Paths;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -199,7 +199,7 @@
// Check for a "file:" URI (courtesy of Brian Ewins)
if (timestamp == 0){ // get 0 for local URI
if ("file".equals(url.getProtocol())){
- File localfile = new File(URLDecoder.decode(url.getFile()));
+ File localfile = Paths.get(url.toURI()).toFile();
timestamp = localfile.lastModified();
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java Mon Jul 17 09:13:49 2017 -0700
@@ -94,7 +94,7 @@
if (_currentDocumentNode != rootNode) {
_currentDocumentNode = rootNode;
_index = new HashMap<>();
- _rootToIndexMap.put(new Integer(rootNode), _index);
+ _rootToIndexMap.put(rootNode, _index);
}
IntegerArray nodes = _index.get(value);
@@ -178,7 +178,7 @@
int ident = _enhancedDOM.getElementById(id);
if (ident != DTM.NULL) {
- Integer root = new Integer(_enhancedDOM.getDocument());
+ Integer root = _enhancedDOM.getDocument();
Map<String, IntegerArray> index = _rootToIndexMap.get(root);
if (index == null) {
@@ -247,7 +247,7 @@
// Get the mapping table for the document containing the context node
Map<String, IntegerArray> index =
- _rootToIndexMap.get(new Integer(rootHandle));
+ _rootToIndexMap.get(rootHandle);
// Split argument to id function into XML whitespace separated tokens
final StringTokenizer values = new StringTokenizer(string, " \n\t");
@@ -298,7 +298,7 @@
// Get the mapping table for the document containing the context node
Map<String,IntegerArray> index =
- _rootToIndexMap.get(new Integer(rootHandle));
+ _rootToIndexMap.get(rootHandle);
// Check whether the context node is present in the set of nodes
// returned by the key function
@@ -701,7 +701,7 @@
IntegerArray result = null;
// Get mapping from key values/IDs to DTM nodes for this document
- Map<String, IntegerArray> index = _rootToIndexMap.get(new Integer(root));
+ Map<String, IntegerArray> index = _rootToIndexMap.get(root);
if (!_isKeyIterator) {
// For id function, tokenize argument as whitespace separated
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java Mon Jul 17 09:13:49 2017 -0700
@@ -187,11 +187,11 @@
translet, _last);
Double num;
try {
- num = new Double(str);
+ num = Double.parseDouble(str);
}
// Treat number as NaN if it cannot be parsed as a double
catch (NumberFormatException e) {
- num = new Double(Double.NEGATIVE_INFINITY);
+ num = Double.NEGATIVE_INFINITY;
}
_values[_scanned++] = num;
return(num);
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,6 +26,7 @@
import com.sun.org.apache.xalan.internal.xsltc.runtime.AbstractTranslet;
import com.sun.org.apache.xml.internal.utils.LocaleUtility;
import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
+import java.lang.reflect.InvocationTargetException;
import java.util.Locale;
import java.text.Collator;
@@ -148,10 +149,17 @@
SecurityException,
TransletException {
- final NodeSortRecord sortRecord =
- (NodeSortRecord)_class.newInstance();
- sortRecord.initialize(node, last, _dom, _sortSettings);
- return sortRecord;
+ try {
+ final NodeSortRecord sortRecord;
+ //NodeSortRecord subclasses are generated with a public empty constructor
+ // refer to com.sun.org.apache.xalan.internal.xsltc.compiler.Sort::compileInit
+ sortRecord = (NodeSortRecord)_class.getConstructor().newInstance();
+ sortRecord.initialize(node, last, _dom, _sortSettings);
+ return sortRecord;
+ } catch (NoSuchMethodException | IllegalArgumentException |
+ InvocationTargetException ex) {
+ throw new InstantiationException(ex.getMessage());
+ }
}
public String getClassName() {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -471,7 +471,7 @@
return 0;
}
int eType = getIdForNamespace(s);
- return _nsIndex.get(new Integer(eType));
+ return _nsIndex.get(eType);
}
@@ -672,7 +672,7 @@
for (i=0; i<nsLength; i++) {
int eType = getIdForNamespace(namespaces[i]);
- Integer type = _nsIndex.get(new Integer(eType));
+ Integer type = _nsIndex.get(eType);
if (type != null) {
result[type] = (short)i;
}
@@ -692,7 +692,7 @@
for (i = 0; i < length; i++) {
int eType = getIdForNamespace(namespaces[i]);
- Integer type = _nsIndex.get(new Integer(eType));
+ Integer type = _nsIndex.get(eType);
result[i] = (type == null) ? -1 : type.shortValue();
}
@@ -900,7 +900,7 @@
this.startElement(uri, localName, qname, attributes);
if (m_buildIdIndex) {
- _node2Ids.put(node, new Integer(m_parents.peek()));
+ _node2Ids.put(node, m_parents.peek());
}
}
@@ -979,7 +979,7 @@
throws SAXException
{
// Check if the URI already exists before pushing on stack
- Integer eType = new Integer(getIdForNamespace(uri));
+ Integer eType = getIdForNamespace(uri);
if (_nsIndex.get(eType) == null) {
_nsIndex.put(eType, _uriCount++);
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -155,7 +155,7 @@
* Push a new parameter frame.
*/
public final void pushParamFrame() {
- paramsStack.add(pframe, new Integer(pbase));
+ paramsStack.add(pframe, pbase);
pbase = ++pframe;
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
*/
+@SuppressWarnings("deprecation")
public final class Attributes implements AttributeList {
private int _element;
private DOM _document;
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Mon Jul 17 09:13:49 2017 -0700
@@ -746,11 +746,11 @@
// If node-boolean comparison -> convert node to boolean
if (left instanceof Node || right instanceof Node) {
if (left instanceof Boolean) {
- right = new Boolean(booleanF(right));
+ right = booleanF(right);
hasSimpleArgs = true;
}
if (right instanceof Boolean) {
- left = new Boolean(booleanF(left));
+ left = booleanF(left);
hasSimpleArgs = true;
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -43,6 +43,7 @@
import java.lang.module.ModuleFinder;
import java.lang.module.ModuleReference;
import java.lang.module.ModuleReader;
+import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.CodeSigner;
import java.security.CodeSource;
@@ -549,7 +550,8 @@
// The translet needs to keep a reference to all its auxiliary
// class to prevent the GC from collecting them
- AbstractTranslet translet = (AbstractTranslet) _class[_transletIndex].newInstance();
+ AbstractTranslet translet = (AbstractTranslet)
+ _class[_transletIndex].getConstructor().newInstance();
translet.postInitialization();
translet.setTemplates(this);
translet.setServicesMechnism(_useServicesMechanism);
@@ -560,13 +562,10 @@
return translet;
}
- catch (InstantiationException e) {
+ catch (InstantiationException | IllegalAccessException |
+ NoSuchMethodException | InvocationTargetException e) {
ErrorMsg err = new ErrorMsg(ErrorMsg.TRANSLET_OBJECT_ERR, _name);
- throw new TransformerConfigurationException(err.toString());
- }
- catch (IllegalAccessException e) {
- ErrorMsg err = new ErrorMsg(ErrorMsg.TRANSLET_OBJECT_ERR, _name);
- throw new TransformerConfigurationException(err.toString());
+ throw new TransformerConfigurationException(err.toString(), e);
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
* @author Santiago Pericas-Geertsen
* @author G. Todd Miller
*/
+@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
public class TrAXFilter extends XMLFilterImpl {
private Templates _templates;
private TransformerImpl _transformer;
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -55,6 +55,7 @@
*
* Added Catalog Support for URI resolution
*/
+@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
public final class Util {
public static String baseName(String name) {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,9 +24,7 @@
import com.sun.org.apache.xerces.internal.parsers.DTDConfiguration;
import com.sun.org.apache.xerces.internal.parsers.XIncludeAwareParserConfiguration;
import com.sun.org.apache.xerces.internal.util.XMLChar;
-import com.sun.org.apache.xerces.internal.utils.ObjectFactory;
import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarDescription;
-import com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
@@ -345,13 +342,7 @@
* reference to the default error handler.
*/
public LSSerializer createLSSerializer() {
- try {
- return new com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl();
- }
- catch (Exception e) {}
- // Fall back to Xerces' deprecated serializer if
- // the Xalan based serializer is unavailable.
- return new DOMSerializerImpl();
+ return new com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl();
}
/**
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1473,12 +1473,12 @@
if (nodeTable == null) {
nodeTable = new HashMap<>();
num = --nodeCounter;
- nodeTable.put(node, new Integer(num));
+ nodeTable.put(node, num);
} else {
Integer n = (Integer) nodeTable.get(node);
if (n == null) {
num = --nodeCounter;
- nodeTable.put(node, new Integer(num));
+ nodeTable.put(node, num);
} else {
num = n.intValue();
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1831,7 +1830,7 @@
// flag to "true" which may overwrite a "false"
// value from the attribute list.
boolean specified = attr.getSpecified();
- attr.setValue(attrPSVI.getSchemaNormalizedValue());
+ attr.setValue(attrPSVI.getSchemaValue().getNormalizedValue());
if (!specified) {
((AttrImpl) attr).setSpecified(specified);
}
@@ -1972,7 +1971,7 @@
((PSVIElementNSImpl) fCurrentNode).setPSVI(elementPSVI);
}
// include element default content (if one is available)
- String normalizedValue = elementPSVI.getSchemaNormalizedValue();
+ String normalizedValue = elementPSVI.getSchemaValue().getNormalizedValue();
if ((fConfiguration.features & DOMConfigurationImpl.DTNORMALIZATION) != 0) {
if (normalizedValue !=null)
elementNode.setTextContent(normalizedValue);
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -472,42 +472,6 @@
return attrNodeIndex;
}
- /**
- * Sets an attribute on an element node.
- * @deprecated
- */
- @Deprecated
- public int setDeferredAttribute(int elementNodeIndex,
- String attrName, String attrURI,
- String attrValue, boolean specified) {
- // create attribute
- int attrNodeIndex = createDeferredAttribute(attrName, attrURI,
- attrValue, specified);
- int attrChunk = attrNodeIndex >> CHUNK_SHIFT;
- int attrIndex = attrNodeIndex & CHUNK_MASK;
- // set attribute's parent to element
- setChunkIndex(fNodeParent, elementNodeIndex, attrChunk, attrIndex);
-
- int elementChunk = elementNodeIndex >> CHUNK_SHIFT;
- int elementIndex = elementNodeIndex & CHUNK_MASK;
-
- // get element's last attribute
- int lastAttrNodeIndex = getChunkIndex(fNodeExtra,
- elementChunk, elementIndex);
- if (lastAttrNodeIndex != 0) {
- // add link from new attribute to last attribute
- setChunkIndex(fNodePrevSib, lastAttrNodeIndex,
- attrChunk, attrIndex);
- }
- // add link from element to new last attribute
- setChunkIndex(fNodeExtra, attrNodeIndex,
- elementChunk, elementIndex);
-
- // return node index
- return attrNodeIndex;
-
- } // setDeferredAttribute(int,String,String,String,boolean):int
-
/** Creates an attribute in the table. */
public int createDeferredAttribute(String attrName, String attrValue,
boolean specified) {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,3 +1,6 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ */
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -108,6 +111,7 @@
* @return The canonical lexical representation of the declaration's {value constraint} value.
* @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default>XML Schema Part 1: Structures [schema default]</a>
*/
+ @SuppressWarnings("deprecation")
public String getSchemaDefault() {
return fDeclaration == null ? null : fDeclaration.getConstraintValue();
}
@@ -119,6 +123,7 @@
* @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value>XML Schema Part 1: Structures [schema normalized value]</a>
* @return the normalized value of this item after validation
*/
+ @Deprecated
public String getSchemaNormalizedValue() {
return fValue.getNormalizedValue();
}
@@ -237,6 +242,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getActualNormalizedValue()
*/
+ @Deprecated
public Object getActualNormalizedValue() {
return fValue.getActualValue();
}
@@ -244,6 +250,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getActualNormalizedValueType()
*/
+ @Deprecated
public short getActualNormalizedValueType() {
return fValue.getActualValueType();
}
@@ -251,6 +258,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getItemValueTypes()
*/
+ @Deprecated
public ShortList getItemValueTypes() {
return fValue.getListValueTypes();
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,3 +1,6 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ */
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -119,6 +122,7 @@
* @return The canonical lexical representation of the declaration's {value constraint} value.
* @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default>XML Schema Part 1: Structures [schema default]</a>
*/
+ @SuppressWarnings("deprecation")
public String getSchemaDefault() {
return fDeclaration == null ? null : fDeclaration.getConstraintValue();
}
@@ -130,6 +134,7 @@
* @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value>XML Schema Part 1: Structures [schema normalized value]</a>
* @return the normalized value of this item after validation
*/
+ @Deprecated
public String getSchemaNormalizedValue() {
return fValue.getNormalizedValue();
}
@@ -285,6 +290,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getActualNormalizedValue()
*/
+ @Deprecated
public Object getActualNormalizedValue() {
return fValue.getActualValue();
}
@@ -292,6 +298,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getActualNormalizedValueType()
*/
+ @Deprecated
public short getActualNormalizedValueType() {
return fValue.getActualValueType();
}
@@ -299,6 +306,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getItemValueTypes()
*/
+ @Deprecated
public ShortList getItemValueTypes() {
return fValue.getListValueTypes();
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -201,7 +201,7 @@
fAttributes.getLength() > fElementAttributeLimit){
fErrorReporter.reportError(XMLMessageFormatter.XML_DOMAIN,
"ElementAttributeLimit",
- new Object[]{rawname, new Integer(fElementAttributeLimit) },
+ new Object[]{rawname, fElementAttributeLimit },
XMLErrorReporter.SEVERITY_FATAL_ERROR );
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -2427,11 +2427,11 @@
int b1 = b4[1] & 0xFF;
if (b0 == 0xFE && b1 == 0xFF) {
// UTF-16, big-endian
- return new Object [] {"UTF-16BE", new Boolean(true)};
+ return new Object [] {"UTF-16BE", true};
}
if (b0 == 0xFF && b1 == 0xFE) {
// UTF-16, little-endian
- return new Object [] {"UTF-16LE", new Boolean(false)};
+ return new Object [] {"UTF-16LE", false};
}
// default to UTF-8 if we don't have enough bytes to make a
@@ -2456,11 +2456,11 @@
int b3 = b4[3] & 0xFF;
if (b0 == 0x00 && b1 == 0x00 && b2 == 0x00 && b3 == 0x3C) {
// UCS-4, big endian (1234)
- return new Object [] {"ISO-10646-UCS-4", new Boolean(true)};
+ return new Object [] {"ISO-10646-UCS-4", true};
}
if (b0 == 0x3C && b1 == 0x00 && b2 == 0x00 && b3 == 0x00) {
// UCS-4, little endian (4321)
- return new Object [] {"ISO-10646-UCS-4", new Boolean(false)};
+ return new Object [] {"ISO-10646-UCS-4", false};
}
if (b0 == 0x00 && b1 == 0x00 && b2 == 0x3C && b3 == 0x00) {
// UCS-4, unusual octet order (2143)
@@ -2476,12 +2476,12 @@
// UTF-16, big-endian, no BOM
// (or could turn out to be UCS-2...
// REVISIT: What should this be?
- return new Object [] {"UTF-16BE", new Boolean(true)};
+ return new Object [] {"UTF-16BE", true};
}
if (b0 == 0x3C && b1 == 0x00 && b2 == 0x3F && b3 == 0x00) {
// UTF-16, little-endian, no BOM
// (or could turn out to be UCS-2...
- return new Object [] {"UTF-16LE", new Boolean(false)};
+ return new Object [] {"UTF-16LE", false};
}
if (b0 == 0x4C && b1 == 0x6F && b2 == 0xA7 && b3 == 0x94) {
// EBCDIC
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
@@ -2085,11 +2085,11 @@
int b1 = b4[1] & 0xFF;
if (b0 == 0xFE && b1 == 0xFF) {
// UTF-16, big-endian
- return new Object [] {"UTF-16BE", new Boolean(true)};
+ return new Object [] {"UTF-16BE", true};
}
if (b0 == 0xFF && b1 == 0xFE) {
// UTF-16, little-endian
- return new Object [] {"UTF-16LE", new Boolean(false)};
+ return new Object [] {"UTF-16LE", false};
}
// default to UTF-8 if we don't have enough bytes to make a
@@ -2114,11 +2114,11 @@
int b3 = b4[3] & 0xFF;
if (b0 == 0x00 && b1 == 0x00 && b2 == 0x00 && b3 == 0x3C) {
// UCS-4, big endian (1234)
- return new Object [] {"ISO-10646-UCS-4", new Boolean(true)};
+ return new Object [] {"ISO-10646-UCS-4", true};
}
if (b0 == 0x3C && b1 == 0x00 && b2 == 0x00 && b3 == 0x00) {
// UCS-4, little endian (4321)
- return new Object [] {"ISO-10646-UCS-4", new Boolean(false)};
+ return new Object [] {"ISO-10646-UCS-4", false};
}
if (b0 == 0x00 && b1 == 0x00 && b2 == 0x3C && b3 == 0x00) {
// UCS-4, unusual octet order (2143)
@@ -2134,12 +2134,12 @@
// UTF-16, big-endian, no BOM
// (or could turn out to be UCS-2...
// REVISIT: What should this be?
- return new Object [] {"UTF-16BE", new Boolean(true)};
+ return new Object [] {"UTF-16BE", true};
}
if (b0 == 0x3C && b1 == 0x00 && b2 == 0x3F && b3 == 0x00) {
// UTF-16, little-endian, no BOM
// (or could turn out to be UCS-2...
- return new Object [] {"UTF-16LE", new Boolean(false)};
+ return new Object [] {"UTF-16LE", false};
}
if (b0 == 0x4C && b1 == 0x6F && b2 == 0xA7 && b3 == 0x94) {
// EBCDIC
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -108,7 +107,7 @@
public String toString()
{
- StringBuffer strRet = new StringBuffer();
+ StringBuilder strRet = new StringBuilder();
strRet.append("(");
strRet.append("##any:uri=");
strRet.append(fURI);
@@ -118,7 +117,7 @@
strRet.append
(
" (Pos:"
- + new Integer(fPosition).toString()
+ + fPosition
+ ")"
);
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -101,7 +100,7 @@
public String toString()
{
- StringBuffer strRet = new StringBuffer(fElement.toString());
+ StringBuilder strRet = new StringBuilder(fElement.toString());
strRet.append(" (");
strRet.append(fElement.uri);
strRet.append(',');
@@ -112,7 +111,7 @@
strRet.append
(
" (Pos:"
- + new Integer(fPosition).toString()
+ + fPosition
+ ")"
);
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -684,7 +683,7 @@
fTransTable[curState] = makeDefStateList();
/* Optimization(Jan, 2001) */
- stateTable.put(newSet, new Integer(curState));
+ stateTable.put(newSet, curState);
/* Optimization(Jan, 2001) */
// We now have a new state to do so bump the count
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -96,7 +95,7 @@
public Object get(int index) {
if (index >= 0 && index < data.length) {
- return new Byte(data[index]);
+ return data[index];
}
throw new IndexOutOfBoundsException("Index: " + index);
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -129,6 +128,7 @@
* @return The canonical lexical representation of the declaration's {value constraint} value.
* @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default>XML Schema Part 1: Structures [schema default]</a>
*/
+ @SuppressWarnings("deprecation")
public String getSchemaDefault() {
return fDeclaration == null ? null : fDeclaration.getConstraintValue();
}
@@ -140,6 +140,7 @@
* @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value>XML Schema Part 1: Structures [schema normalized value]</a>
* @return the normalized value of this item after validation
*/
+ @Deprecated
public String getSchemaNormalizedValue() {
return fValue.getNormalizedValue();
}
@@ -241,6 +242,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getActualNormalizedValue()
*/
+ @Deprecated
public Object getActualNormalizedValue() {
return fValue.getActualValue();
}
@@ -248,6 +250,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getActualNormalizedValueType()
*/
+ @Deprecated
public short getActualNormalizedValueType() {
return fValue.getActualValueType();
}
@@ -255,6 +258,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getItemValueTypes()
*/
+ @Deprecated
public ShortList getItemValueTypes() {
return fValue.getListValueTypes();
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -154,6 +153,7 @@
* @return The canonical lexical representation of the declaration's {value constraint} value.
* @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_default>XML Schema Part 1: Structures [schema default]</a>
*/
+ @SuppressWarnings("deprecation")
public String getSchemaDefault() {
return fDeclaration == null ? null : fDeclaration.getConstraintValue();
}
@@ -165,6 +165,7 @@
* @see <a href="http://www.w3.org/TR/xmlschema-1/#e-schema_normalized_value>XML Schema Part 1: Structures [schema normalized value]</a>
* @return the normalized value of this item after validation
*/
+ @Deprecated
public String getSchemaNormalizedValue() {
return fValue.getNormalizedValue();
}
@@ -296,6 +297,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getActualNormalizedValue()
*/
+ @Deprecated
public Object getActualNormalizedValue() {
return fValue.getActualValue();
}
@@ -303,6 +305,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getActualNormalizedValueType()
*/
+ @Deprecated
public short getActualNormalizedValueType() {
return fValue.getActualValueType();
}
@@ -310,6 +313,7 @@
/* (non-Javadoc)
* @see com.sun.org.apache.xerces.internal.xs.ItemPSVI#getItemValueTypes()
*/
+ @Deprecated
public ShortList getItemValueTypes() {
return fValue.getListValueTypes();
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -159,6 +158,7 @@
* Value constraint: The actual value (with respect to the {type
* definition}) Should we return Object instead of DOMString?
*/
+ @Deprecated
public String getConstraintValue() {
// REVISIT: SCAPI: what's the proper representation
return getConstraintType() == XSConstants.VC_NONE ?
@@ -195,18 +195,21 @@
fNamespaceItem = namespaceItem;
}
+ @Deprecated
public Object getActualVC() {
return getConstraintType() == XSConstants.VC_NONE ?
null :
fDefault.actualValue;
}
+ @Deprecated
public short getActualVCType() {
return getConstraintType() == XSConstants.VC_NONE ?
XSConstants.UNAVAILABLE_DT :
fDefault.actualValueType;
}
+ @Deprecated
public ShortList getItemValueTypes() {
return getConstraintType() == XSConstants.VC_NONE ?
null :
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -112,6 +111,7 @@
* Value Constraint: The actual value (with respect to the {type
* definition}).
*/
+ @Deprecated
public String getConstraintValue() {
// REVISIT: SCAPI: what's the proper representation
return getConstraintType() == XSConstants.VC_NONE ?
@@ -126,18 +126,21 @@
return null;
}
+ @Deprecated
public Object getActualVC() {
return getConstraintType() == XSConstants.VC_NONE ?
null :
fDefault.actualValue;
}
+ @Deprecated
public short getActualVCType() {
return getConstraintType() == XSConstants.VC_NONE ?
XSConstants.UNAVAILABLE_DT :
fDefault.actualValueType;
}
+ @Deprecated
public ShortList getItemValueTypes() {
return getConstraintType() == XSConstants.VC_NONE ?
null :
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -257,6 +256,7 @@
* A value constraint: The actual value (with respect to the {type
* definition})
*/
+ @Deprecated
public String getConstraintValue() {
// REVISIT: SCAPI: what's the proper representation
return getConstraintType() == XSConstants.VC_NONE ?
@@ -368,18 +368,21 @@
fNamespaceItem = namespaceItem;
}
+ @Deprecated
public Object getActualVC() {
return getConstraintType() == XSConstants.VC_NONE ?
null :
fDefault.actualValue;
}
+ @Deprecated
public short getActualVCType() {
return getConstraintType() == XSConstants.VC_NONE ?
XSConstants.UNAVAILABLE_DT :
fDefault.actualValueType;
}
+ @Deprecated
public ShortList getItemValueTypes() {
return getConstraintType() == XSConstants.VC_NONE ?
null :
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -157,7 +156,8 @@
// a place-holder method; to be overridden by subclasses
// that care about matching element content.
- protected void handleContent(XSTypeDefinition type, boolean nillable, Object value, short valueType, ShortList itemValueType) {
+ protected void handleContent(XSTypeDefinition type, boolean nillable,
+ Object value, short valueType, ShortList itemValueType) {
}
/**
@@ -165,7 +165,8 @@
* XPath expression. Subclasses can override this method to
* provide default handling upon a match.
*/
- protected void matched(Object actualValue, short valueType, ShortList itemValueType, boolean isNil) {
+ protected void matched(Object actualValue, short valueType,
+ ShortList itemValueType, boolean isNil) {
if (DEBUG_METHODS3) {
System.out.println(toString()+"#matched(\""+actualValue+"\")");
}
@@ -255,7 +256,8 @@
// to look at this step for next time we're called.
// so first consume all descendants:
int descendantStep = fCurrentStep[i];
- while(fCurrentStep[i] < steps.length && steps[fCurrentStep[i]].axis.type == XPath.Axis.DESCENDANT) {
+ while(fCurrentStep[i] < steps.length &&
+ steps[fCurrentStep[i]].axis.type == XPath.Axis.DESCENDANT) {
if (DEBUG_MATCH) {
XPath.Step step = steps[fCurrentStep[i]];
System.out.println(toString()+" [DESCENDANT] MATCHED!");
@@ -330,9 +332,11 @@
int j=0;
for(; j<i && ((fMatched[j] & MATCHED) != MATCHED); j++);
if(j==i) {
- AttributePSVI attrPSVI = (AttributePSVI)attributes.getAugmentations(aIndex).getItem(Constants.ATTRIBUTE_PSVI);
- fMatchedString = attrPSVI.getActualNormalizedValue();
- matched(fMatchedString, attrPSVI.getActualNormalizedValueType(), attrPSVI.getItemValueTypes(), false);
+ AttributePSVI attrPSVI = (AttributePSVI)attributes.
+ getAugmentations(aIndex).getItem(Constants.ATTRIBUTE_PSVI);
+ fMatchedString = attrPSVI.getSchemaValue().getActualValue();
+ matched(fMatchedString, attrPSVI.getSchemaValue().getActualValueType(),
+ attrPSVI.getSchemaValue().getListValueTypes(), false);
}
}
break;
@@ -373,7 +377,8 @@
* @param value - actual value
* the typed value of the content of this element.
*/
- public void endElement(QName element, XSTypeDefinition type, boolean nillable, Object value, short valueType, ShortList itemValueType) {
+ public void endElement(QName element, XSTypeDefinition type, boolean nillable,
+ Object value, short valueType, ShortList itemValueType) {
if (DEBUG_METHODS2) {
System.out.println(toString()+"#endElement("+
"element={"+element+"},"+
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -118,7 +118,7 @@
System.out.println("nodeCount = " + nodeCount ) ;
System.out.println("nodeLimit = " + maxNodeLimit ) ;
}
- fErrorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN, "MaxOccurLimit", new Object[]{ new Integer(maxNodeLimit) }, XMLErrorReporter.SEVERITY_FATAL_ERROR);
+ fErrorReporter.reportError(XSMessageFormatter.SCHEMA_DOMAIN, "MaxOccurLimit", new Object[]{ maxNodeLimit }, XMLErrorReporter.SEVERITY_FATAL_ERROR);
// similarly to entity manager behaviour, take into accont
// behaviour if continue-after-fatal-error is set.
nodeCount = 0;
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -804,7 +804,7 @@
fTransTable[curState] = makeDefStateList();
/* Optimization(Jan, 2001) */
- stateTable.put(newSet, new Integer(curState));
+ stateTable.put(newSet, curState);
/* Optimization(Jan, 2001) */
// We now have a new state to do so bump the count
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1161,7 +1161,7 @@
}
}
- attrValues[ATTIDX_FROMDEFAULT] = new Long(fromDefault);
+ attrValues[ATTIDX_FROMDEFAULT] = fromDefault;
//attrValues[ATTIDX_OTHERVALUES] = otherValues;
// Check that minOccurs isn't greater than maxOccurs.
@@ -1193,7 +1193,7 @@
// maxOccurNodeLimit.
int maxOccurNodeLimit = fSchemaHandler.fSecurityManager.getLimit(XMLSecurityManager.Limit.MAX_OCCUR_NODE_LIMIT);
if (max > maxOccurNodeLimit && !fSchemaHandler.fSecurityManager.isNoLimit(maxOccurNodeLimit)) {
- reportSchemaFatalError("MaxOccurLimit", new Object[] {new Integer(maxOccurNodeLimit)}, element);
+ reportSchemaFatalError("MaxOccurLimit", new Object[] {maxOccurNodeLimit}, element);
// reset max values in case processing continues on error
attrValues[ATTIDX_MAXOCCURS] = fXIntPool.getXInt(maxOccurNodeLimit);
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1214,8 +1213,8 @@
fGlobalStore[fGlobalStorePos++] = fName ;
fGlobalStore[fGlobalStorePos++] = fTargetNamespace;
// let's save ourselves a couple of objects...
- fGlobalStore[fGlobalStorePos++] = new Integer((fDerivedBy << 16) + fFinal);
- fGlobalStore[fGlobalStorePos++] = new Integer((fBlock << 16) + fContentType);
+ fGlobalStore[fGlobalStorePos++] = (fDerivedBy << 16) + fFinal;
+ fGlobalStore[fGlobalStorePos++] = (fBlock << 16) + fContentType;
fGlobalStore[fGlobalStorePos++] = fBaseType;
fGlobalStore[fGlobalStorePos++] = fAttrGrp;
fGlobalStore[fGlobalStorePos++] = fParticle;
@@ -1229,15 +1228,15 @@
fParticle = (XSParticleDecl)fGlobalStore[--fGlobalStorePos];
fAttrGrp = (XSAttributeGroupDecl)fGlobalStore[--fGlobalStorePos];
fBaseType = (XSTypeDefinition)fGlobalStore[--fGlobalStorePos];
- int i = ((Integer)(fGlobalStore[--fGlobalStorePos])).intValue();
+ int i = ((Integer)(fGlobalStore[--fGlobalStorePos]));
fBlock = (short)(i >> 16);
fContentType = (short)i;
- i = ((Integer)(fGlobalStore[--fGlobalStorePos])).intValue();
+ i = ((Integer)(fGlobalStore[--fGlobalStorePos]));
fDerivedBy = (short)(i >> 16);
fFinal = (short)i;
fTargetNamespace = (String)fGlobalStore[--fGlobalStorePos];
fName = (String)fGlobalStore[--fGlobalStorePos];
- fIsAbstract = ((Boolean)fGlobalStore[--fGlobalStorePos]).booleanValue();
+ fIsAbstract = ((Boolean)fGlobalStore[--fGlobalStorePos]);
fComplexTypeDecl = (XSComplexTypeDecl)fGlobalStore[--fGlobalStorePos];
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -131,6 +131,7 @@
* @author Pavani Mukthipudi, Sun Microsystems
*
*/
+@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
public class XSDHandler {
/** Feature identifier: validation. */
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -112,7 +111,7 @@
public Object get(int index) {
if (index >= 0 && index < fLength) {
- return new Short(fArray[index]);
+ return fArray[index];
}
throw new IndexOutOfBoundsException("Index: " + index);
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +63,7 @@
* @author Edwin Goei
*
*/
+@SuppressWarnings("deprecation")
public class SAXParserImpl extends javax.xml.parsers.SAXParser
implements JAXPConstants, PSVIProvider {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.math.RoundingMode;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -1399,7 +1399,7 @@
BigDecimal bd = getFieldAsBigDecimal(FIELDS[i]);
bd = bd.multiply(factor).add(carry);
- buf[i] = bd.setScale(0, BigDecimal.ROUND_DOWN);
+ buf[i] = bd.setScale(0, RoundingMode.DOWN);
bd = bd.subtract(buf[i]);
if (i == 1) {
@@ -1607,7 +1607,7 @@
BigDecimal borrow =
buf[i].abs().divide(
FACTORS[i - 1],
- BigDecimal.ROUND_UP);
+ RoundingMode.UP);
if (buf[i].signum() > 0) {
borrow = borrow.negate();
}
@@ -1796,7 +1796,7 @@
if (seconds != null) {
BigDecimal fraction =
- seconds.subtract(seconds.setScale(0, BigDecimal.ROUND_DOWN));
+ seconds.subtract(seconds.setScale(0, RoundingMode.DOWN));
int millisec = fraction.movePointRight(3).intValue();
calendar.add(Calendar.MILLISECOND, millisec * signum);
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,23 @@
package com.sun.org.apache.xerces.internal.jaxp.datatype;
+import com.sun.org.apache.xerces.internal.util.DatatypeMessageFormatter;
+import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.util.TimeZone;
+import java.math.RoundingMode;
import java.util.Calendar;
+import java.util.Date;
import java.util.GregorianCalendar;
-import java.util.Date;
import java.util.Locale;
-
+import java.util.TimeZone;
import javax.xml.datatype.DatatypeConstants;
import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
-import com.sun.org.apache.xerces.internal.util.DatatypeMessageFormatter;
-import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
/**
* <p>Representation for W3C XML Schema 1.0 date/time datatypes.
@@ -379,7 +379,7 @@
throws IllegalArgumentException {
// compute format string for this lexical representation.
- String format = null;
+ String format;
String lexRep = lexicalRepresentation;
final int NOT_FOUND = -1;
int lexRepLength = lexRep.length();
@@ -525,34 +525,10 @@
throw new IllegalArgumentException(
DatatypeMessageFormatter.formatMessage(null,
"InvalidXGCValue-fractional",
- new Object[] { year, new Integer(month), new Integer(day),
- new Integer(hour), new Integer(minute), new Integer(second),
- fractionalSecond, new Integer(timezone)})
+ new Object[] { year, month, day,
+ hour, minute, second,
+ fractionalSecond, timezone})
);
-
- /**
- String yearString = "null";
- if (year != null) {
- yearString = year.toString();
- }
- String fractionalSecondString = "null";
- if (fractionalSecond != null) {
- fractionalSecondString = fractionalSecond.toString();
- }
-
- throw new IllegalArgumentException(
- "year = " + yearString
- + ", month = " + month
- + ", day = " + day
- + ", hour = " + hour
- + ", minute = " + minute
- + ", second = " + second
- + ", fractionalSecond = " + fractionalSecondString
- + ", timezone = " + timezone
- + ", is not a valid representation of an XML Gregorian Calendar value."
- );
- */
-
}
save();
@@ -601,24 +577,10 @@
throw new IllegalArgumentException(
DatatypeMessageFormatter.formatMessage(null,
"InvalidXGCValue-milli",
- new Object[] { new Integer(year), new Integer(month), new Integer(day),
- new Integer(hour), new Integer(minute), new Integer(second),
- new Integer(millisecond), new Integer(timezone)})
+ new Object[] { year, month, day,
+ hour, minute, second,
+ millisecond, timezone})
);
- /*
- throw new IllegalArgumentException(
- "year = " + year
- + ", month = " + month
- + ", day = " + day
- + ", hour = " + hour
- + ", minute = " + minute
- + ", second = " + second
- + ", millisecond = " + millisecond
- + ", timezone = " + timezone
- + ", is not a valid representation of an XML Gregorian Calendar value."
- );
- */
-
}
save();
@@ -683,11 +645,11 @@
*/
public XMLGregorianCalendarImpl(GregorianCalendar cal) {
- int year = cal.get(Calendar.YEAR);
+ int year1 = cal.get(Calendar.YEAR);
if (cal.get(Calendar.ERA) == GregorianCalendar.BC) {
- year = -year;
+ year1 = -year1;
}
- this.setYear(year);
+ this.setYear(year1);
// Calendar.MONTH is zero based, XSD Date datatype's month field starts
// with JANUARY as 1.
@@ -1201,7 +1163,7 @@
* outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
- public void setYear(BigInteger year) {
+ public final void setYear(BigInteger year) {
if (year == null) {
this.eon = null;
this.year = DatatypeConstants.FIELD_UNDEFINED;
@@ -1225,7 +1187,7 @@
* @param year value constraints are summarized in <a href="#datetimefield-year">year field of date/time field mapping table</a>.
* If year is {@link DatatypeConstants#FIELD_UNDEFINED}, then eon is set to <code>null</code>.
*/
- public void setYear(int year) {
+ public final void setYear(int year) {
if (year == DatatypeConstants.FIELD_UNDEFINED) {
this.year = DatatypeConstants.FIELD_UNDEFINED;
this.eon = null;
@@ -1269,7 +1231,7 @@
* outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
- public void setMonth(int month) {
+ public final void setMonth(int month) {
if(month<DatatypeConstants.JANUARY || DatatypeConstants.DECEMBER<month)
if(month!=DatatypeConstants.FIELD_UNDEFINED)
invalidFieldValue(MONTH, month);
@@ -1287,7 +1249,7 @@
* outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
- public void setDay(int day) {
+ public final void setDay(int day) {
if(day<1 || 31<day)
if(day!=DatatypeConstants.FIELD_UNDEFINED)
invalidFieldValue(DAY,day);
@@ -1306,7 +1268,7 @@
* outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
- public void setTimezone(int offset) {
+ public final void setTimezone(int offset) {
if(offset<-14*60 || 14*60<offset)
if(offset!=DatatypeConstants.FIELD_UNDEFINED)
invalidFieldValue(TIMEZONE,offset);
@@ -1329,14 +1291,14 @@
* outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
- public void setTime(int hour, int minute, int second) {
+ public final void setTime(int hour, int minute, int second) {
setTime(hour, minute, second, null);
}
private void invalidFieldValue(int field, int value) {
throw new IllegalArgumentException(
DatatypeMessageFormatter.formatMessage(null, "InvalidFieldValue",
- new Object[]{ new Integer(value), FIELD_NAME[field]})
+ new Object[]{ value, FIELD_NAME[field]})
);
}
@@ -1406,7 +1368,7 @@
* outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
- public void setTime(
+ public final void setTime(
int hour,
int minute,
int second,
@@ -1446,7 +1408,7 @@
* outside value constraints for the field as specified in
* <a href="#datetimefieldmapping">date/time field mapping table</a>.
*/
- public void setTime(int hour, int minute, int second, int millisecond) {
+ public final void setTime(int hour, int minute, int second, int millisecond) {
setHour(hour, false);
@@ -1990,7 +1952,7 @@
* Validate instance by <code>getXMLSchemaType()</code> constraints.
* @return true if data values are valid.
*/
- public boolean isValid() {
+ public final boolean isValid() {
// since setters do not allow for invalid values,
// (except for exceptional case of year field of zero),
// no need to check for anything except for constraints
@@ -2091,7 +2053,8 @@
BigInteger temp = BigInteger.valueOf((long) startMonth).add(dMonths);
setMonth(temp.subtract(BigInteger.ONE).mod(TWELVE).intValue() + 1);
BigInteger carry =
- new BigDecimal(temp.subtract(BigInteger.ONE)).divide(new BigDecimal(TWELVE), BigDecimal.ROUND_FLOOR).toBigInteger();
+ new BigDecimal(temp.subtract(BigInteger.ONE))
+ .divide(DECIMAL_TWELVE, RoundingMode.FLOOR).toBigInteger();
/* Years (may be modified additionally below)
* E[year] := S[year] + D[year] + carry
@@ -2129,7 +2092,7 @@
BigDecimal dSeconds = DurationImpl.sanitize((BigDecimal) duration.getField(DatatypeConstants.SECONDS), signum);
BigDecimal tempBD = startSeconds.add(dSeconds);
BigDecimal fQuotient =
- new BigDecimal(new BigDecimal(tempBD.toBigInteger()).divide(DECIMAL_SIXTY, BigDecimal.ROUND_FLOOR).toBigInteger());
+ new BigDecimal(new BigDecimal(tempBD.toBigInteger()).divide(DECIMAL_SIXTY, RoundingMode.FLOOR).toBigInteger());
BigDecimal endSeconds = tempBD.subtract(fQuotient.multiply(DECIMAL_SIXTY));
carry = fQuotient.toBigInteger();
@@ -2161,7 +2124,7 @@
temp = BigInteger.valueOf(startMinutes).add(dMinutes).add(carry);
setMinute(temp.mod(SIXTY).intValue());
- carry = new BigDecimal(temp).divide(DECIMAL_SIXTY, BigDecimal.ROUND_FLOOR).toBigInteger();
+ carry = new BigDecimal(temp).divide(DECIMAL_SIXTY, RoundingMode.FLOOR).toBigInteger();
/* Hours
* temp := S[hour] + D[hour] + carry
@@ -2177,7 +2140,8 @@
temp = BigInteger.valueOf(startHours).add(dHours).add(carry);
setHour(temp.mod(TWENTY_FOUR).intValue(), false);
- carry = new BigDecimal(temp).divide(new BigDecimal(TWENTY_FOUR), BigDecimal.ROUND_FLOOR).toBigInteger();
+ carry = new BigDecimal(temp).divide(DECIMAL_TWENTY_FOUR,
+ RoundingMode.FLOOR).toBigInteger();
/* Days
* if S[day] > maximumDayInMonthFor(E[year], E[month])
@@ -2225,15 +2189,19 @@
// calculate days in previous month, watch for month roll over
BigInteger mdimf = null;
if (month >= 2) {
- mdimf = BigInteger.valueOf(maximumDayInMonthFor(getEonAndYear(), getMonth() - 1));
+ mdimf = BigInteger.valueOf(maximumDayInMonthFor(getEonAndYear(),
+ getMonth() - 1));
} else {
// roll over to December of previous year
- mdimf = BigInteger.valueOf(maximumDayInMonthFor(getEonAndYear().subtract(BigInteger.valueOf((long) 1)), 12));
+ mdimf = BigInteger.valueOf(maximumDayInMonthFor(getEonAndYear()
+ .subtract(BigInteger.ONE), 12));
}
endDays = endDays.add(mdimf);
monthCarry = -1;
- } else if (endDays.compareTo(BigInteger.valueOf(maximumDayInMonthFor(getEonAndYear(), getMonth()))) > 0) {
- endDays = endDays.add(BigInteger.valueOf(-maximumDayInMonthFor(getEonAndYear(), getMonth())));
+ } else if (endDays.compareTo(BigInteger.valueOf(
+ maximumDayInMonthFor(getEonAndYear(), getMonth()))) > 0) {
+ endDays = endDays.add(BigInteger.valueOf(
+ -maximumDayInMonthFor(getEonAndYear(), getMonth())));
monthCarry = 1;
} else {
break;
@@ -2244,7 +2212,8 @@
int quotient;
if (endMonth < 0) {
endMonth = (13 - 1) + endMonth + 1;
- quotient = BigDecimal.valueOf(intTemp - 1).divide(new BigDecimal(TWELVE), BigDecimal.ROUND_UP).intValue();
+ quotient = BigDecimal.valueOf(intTemp - 1)
+ .divide(DECIMAL_TWELVE, RoundingMode.UP).intValue();
} else {
quotient = (intTemp - 1) / (13 - 1);
endMonth += 1;
@@ -2292,6 +2261,8 @@
private static final BigInteger TWELVE = BigInteger.valueOf(12);
private static final BigDecimal DECIMAL_ZERO = BigDecimal.valueOf(0);
private static final BigDecimal DECIMAL_ONE = BigDecimal.valueOf(1);
+ private static final BigDecimal DECIMAL_TWELVE = BigDecimal.valueOf(12);
+ private static final BigDecimal DECIMAL_TWENTY_FOUR = BigDecimal.valueOf(24);
private static final BigDecimal DECIMAL_SIXTY = BigDecimal.valueOf(60);
@@ -2779,7 +2750,7 @@
}
}
- public void setFractionalSecond(BigDecimal fractional) {
+ public final void setFractionalSecond(BigDecimal fractional) {
if (fractional != null) {
if ((fractional.compareTo(DECIMAL_ZERO) < 0) ||
(fractional.compareTo(DECIMAL_ONE) > 0)) {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -790,7 +789,7 @@
// use specified document class
try {
Class documentClass = ObjectFactory.findProviderClass (fDocumentClassName, true);
- fDocument = (Document)documentClass.newInstance ();
+ fDocument = (Document)documentClass.getConstructor().newInstance();
// if subclass of our own class that's cool too
Class defaultDocClass =
@@ -1750,7 +1749,9 @@
"xml:base",
"http://www.w3.org/XML/1998/namespace",
baseURI,
- true);
+ true,
+ false,
+ null);
}
}
else if (nodeType == Node.PROCESSING_INSTRUCTION_NODE) {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -79,6 +78,7 @@
* @author Andy Clark, IBM
*
*/
+@SuppressWarnings("deprecation")
public abstract class AbstractSAXParser
extends AbstractXMLDocumentParser
implements PSVIProvider, // PSVI
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @author Andy Clark, IBM
*
*/
+@SuppressWarnings("deprecation")
public final class AttributesProxy
implements AttributeList, Attributes2 {
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -157,7 +156,7 @@
// assert(className != null);
try{
Class providerClass = findProviderClass(className, cl, doFallback);
- Object instance = providerClass.newInstance();
+ Object instance = providerClass.getConstructor().newInstance();
debugPrintln(()->"created new instance of " + providerClass +
" using ClassLoader: " + cl);
return instance;
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -117,7 +116,7 @@
return ((Boolean)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- return new Boolean(f.exists());
+ return f.exists();
}
})).booleanValue();
}
@@ -126,7 +125,7 @@
return ((Long)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- return new Long(f.lastModified());
+ return f.lastModified();
}
})).longValue();
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1702,7 +1702,7 @@
if (fEntityResolver != null) fChildConfig.setProperty(ENTITY_RESOLVER, fEntityResolver);
fChildConfig.setProperty(SECURITY_MANAGER, fSecurityManager);
fChildConfig.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
- fChildConfig.setProperty(BUFFER_SIZE, new Integer(fBufferSize));
+ fChildConfig.setProperty(BUFFER_SIZE, fBufferSize);
// features must be copied to child configuration
fNeedCopyFeatures = true;
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -536,9 +535,9 @@
private Tokens(SymbolTable symbolTable) {
fSymbolTable = symbolTable;
- fTokenNames.put(new Integer(XPTRTOKEN_ELEM_NCNAME),
+ fTokenNames.put(XPTRTOKEN_ELEM_NCNAME,
"XPTRTOKEN_ELEM_NCNAME");
- fTokenNames.put(new Integer(XPTRTOKEN_ELEM_CHILD),
+ fTokenNames.put(XPTRTOKEN_ELEM_CHILD,
"XPTRTOKEN_ELEM_CHILD");
}
@@ -548,7 +547,7 @@
* @return String The token string
*/
private String getTokenString(int token) {
- return fTokenNames.get(new Integer(token));
+ return fTokenNames.get(token);
}
/**
@@ -560,7 +559,7 @@
String str = fTokenNames.get(tokenStr);
Integer tokenInt = str == null ? null : Integer.parseInt(str);
if (tokenInt == null) {
- tokenInt = new Integer(fTokenNames.size());
+ tokenInt = fTokenNames.size();
fTokenNames.put(tokenInt, tokenStr);
}
addToken(tokenInt.intValue());
@@ -763,7 +762,7 @@
// An invalid child sequence character
if (child == 0) {
reportError("InvalidChildSequenceCharacter",
- new Object[] { new Character((char) ch) });
+ new Object[] { (char) ch });
return false;
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -227,7 +226,7 @@
//
if (typeDef != null && ((XSSimpleType) typeDef).isIDType()) {
- return attrPSVI.getSchemaNormalizedValue();
+ return attrPSVI.getSchemaValue().getNormalizedValue();
}
// 4 & 5 NA
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -249,8 +248,8 @@
if (openParenCount != closeParenCount) {
reportError("UnbalancedParenthesisInXPointerExpression",
new Object[] { xpointer,
- new Integer(openParenCount),
- new Integer(closeParenCount) });
+ openParenCount,
+ closeParenCount });
}
// Perform scheme specific parsing of the pointer part
@@ -497,15 +496,15 @@
private Tokens(SymbolTable symbolTable) {
fSymbolTable = symbolTable;
- fTokenNames.put(new Integer(XPTRTOKEN_OPEN_PAREN),
+ fTokenNames.put(XPTRTOKEN_OPEN_PAREN,
"XPTRTOKEN_OPEN_PAREN");
- fTokenNames.put(new Integer(XPTRTOKEN_CLOSE_PAREN),
+ fTokenNames.put(XPTRTOKEN_CLOSE_PAREN,
"XPTRTOKEN_CLOSE_PAREN");
- fTokenNames.put(new Integer(XPTRTOKEN_SHORTHAND),
+ fTokenNames.put(XPTRTOKEN_SHORTHAND,
"XPTRTOKEN_SHORTHAND");
- fTokenNames.put(new Integer(XPTRTOKEN_SCHEMENAME),
+ fTokenNames.put(XPTRTOKEN_SCHEMENAME,
"XPTRTOKEN_SCHEMENAME");
- fTokenNames.put(new Integer(XPTRTOKEN_SCHEMEDATA),
+ fTokenNames.put(XPTRTOKEN_SCHEMEDATA,
"XPTRTOKEN_SCHEMEDATA");
}
@@ -515,7 +514,7 @@
* @return String The token string
*/
private String getTokenString(int token) {
- return fTokenNames.get(new Integer(token));
+ return fTokenNames.get(token);
}
/**
@@ -527,7 +526,7 @@
String str = fTokenNames.get(tokenStr);
Integer tokenInt = str == null ? null : Integer.parseInt(str);
if (tokenInt == null) {
- tokenInt = new Integer(fTokenNames.size());
+ tokenInt = fTokenNames.size();
fTokenNames.put(tokenInt, tokenStr);
}
addToken(tokenInt.intValue());
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -113,7 +112,7 @@
Class xniStdConfigClass=ObjectFactory.findProviderClass(
"com.sun.org.apache.xerces.internal.parsers.StandardParserConfiguration",
true);
- fPullParserConfig=xniStdConfigClass.newInstance();
+ fPullParserConfig=xniStdConfigClass.getConstructor().newInstance();
Object[] args2={fPullParserConfig};
fIncrementalParser = (SAXParser)ctor.newInstance(args2);
@@ -386,6 +385,7 @@
/** Simple unit test. Attempt coroutine parsing of document indicated
* by first argument (as a URI), report progress.
*/
+ @Deprecated
public static void _main(String args[])
{
System.out.println("Starting...");
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -117,7 +116,7 @@
return ((Boolean)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- return new Boolean(f.exists());
+ return f.exists();
}
})).booleanValue();
}
@@ -126,7 +125,7 @@
return ((Long)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- return new Long(f.lastModified());
+ return f.lastModified();
}
})).longValue();
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -205,7 +204,7 @@
private static final int S_XALAN_PREFIX_LEN = S_XALAN_PREFIX.length();
/** Synchronization object for lazy initialization of the above tables. */
- private static Integer m_synch_object = new Integer(1);
+ private static final Object m_synch_object = new Object();
/** the directory in which the various method property files are located */
private static final String PROP_DIR = "com/sun/org/apache/xml/internal/serializer/";
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -125,7 +124,7 @@
// _serializers.put(method, cls);
- Object obj = cls.newInstance();
+ Object obj = cls.getConstructor().newInstance();
if (obj instanceof SerializationHandler)
{
@@ -151,7 +150,7 @@
className = SerializerConstants.DEFAULT_SAX_SERIALIZER;
cls = ObjectFactory.findProviderClass(className, true);
SerializationHandler sh =
- (SerializationHandler) cls.newInstance();
+ (SerializationHandler) cls.getConstructor().newInstance();
sh.setContentHandler( (ContentHandler) obj);
sh.setOutputFormat(format);
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1170,7 +1170,7 @@
}
}
// Reference to invalid character which is returned
- refInvalidChar = new Character(ch);
+ refInvalidChar = ch;
return false;
}
}
@@ -1191,7 +1191,7 @@
}
}
// Reference to invalid character which is returned
- refInvalidChar = new Character(ch);
+ refInvalidChar = ch;
return false;
}
}
@@ -1233,7 +1233,7 @@
}
}
// Reference to invalid character which is returned
- refInvalidChar = new Character(ch);
+ refInvalidChar = ch;
return refInvalidChar;
}
}
@@ -1254,7 +1254,7 @@
}
}
// Reference to invalid character which is returned
- refInvalidChar = new Character(ch);
+ refInvalidChar = ch;
return refInvalidChar;
}
}
@@ -1296,7 +1296,7 @@
String msg =
Utils.messages.createMessage(
MsgKey.ER_WF_INVALID_CHARACTER_IN_COMMENT,
- new Object[] { new Character(c)});
+ new Object[] { c});
if (fErrorHandler != null) {
fErrorHandler.handleError(
@@ -1345,7 +1345,7 @@
String msg =
Utils.messages.createMessage(
MsgKey.ER_WF_INVALID_CHARACTER_IN_COMMENT,
- new Object[] { new Character(c)});
+ new Object[] { c});
if (fErrorHandler != null) {
fErrorHandler.handleError(
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,7 @@
import com.sun.org.apache.xml.internal.res.XMLErrorResources;
import com.sun.org.apache.xml.internal.res.XMLMessages;
import com.sun.org.apache.xalan.internal.utils.ObjectFactory;
+import java.lang.reflect.InvocationTargetException;
/**
@@ -134,13 +134,14 @@
// Create a new object if so.
try
{
- return objectType.newInstance();
+ return objectType.getConstructor().newInstance();
}
- catch (InstantiationException ex){}
- catch (IllegalAccessException ex){}
+ catch (InstantiationException | IllegalAccessException | SecurityException |
+ IllegalArgumentException | InvocationTargetException | NoSuchMethodException ex){}
// Throw unchecked exception for error in pool configuration.
- throw new RuntimeException(XMLMessages.createXMLMessage(XMLErrorResources.ER_EXCEPTION_CREATING_POOL, null)); //"exception creating new instance for pool");
+ throw new RuntimeException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_EXCEPTION_CREATING_POOL, null));
}
else
{
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* in this class should allow easy garbage collection of source
* trees (not yet!), and should centralize parsing for those source trees.
*/
+@SuppressWarnings("deprecation")
public class SourceTreeManager
{
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1295,11 +1294,11 @@
m_DTMXRTreeFrags = new HashMap();
}
- if(m_DTMXRTreeFrags.containsKey(new Integer(dtmIdentity))){
- return (DTMXRTreeFrag)m_DTMXRTreeFrags.get(new Integer(dtmIdentity));
+ if(m_DTMXRTreeFrags.containsKey(dtmIdentity)){
+ return (DTMXRTreeFrag)m_DTMXRTreeFrags.get(dtmIdentity);
}else{
final DTMXRTreeFrag frag = new DTMXRTreeFrag(dtmIdentity,this);
- m_DTMXRTreeFrags.put(new Integer(dtmIdentity),frag);
+ m_DTMXRTreeFrags.put(dtmIdentity,frag);
return frag ;
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
import com.sun.org.apache.xpath.internal.operations.Quo;
import com.sun.org.apache.xpath.internal.operations.Variable;
+@SuppressWarnings("deprecation")
public class HasPositionalPredChecker extends XPathVisitor
{
private boolean m_hasPositionalPred = false;
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
*/
/**
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,12 +19,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * $Id: FunctionTable.java,v 1.3 2005/09/28 13:49:34 pvedula Exp $
- */
+
package com.sun.org.apache.xpath.internal.compiler;
import com.sun.org.apache.xpath.internal.functions.Function;
+import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import javax.xml.transform.TransformerException;
@@ -150,7 +149,7 @@
private static Class m_functions[];
/** Table of function name to function ID associations. */
- private static HashMap m_functionID = new HashMap();
+ private static final HashMap<String, Integer> m_functionID = new HashMap<>();
/**
* The function table contains customized functions
@@ -160,7 +159,7 @@
/**
* Table of function name to function ID associations for customized functions
*/
- private HashMap m_functionID_customer = new HashMap();
+ private HashMap<String, Integer> m_functionID_customer = new HashMap<>();
/**
* Number of built in functions. Be sure to update this as
@@ -239,77 +238,77 @@
static{
m_functionID.put(Keywords.FUNC_CURRENT_STRING,
- new Integer(FunctionTable.FUNC_CURRENT));
+ FunctionTable.FUNC_CURRENT);
m_functionID.put(Keywords.FUNC_LAST_STRING,
- new Integer(FunctionTable.FUNC_LAST));
+ FunctionTable.FUNC_LAST);
m_functionID.put(Keywords.FUNC_POSITION_STRING,
- new Integer(FunctionTable.FUNC_POSITION));
+ FunctionTable.FUNC_POSITION);
m_functionID.put(Keywords.FUNC_COUNT_STRING,
- new Integer(FunctionTable.FUNC_COUNT));
+ FunctionTable.FUNC_COUNT);
m_functionID.put(Keywords.FUNC_ID_STRING,
- new Integer(FunctionTable.FUNC_ID));
+ FunctionTable.FUNC_ID);
m_functionID.put(Keywords.FUNC_KEY_STRING,
- new Integer(FunctionTable.FUNC_KEY));
+ FunctionTable.FUNC_KEY);
m_functionID.put(Keywords.FUNC_LOCAL_PART_STRING,
- new Integer(FunctionTable.FUNC_LOCAL_PART));
+ FunctionTable.FUNC_LOCAL_PART);
m_functionID.put(Keywords.FUNC_NAMESPACE_STRING,
- new Integer(FunctionTable.FUNC_NAMESPACE));
+ FunctionTable.FUNC_NAMESPACE);
m_functionID.put(Keywords.FUNC_NAME_STRING,
- new Integer(FunctionTable.FUNC_QNAME));
+ FunctionTable.FUNC_QNAME);
m_functionID.put(Keywords.FUNC_GENERATE_ID_STRING,
- new Integer(FunctionTable.FUNC_GENERATE_ID));
+ FunctionTable.FUNC_GENERATE_ID);
m_functionID.put(Keywords.FUNC_NOT_STRING,
- new Integer(FunctionTable.FUNC_NOT));
+ FunctionTable.FUNC_NOT);
m_functionID.put(Keywords.FUNC_TRUE_STRING,
- new Integer(FunctionTable.FUNC_TRUE));
+ FunctionTable.FUNC_TRUE);
m_functionID.put(Keywords.FUNC_FALSE_STRING,
- new Integer(FunctionTable.FUNC_FALSE));
+ FunctionTable.FUNC_FALSE);
m_functionID.put(Keywords.FUNC_BOOLEAN_STRING,
- new Integer(FunctionTable.FUNC_BOOLEAN));
+ FunctionTable.FUNC_BOOLEAN);
m_functionID.put(Keywords.FUNC_LANG_STRING,
- new Integer(FunctionTable.FUNC_LANG));
+ FunctionTable.FUNC_LANG);
m_functionID.put(Keywords.FUNC_NUMBER_STRING,
- new Integer(FunctionTable.FUNC_NUMBER));
+ FunctionTable.FUNC_NUMBER);
m_functionID.put(Keywords.FUNC_FLOOR_STRING,
- new Integer(FunctionTable.FUNC_FLOOR));
+ FunctionTable.FUNC_FLOOR);
m_functionID.put(Keywords.FUNC_CEILING_STRING,
- new Integer(FunctionTable.FUNC_CEILING));
+ FunctionTable.FUNC_CEILING);
m_functionID.put(Keywords.FUNC_ROUND_STRING,
- new Integer(FunctionTable.FUNC_ROUND));
+ FunctionTable.FUNC_ROUND);
m_functionID.put(Keywords.FUNC_SUM_STRING,
- new Integer(FunctionTable.FUNC_SUM));
+ FunctionTable.FUNC_SUM);
m_functionID.put(Keywords.FUNC_STRING_STRING,
- new Integer(FunctionTable.FUNC_STRING));
+ FunctionTable.FUNC_STRING);
m_functionID.put(Keywords.FUNC_STARTS_WITH_STRING,
- new Integer(FunctionTable.FUNC_STARTS_WITH));
+ FunctionTable.FUNC_STARTS_WITH);
m_functionID.put(Keywords.FUNC_CONTAINS_STRING,
- new Integer(FunctionTable.FUNC_CONTAINS));
+ FunctionTable.FUNC_CONTAINS);
m_functionID.put(Keywords.FUNC_SUBSTRING_BEFORE_STRING,
- new Integer(FunctionTable.FUNC_SUBSTRING_BEFORE));
+ FunctionTable.FUNC_SUBSTRING_BEFORE);
m_functionID.put(Keywords.FUNC_SUBSTRING_AFTER_STRING,
- new Integer(FunctionTable.FUNC_SUBSTRING_AFTER));
+ FunctionTable.FUNC_SUBSTRING_AFTER);
m_functionID.put(Keywords.FUNC_NORMALIZE_SPACE_STRING,
- new Integer(FunctionTable.FUNC_NORMALIZE_SPACE));
+ FunctionTable.FUNC_NORMALIZE_SPACE);
m_functionID.put(Keywords.FUNC_TRANSLATE_STRING,
- new Integer(FunctionTable.FUNC_TRANSLATE));
+ FunctionTable.FUNC_TRANSLATE);
m_functionID.put(Keywords.FUNC_CONCAT_STRING,
- new Integer(FunctionTable.FUNC_CONCAT));
+ FunctionTable.FUNC_CONCAT);
m_functionID.put(Keywords.FUNC_SYSTEM_PROPERTY_STRING,
- new Integer(FunctionTable.FUNC_SYSTEM_PROPERTY));
+ FunctionTable.FUNC_SYSTEM_PROPERTY);
m_functionID.put(Keywords.FUNC_EXT_FUNCTION_AVAILABLE_STRING,
- new Integer(FunctionTable.FUNC_EXT_FUNCTION_AVAILABLE));
+ FunctionTable.FUNC_EXT_FUNCTION_AVAILABLE);
m_functionID.put(Keywords.FUNC_EXT_ELEM_AVAILABLE_STRING,
- new Integer(FunctionTable.FUNC_EXT_ELEM_AVAILABLE));
+ FunctionTable.FUNC_EXT_ELEM_AVAILABLE);
m_functionID.put(Keywords.FUNC_SUBSTRING_STRING,
- new Integer(FunctionTable.FUNC_SUBSTRING));
+ FunctionTable.FUNC_SUBSTRING);
m_functionID.put(Keywords.FUNC_STRING_LENGTH_STRING,
- new Integer(FunctionTable.FUNC_STRING_LENGTH));
+ FunctionTable.FUNC_STRING_LENGTH);
m_functionID.put(Keywords.FUNC_UNPARSED_ENTITY_URI_STRING,
- new Integer(FunctionTable.FUNC_UNPARSED_ENTITY_URI));
+ FunctionTable.FUNC_UNPARSED_ENTITY_URI);
m_functionID.put(Keywords.FUNC_DOCLOCATION_STRING,
- new Integer(FunctionTable.FUNC_DOCLOCATION));
+ FunctionTable.FUNC_DOCLOCATION);
m_functionID.put(Keywords.FUNC_HERE_STRING,
- new Integer(FunctionTable.FUNC_HERE));
+ FunctionTable.FUNC_HERE);
}
public FunctionTable(){
@@ -341,15 +340,14 @@
{
try{
if (which < NUM_BUILT_IN_FUNCS) {
- return (Function) m_functions[which].newInstance();
+ return (Function) m_functions[which].getConstructor().newInstance();
} else {
Class<?> c = m_functions_customer[which-NUM_BUILT_IN_FUNCS];
- return (Function) c.newInstance();
+ return (Function) c.getConstructor().newInstance();
}
- }catch (IllegalAccessException ex){
- throw new TransformerException(ex.getMessage());
- }catch (InstantiationException ex){
- throw new TransformerException(ex.getMessage());
+ }catch (InstantiationException | IllegalAccessException | SecurityException |
+ IllegalArgumentException | InvocationTargetException | NoSuchMethodException ex){
+ throw new TransformerException(ex.getMessage());
}
}
@@ -360,8 +358,8 @@
* found in {@link com.sun.org.apache.xpath.internal.compiler.FunctionTable}, but may be a
* value installed by an external module.
*/
- Object getFunctionID(String key){
- Object id = m_functionID_customer.get(key);
+ Integer getFunctionID(String key){
+ Integer id = m_functionID_customer.get(key);
if (null == id) id = m_functionID.get(key);
return id;
}
@@ -376,7 +374,7 @@
{
int funcIndex;
- Object funcIndexObj = getFunctionID(name);
+ Integer funcIndexObj = getFunctionID(name);
if (func != null && !Function.class.isAssignableFrom(func)) {
throw new ClassCastException(func.getName()
@@ -386,22 +384,19 @@
if (null != funcIndexObj)
{
- funcIndex = ((Integer) funcIndexObj).intValue();
+ funcIndex = funcIndexObj;
if (funcIndex < NUM_BUILT_IN_FUNCS){
funcIndex = m_funcNextFreeIndex++;
- m_functionID_customer.put(name, new Integer(funcIndex));
+ m_functionID_customer.put(name, funcIndex);
}
m_functions_customer[funcIndex - NUM_BUILT_IN_FUNCS] = func;
}
else
{
funcIndex = m_funcNextFreeIndex++;
-
m_functions_customer[funcIndex-NUM_BUILT_IN_FUNCS] = func;
-
- m_functionID_customer.put(name,
- new Integer(funcIndex));
+ m_functionID_customer.put(name, funcIndex);
}
return funcIndex;
}
@@ -415,11 +410,11 @@
*/
public boolean functionAvailable(String methName)
{
- Object tblEntry = m_functionID.get(methName);
+ Integer tblEntry = m_functionID.get(methName);
if (null != tblEntry) return true;
else{
tblEntry = m_functionID_customer.get(methName);
- return (null != tblEntry)? true : false;
+ return (null != tblEntry);
}
}
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -667,8 +666,7 @@
{
int tok;
-
- Object id;
+ Integer id;
try
{
@@ -676,7 +674,7 @@
// a FilterExpr.
id = Keywords.lookupNodeTest(key);
if (null == id) id = m_functionTable.getFunctionID(key);
- tok = ((Integer) id).intValue();
+ tok = id;
}
catch (NullPointerException npe)
{
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -170,7 +169,7 @@
if (name == null) {
String fmsg = XSLMessages.createXPATHMessage(
XPATHErrorResources.ER_FEATURE_NAME_NULL,
- new Object[] { CLASS_NAME, new Boolean( value) } );
+ new Object[] { CLASS_NAME, value } );
throw new NullPointerException( fmsg );
}
@@ -179,7 +178,7 @@
if ((_isSecureMode) && (!value)) {
String fmsg = XSLMessages.createXPATHMessage(
XPATHErrorResources.ER_SECUREPROCESSING_FEATURE,
- new Object[] { name, CLASS_NAME, new Boolean(value) } );
+ new Object[] { name, CLASS_NAME, value } );
throw new XPathFactoryConfigurationException( fmsg );
}
@@ -207,7 +206,7 @@
// unknown feature
String fmsg = XSLMessages.createXPATHMessage(
XPATHErrorResources.ER_FEATURE_UNKNOWN,
- new Object[] { name, CLASS_NAME, new Boolean(value) } );
+ new Object[] { name, CLASS_NAME, value } );
throw new XPathFactoryConfigurationException( fmsg );
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -134,7 +133,7 @@
public Object object()
{
if(null == m_obj)
- setObject(new Boolean(m_val));
+ setObject(m_val);
return m_obj;
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -378,7 +377,7 @@
public Object object()
{
if(null == m_obj)
- setObject(new Double(m_val));
+ setObject(m_val);
return m_obj;
}
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,5 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -499,13 +498,13 @@
result = str();
break;
case CLASS_NUMBER :
- result = new Double(num());
+ result = num();
break;
case CLASS_NODESET :
result = iter();
break;
case CLASS_BOOLEAN :
- result = new Boolean(bool());
+ result = bool();
break;
case CLASS_UNKNOWN :
result = m_obj;
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/Catalog.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/Catalog.java Mon Jul 17 09:13:49 2017 -0700
@@ -57,7 +57,6 @@
* <p>
* In addition to the above entry types, a catalog may define nextCatalog
* entries to add additional catalog entry files.
- * <p>
*
* @since 9
*/
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java Mon Jul 17 09:13:49 2017 -0700
@@ -32,30 +32,30 @@
/**
* The CatalogFeatures holds a collection of features and properties.
- * <p>
*
*
* <table class="plain">
* <caption>Catalog Features</caption>
* <thead>
* <tr>
- * <th rowspan="2">Feature</th>
- * <th rowspan="2">Description</th>
- * <th rowspan="2">Property Name</th>
- * <th rowspan="2">System Property [1]</th>
- * <th rowspan="2">jaxp.properties [1]</th>
- * <th colspan="2" style="text-align:center">Value [2]</th>
- * <th rowspan="2">Action</th>
+ * <th scope="col" rowspan="2">Feature</th>
+ * <th scope="col" rowspan="2">Description</th>
+ * <th scope="col" rowspan="2">Property Name</th>
+ * <th scope="col" rowspan="2">System Property [1]</th>
+ * <th scope="col" rowspan="2">jaxp.properties [1]</th>
+ * <th scope="col" colspan="2" style="text-align:center">Value [2]</th>
+ * <th scope="col" rowspan="2">Action</th>
* </tr>
* <tr>
- * <th>Type</th>
- * <th>Value</th>
+ * <th scope="col">Type</th>
+ * <th scope="col">Value</th>
* </tr>
* </thead>
+ *
* <tbody>
*
* <tr>
- * <td><a id="FILES">FILES</a></td>
+ * <th scope="row" style="font-weight:normal">FILES</th>
* <td>A semicolon-delimited list of URIs to locate the catalog files.
* The URIs must be absolute and have a URL protocol handler for the URI scheme.
* </td>
@@ -63,7 +63,7 @@
* <td>javax.xml.catalog.files</td>
* <td>javax.xml.catalog.files</td>
* <td>String</td>
- * <td>URIs</td>
+ * <th id="URIs" scope="row" style="font-weight:normal">URIs</th>
* <td>
* Reads the first catalog as the current catalog; Loads others if no match
* is found in the current catalog including delegate catalogs if any.
@@ -71,25 +71,27 @@
* </tr>
*
* <tr>
- * <td rowspan="2"><a id="PREFER">PREFER</a></td>
+ * <th rowspan="2" scope="row" style="font-weight:normal">PREFER</th>
* <td rowspan="2">Indicates the preference between the public and system
* identifiers. The default value is public [3].</td>
* <td rowspan="2">javax.xml.catalog.prefer</td>
* <td rowspan="2">N/A</td>
* <td rowspan="2">N/A</td>
* <td rowspan="2">String</td>
- * <td>{@code system}</td>
- * <td>Searches system entries for a match; Searches public entries when
+ * <th scope="row" id="system" style="font-weight:normal">{@code system}</th>
+ * <td>
+ * Searches system entries for a match; Searches public entries when
* external identifier specifies only a public identifier</td>
* </tr>
* <tr>
- * <td>{@code public}</td>
- * <td>Searches system entries for a match; Searches public entries when
+ * <th scope="row" id="public" style="font-weight:normal">{@code public}</th>
+ * <td>
+ * Searches system entries for a match; Searches public entries when
* there is no matching system entry.</td>
* </tr>
*
* <tr>
- * <td rowspan="2"><a id="DEFER">DEFER</a></td>
+ * <th rowspan="2" scope="row" style="font-weight:normal">DEFER</th>
* <td rowspan="2">Indicates that the alternative catalogs including those
* specified in delegate entries or nextCatalog are not read until they are
* needed. The default value is true.</td>
@@ -97,35 +99,40 @@
* <td rowspan="2">javax.xml.catalog.defer</td>
* <td rowspan="2">javax.xml.catalog.defer</td>
* <td rowspan="2">String</td>
- * <td>{@code true}</td>
- * <td>Loads alternative catalogs as needed.
+ * <th scope="row" id="true" style="font-weight:normal">{@code true}</th>
+ * <td>
+ * Loads alternative catalogs as needed.
* </td>
* </tr>
* <tr>
- * <td>{@code false}</td>
- * <td>Loads all catalogs[5]. </td>
+ * <th scope="row" id="false" style="font-weight:normal">{@code false}</th>
+ * <td>
+ * Loads all catalogs[5]. </td>
* </tr>
*
* <tr>
- * <td rowspan="3"><a id="RESOLVE">RESOLVE</a></td>
+ * <th rowspan="3" scope="row" style="font-weight:normal">RESOLVE</th>
* <td rowspan="3">Determines the action if there is no matching entry found after
* all of the specified catalogs are exhausted. The default is strict.</td>
* <td rowspan="3">javax.xml.catalog.resolve [4]</td>
* <td rowspan="3">javax.xml.catalog.resolve</td>
* <td rowspan="3">javax.xml.catalog.resolve</td>
* <td rowspan="3">String</td>
- * <td>{@code strict}</td>
- * <td>Throws CatalogException if there is no match.
+ * <th scope="row" id="strict" style="font-weight:normal">{@code strict}</th>
+ * <td>
+ * Throws CatalogException if there is no match.
* </td>
* </tr>
* <tr>
- * <td>{@code continue}</td>
- * <td>Allows the XML parser to continue as if there is no match.
+ * <th scope="row" id="continue" style="font-weight:normal">{@code continue}</th>
+ * <td>
+ * Allows the XML parser to continue as if there is no match.
* </td>
* </tr>
* <tr>
- * <td>{@code ignore}</td>
- * <td>Tells the XML parser to skip the external references if there no match.
+ * <th scope="row" id="ignore" style="font-weight:normal">{@code ignore}</th>
+ * <td>
+ * Tells the XML parser to skip the external references if there no match.
* </td>
* </tr>
*
@@ -156,7 +163,7 @@
* <b>[5]</b> If the intention is to share an entire catalog store, it may be desirable to
* set the property {@code javax.xml.catalog.defer} to false to allow the entire
* catalog to be pre-loaded.
- * <p>
+ *
* <h3>Scope and Order</h3>
* Features and properties can be set through the catalog file, the Catalog API,
* system properties, and {@code jaxp.properties}, with a preference in the same order.
@@ -195,7 +202,6 @@
.build();
* }</pre>
*
- * <p>
* <h3>JAXP XML Processor Support</h3>
* The Catalog Features are supported throughout the JAXP processors, including
* SAX and DOM ({@link javax.xml.parsers}), and StAX parsers ({@link javax.xml.stream}),
@@ -204,7 +210,7 @@
* factories or processors that define a setProperty or setAttribute interface.
* For example, the following code snippet sets a URI to a catalog file on a SAX
* parser through the {@code javax.xml.catalog.files} property:
- * <p>
+ *
* <pre>{@code
* SAXParserFactory spf = SAXParserFactory.newInstance();
* spf.setFeature(XMLConstants.USE_CATALOG, true); [1]
@@ -240,21 +246,20 @@
* The Catalog support is available for any process in the JAXP library that
* supports a resolver. The following table lists all such processes.
*
- * <p>
* <h3><a id="ProcessesWithCatalogSupport">Processes with Catalog Support</a></h3>
*
* <table class="striped">
* <caption>Processes with Catalog Support</caption>
* <thead>
* <tr>
- * <th>Process</th>
- * <th>Catalog Entry Type</th>
- * <th>Example</th>
+ * <th scope="col">Process</th>
+ * <th scope="col">Catalog Entry Type</th>
+ * <th scope="col">Example</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>DTDs and external entities</td>
+ * <th scope="row">DTDs and external entities</th>
* <td>public, system</td>
* <td>
* <pre>{@literal
@@ -269,7 +274,7 @@
* </td>
* </tr>
* <tr>
- * <td>XInclude</td>
+ * <th scope="row">XInclude</th>
* <td>uri</td>
* <td>
* <pre>{@literal
@@ -284,7 +289,7 @@
* </td>
* </tr>
* <tr>
- * <td>XSD import</td>
+ * <th scope="row">XSD import</th>
* <td>uri</td>
* <td>
* <pre>{@literal
@@ -302,7 +307,7 @@
* </td>
* </tr>
* <tr>
- * <td>XSD include</td>
+ * <th scope="row">XSD include</th>
* <td>uri</td>
* <td>
* <pre>{@literal
@@ -317,7 +322,7 @@
* </td>
* </tr>
* <tr>
- * <td>XSL import and include</td>
+ * <th scope="row">XSL import and include</th>
* <td>uri</td>
* <td>
* <pre>{@literal
@@ -332,7 +337,7 @@
* </td>
* </tr>
* <tr>
- * <td>XSL document function</td>
+ * <th scope="row">XSL document function</th>
* <td>uri</td>
* <td>
* <pre>{@literal
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolver.java Mon Jul 17 09:13:49 2017 -0700
@@ -53,7 +53,7 @@
* The search is started in the current catalog. If a match is found,
* no further attempt will be made. Only if there is no match in the current
* catalog, will alternate catalogs including delegate and next catalogs be considered.
- * <p>
+ *
* <h3>Search Order</h3>
* The resolver will first search the system-type of entries with the specified
* {@code systemId}. The system entries include {@code system},
@@ -75,7 +75,6 @@
* with the specified {@code systemId} or {@code href}. The {@code uri} entries
* include {@code uri}, {@code rewriteURI}, and {@code uriSuffix} entries.
*
- * <p>
* <h3>Error Handling</h3>
* The interfaces that the CatalogResolver extend specified checked exceptions, including:
* <ul>
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -779,32 +779,32 @@
* {@link GregorianCalendar} to an {@link XMLGregorianCalendar}</caption>
* <thead>
* <tr>
- * <th>{@code java.util.GregorianCalendar} field</th>
- * <th>{@code javax.xml.datatype.XMLGregorianCalendar} field</th>
+ * <th scope="col">{@code java.util.GregorianCalendar} field</th>
+ * <th scope="col">{@code javax.xml.datatype.XMLGregorianCalendar} field</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>{@code ERA == GregorianCalendar.BC ? -YEAR : YEAR}</td>
+ * <th scope="row">{@code ERA == GregorianCalendar.BC ? -YEAR : YEAR}</th>
* <td>{@link XMLGregorianCalendar#setYear(int year)}</td>
* </tr>
* <tr>
- * <td>{@code MONTH + 1}</td>
+ * <th scope="row">{@code MONTH + 1}</th>
* <td>{@link XMLGregorianCalendar#setMonth(int month)}</td>
* </tr>
* <tr>
- * <td>{@code DAY_OF_MONTH}</td>
+ * <th scope="row">{@code DAY_OF_MONTH}</th>
* <td>{@link XMLGregorianCalendar#setDay(int day)}</td>
* </tr>
* <tr>
- * <td>{@code HOUR_OF_DAY, MINUTE, SECOND, MILLISECOND}</td>
+ * <th scope="row">{@code HOUR_OF_DAY, MINUTE, SECOND, MILLISECOND}</th>
* <td>{@link XMLGregorianCalendar#setTime(int hour, int minute, int second, BigDecimal fractional)}</td>
* </tr>
* <tr>
- * <td>
+ * <th scope="row">
* {@code (ZONE_OFFSET + DST_OFFSET) / (60*1000)}<br>
* <em>(in minutes)</em>
- * </td>
+ * </th>
* <td>{@link XMLGregorianCalendar#setTimezone(int offset)}<sup><em>*</em></sup>
* </td>
* </tr>
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java Mon Jul 17 09:13:49 2017 -0700
@@ -125,18 +125,18 @@
* <i>(timezone is optional for all date/time datatypes)</i></caption>
* <thead>
* <tr>
- * <th>Datatype</th>
- * <th>year</th>
- * <th>month</th>
- * <th>day</th>
- * <th>hour</th>
- * <th>minute</th>
- * <th>second</th>
+ * <th scope="col">Datatype</th>
+ * <th scope="col">year</th>
+ * <th scope="col">month</th>
+ * <th scope="col">day</th>
+ * <th scope="col">hour</th>
+ * <th scope="col">minute</th>
+ * <th scope="col">second</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>{@link DatatypeConstants#DURATION}</td>
+ * <th scope="row">{@link DatatypeConstants#DURATION}</th>
* <td>X</td>
* <td>X</td>
* <td>X</td>
@@ -145,7 +145,7 @@
* <td>X</td>
* </tr>
* <tr>
- * <td>{@link DatatypeConstants#DURATION_DAYTIME}</td>
+ * <th scope="row">{@link DatatypeConstants#DURATION_DAYTIME}</th>
* <td></td>
* <td></td>
* <td>X</td>
@@ -154,7 +154,7 @@
* <td>X</td>
* </tr>
* <tr>
- * <td>{@link DatatypeConstants#DURATION_YEARMONTH}</td>
+ * <th scope="row">{@link DatatypeConstants#DURATION_YEARMONTH}</th>
* <td>X</td>
* <td>X</td>
* <td></td>
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -190,7 +190,7 @@
if (!type.isAssignableFrom(providerClass)) {
throw new ClassCastException(className + " cannot be cast to " + type.getName());
}
- Object instance = providerClass.newInstance();
+ Object instance = providerClass.getConstructor().newInstance();
final ClassLoader clD = cl;
dPrint(()->"created new instance of " + providerClass +
" using ClassLoader: " + clD);
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/SecuritySupport.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -79,7 +79,7 @@
return ((Boolean)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- return new Boolean(f.exists());
+ return f.exists();
}
})).booleanValue();
}
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java Mon Jul 17 09:13:49 2017 -0700
@@ -58,16 +58,16 @@
* <caption>Date/Time Datatype Field Mapping Between XML Schema 1.0 and Java Representation</caption>
* <thead>
* <tr>
- * <th>XML Schema 1.0<br>
+ * <th scope="col">XML Schema 1.0<br>
* datatype<br>
* field</th>
- * <th>Related<br>XMLGregorianCalendar<br>Accessor(s)</th>
- * <th>Value Range</th>
+ * <th scope="col">Related<br>XMLGregorianCalendar<br>Accessor(s)</th>
+ * <th scope="col">Value Range</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td><a id="datetimefield-year">year</a></td>
+ * <th scope="row"><a id="datetimefield-year">year</a></th>
* <td> {@link #getYear()} + {@link #getEon()} or<br>
* {@link #getEonAndYear}
* </td>
@@ -85,12 +85,12 @@
* </td>
* </tr>
* <tr>
- * <td><a id="datetimefield-month">month</a></td>
+ * <th scope="row"><a id="datetimefield-month">month</a></th>
* <td> {@link #getMonth()} </td>
* <td> 1 to 12 or {@link DatatypeConstants#FIELD_UNDEFINED} </td>
* </tr>
* <tr>
- * <td><a id="datetimefield-day">day</a></td>
+ * <th scope="row"><a id="datetimefield-day">day</a></th>
* <td> {@link #getDay()} </td>
* <td> Independent of month, max range is 1 to 31 or {@link DatatypeConstants#FIELD_UNDEFINED}.<br>
* The normative value constraint stated relative to month
@@ -98,7 +98,7 @@
* </td>
* </tr>
* <tr>
- * <td><a id="datetimefield-hour">hour</a></td>
+ * <th scope="row"><a id="datetimefield-hour">hour</a></th>
* <td>{@link #getHour()}</td>
* <td>
* 0 to 23 or {@link DatatypeConstants#FIELD_UNDEFINED}.
@@ -110,12 +110,12 @@
* </td>
* </tr>
* <tr>
- * <td><a id="datetimefield-minute">minute</a></td>
+ * <th scope="row"><a id="datetimefield-minute">minute</a></th>
* <td> {@link #getMinute()} </td>
* <td> 0 to 59 or {@link DatatypeConstants#FIELD_UNDEFINED} </td>
* </tr>
* <tr>
- * <td><a id="datetimefield-second">second</a></td>
+ * <th scope="row"><a id="datetimefield-second">second</a></th>
* <td>
* {@link #getSecond()} + {@link #getMillisecond()}/1000 or<br>
* {@link #getSecond()} + {@link #getFractionalSecond()}
@@ -131,7 +131,7 @@
* </td>
* </tr>
* <tr>
- * <td><a id="datetimefield-timezone">timezone</a></td>
+ * <th scope="row"><a id="datetimefield-timezone">timezone</a></th>
* <td> {@link #getTimezone()} </td>
* <td> Number of minutes or {@link DatatypeConstants#FIELD_UNDEFINED}.
* Value range from -14 hours (-14 * 60 minutes) to 14 hours (14 * 60 minutes).
@@ -749,18 +749,18 @@
* <i>(timezone is optional for all date/time datatypes)</i></caption>
* <thead>
* <tr>
- * <th>Datatype</th>
- * <th>year</th>
- * <th>month</th>
- * <th>day</th>
- * <th>hour</th>
- * <th>minute</th>
- * <th>second</th>
+ * <th scope="col">Datatype</th>
+ * <th scope="col">year</th>
+ * <th scope="col">month</th>
+ * <th scope="col">day</th>
+ * <th scope="col">hour</th>
+ * <th scope="col">minute</th>
+ * <th scope="col">second</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>{@link DatatypeConstants#DATETIME}</td>
+ * <th scope="row">{@link DatatypeConstants#DATETIME}</th>
* <td>X</td>
* <td>X</td>
* <td>X</td>
@@ -769,7 +769,7 @@
* <td>X</td>
* </tr>
* <tr>
- * <td>{@link DatatypeConstants#DATE}</td>
+ * <th scope="row">{@link DatatypeConstants#DATE}</th>
* <td>X</td>
* <td>X</td>
* <td>X</td>
@@ -778,7 +778,7 @@
* <td></td>
* </tr>
* <tr>
- * <td>{@link DatatypeConstants#TIME}</td>
+ * <th scope="row">{@link DatatypeConstants#TIME}</th>
* <td></td>
* <td></td>
* <td></td>
@@ -787,7 +787,7 @@
* <td>X</td>
* </tr>
* <tr>
- * <td>{@link DatatypeConstants#GYEARMONTH}</td>
+ * <th scope="row">{@link DatatypeConstants#GYEARMONTH}</th>
* <td>X</td>
* <td>X</td>
* <td></td>
@@ -796,7 +796,7 @@
* <td></td>
* </tr>
* <tr>
- * <td>{@link DatatypeConstants#GMONTHDAY}</td>
+ * <th scope="row">{@link DatatypeConstants#GMONTHDAY}</th>
* <td></td>
* <td>X</td>
* <td>X</td>
@@ -805,7 +805,7 @@
* <td></td>
* </tr>
* <tr>
- * <td>{@link DatatypeConstants#GYEAR}</td>
+ * <th scope="row">{@link DatatypeConstants#GYEAR}</th>
* <td>X</td>
* <td></td>
* <td></td>
@@ -814,7 +814,7 @@
* <td></td>
* </tr>
* <tr>
- * <td>{@link DatatypeConstants#GMONTH}</td>
+ * <th scope="row">{@link DatatypeConstants#GMONTH}</th>
* <td></td>
* <td>X</td>
* <td></td>
@@ -823,7 +823,7 @@
* <td></td>
* </tr>
* <tr>
- * <td>{@link DatatypeConstants#GDAY}</td>
+ * <th scope="row">{@link DatatypeConstants#GDAY}</th>
* <td></td>
* <td></td>
* <td>X</td>
@@ -908,45 +908,45 @@
* {@code java.util.GregorianCalendar}</caption>
* <thead>
* <tr>
- * <th>{@code java.util.GregorianCalendar} field</th>
- * <th>{@code javax.xml.datatype.XMLGregorianCalendar} field</th>
+ * <th scope="col">{@code java.util.GregorianCalendar} field</th>
+ * <th scope="col">{@code javax.xml.datatype.XMLGregorianCalendar} field</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>{@code ERA}</td>
+ * <th scope="row">{@code ERA}</th>
* <td>{@link #getEonAndYear()}{@code .signum() < 0 ? GregorianCalendar.BC : GregorianCalendar.AD}</td>
* </tr>
* <tr>
- * <td>{@code YEAR}</td>
+ * <th scope="row">{@code YEAR}</th>
* <td>{@link #getEonAndYear()}{@code .abs().intValue()}<i>*</i></td>
* </tr>
* <tr>
- * <td>{@code MONTH}</td>
+ * <th scope="row">{@code MONTH}</th>
* <td>{@link #getMonth()} - {@link DatatypeConstants#JANUARY} + {@link GregorianCalendar#JANUARY}</td>
* </tr>
* <tr>
- * <td>{@code DAY_OF_MONTH}</td>
+ * <th scope="row">{@code DAY_OF_MONTH}</th>
* <td>{@link #getDay()}</td>
* </tr>
* <tr>
- * <td>{@code HOUR_OF_DAY}</td>
+ * <th scope="row">{@code HOUR_OF_DAY}</th>
* <td>{@link #getHour()}</td>
* </tr>
* <tr>
- * <td>{@code MINUTE}</td>
+ * <th scope="row">{@code MINUTE}</th>
* <td>{@link #getMinute()}</td>
* </tr>
* <tr>
- * <td>{@code SECOND}</td>
+ * <th scope="row">{@code SECOND}</th>
* <td>{@link #getSecond()}</td>
* </tr>
* <tr>
- * <td>{@code MILLISECOND}</td>
+ * <th scope="row">{@code MILLISECOND}</th>
* <td>get millisecond order from {@link #getFractionalSecond()}<i>*</i> </td>
* </tr>
* <tr>
- * <td>{@code GregorianCalendar.setTimeZone(TimeZone)}</td>
+ * <th scope="row">{@code GregorianCalendar.setTimeZone(TimeZone)}</th>
* <td>{@link #getTimezone()} formatted into Custom timezone id</td>
* </tr>
* </tbody>
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/package-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/package-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -52,46 +52,46 @@
* <caption> W3C XML Schema/Java Type Mappings</caption>
* <thead>
* <tr>
- * <th>W3C XML Schema Data Type</th>
- * <th>Java Data Type</th>
+ * <th scope="col">W3C XML Schema Data Type</th>
+ * <th scope="col">Java Data Type</th>
* </tr>
* </thead>
*
* <tbody>
* <tr>
- * <td>xs:date</td>
+ * <th scope="row">xs:date</th>
* <td>{@link javax.xml.datatype.XMLGregorianCalendar}</td>
* </tr>
* <tr>
- * <td>xs:dateTime</td>
+ * <th scope="row">xs:dateTime</th>
* <td>{@link javax.xml.datatype.XMLGregorianCalendar}</td>
* </tr>
* <tr>
- * <td>xs:duration</td>
+ * <th scope="row">xs:duration</th>
* <td>{@link javax.xml.datatype.Duration}</td>
* </tr>
* <tr>
- * <td>xs:gDay</td>
+ * <th scope="row">xs:gDay</th>
* <td>{@link javax.xml.datatype.XMLGregorianCalendar}</td>
* </tr>
* <tr>
- * <td>xs:gMonth </td>
+ * <th scope="row">xs:gMonth </th>
* <td>{@link javax.xml.datatype.XMLGregorianCalendar}</td>
* </tr>
* <tr>
- * <td>xs:gMonthDay</td>
+ * <th scope="row">xs:gMonthDay</th>
* <td>{@link javax.xml.datatype.XMLGregorianCalendar}</td>
* </tr>
* <tr>
- * <td>xs:gYear</td>
+ * <th scope="row">xs:gYear</th>
* <td>{@link javax.xml.datatype.XMLGregorianCalendar}</td>
* </tr>
* <tr>
- * <td>xs:gYearMonth</td>
+ * <th scope="row">xs:gYearMonth</th>
* <td>{@link javax.xml.datatype.XMLGregorianCalendar}</td>
* </tr>
* <tr>
- * <td>xs:time</td>
+ * <th scope="row">xs:time</th>
* <td>{@link javax.xml.datatype.XMLGregorianCalendar}</td>
* </tr>
*
@@ -105,18 +105,18 @@
* <caption>XQuery and XPath/Java Type Mappings</caption>
* <thead>
* <tr>
- * <th>XQuery 1.0 and XPath 2.0 Data Model</th>
- * <th>Java Data Type</th>
+ * <th scope="col">XQuery 1.0 and XPath 2.0 Data Model</th>
+ * <th scope="col">Java Data Type</th>
* </tr>
* </thead>
*
* <tbody>
* <tr>
- * <td>xdt:dayTimeDuration</td>
+ * <th scope="row">xdt:dayTimeDuration</th>
* <td>{@link javax.xml.datatype.Duration}</td>
* </tr>
* <tr>
- * <td>xdt:yearMonthDuration</td>
+ * <th scope="row">xdt:yearMonthDuration</th>
* <td>{@link javax.xml.datatype.Duration}</td>
* </tr>
* </tbody>
--- a/jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java Mon Jul 17 09:13:49 2017 -0700
@@ -92,13 +92,13 @@
* <caption>Return value for specified prefixes</caption>
* <thead>
* <tr>
- * <th>prefix parameter</th>
- * <th>Namespace URI return value</th>
+ * <th scope="col">prefix parameter</th>
+ * <th scope="col">Namespace URI return value</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>{@code DEFAULT_NS_PREFIX} ("")</td>
+ * <th scope="row">{@code DEFAULT_NS_PREFIX} ("")</th>
* <td>default Namespace URI in the current scope or
* <code> {@link
* javax.xml.XMLConstants#NULL_NS_URI XMLConstants.NULL_NS_URI("")}
@@ -106,11 +106,11 @@
* when there is no default Namespace URI in the current scope</td>
* </tr>
* <tr>
- * <td>bound prefix</td>
+ * <th scope="row">bound prefix</th>
* <td>Namespace URI bound to prefix in current scope</td>
* </tr>
* <tr>
- * <td>unbound prefix</td>
+ * <th scope="row">unbound prefix</th>
* <td>
* <code> {@link
* javax.xml.XMLConstants#NULL_NS_URI XMLConstants.NULL_NS_URI("")}
@@ -118,17 +118,17 @@
* </td>
* </tr>
* <tr>
- * <td>{@code XMLConstants.XML_NS_PREFIX} ("xml")</td>
+ * <th scope="row">{@code XMLConstants.XML_NS_PREFIX} ("xml")</th>
* <td>{@code XMLConstants.XML_NS_URI}
* ("http://www.w3.org/XML/1998/namespace")</td>
* </tr>
* <tr>
- * <td>{@code XMLConstants.XMLNS_ATTRIBUTE} ("xmlns")</td>
+ * <th scope="row">{@code XMLConstants.XMLNS_ATTRIBUTE} ("xmlns")</th>
* <td>{@code XMLConstants.XMLNS_ATTRIBUTE_NS_URI}
* ("http://www.w3.org/2000/xmlns/")</td>
* </tr>
* <tr>
- * <td>{@code null}</td>
+ * <th scope="row">{@code null}</th>
* <td>{@code IllegalArgumentException} is thrown</td>
* </tr>
* </tbody>
@@ -157,39 +157,39 @@
* <caption>Return value for specified Namespace URIs</caption>
* <thead>
* <tr>
- * <th>Namespace URI parameter</th>
- * <th>prefix value returned</th>
+ * <th scope="col">Namespace URI parameter</th>
+ * <th scope="col">prefix value returned</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>{@code <default Namespace URI>}</td>
+ * <th scope="row">{@code <default Namespace URI>}</th>
* <td>{@code XMLConstants.DEFAULT_NS_PREFIX} ("")
* </td>
* </tr>
* <tr>
- * <td>bound Namespace URI</td>
+ * <th scope="row">bound Namespace URI</th>
* <td>prefix bound to Namespace URI in the current scope,
* if multiple prefixes are bound to the Namespace URI in
* the current scope, a single arbitrary prefix, whose
* choice is implementation dependent, is returned</td>
* </tr>
* <tr>
- * <td>unbound Namespace URI</td>
+ * <th scope="row">unbound Namespace URI</th>
* <td>{@code null}</td>
* </tr>
* <tr>
- * <td>{@code XMLConstants.XML_NS_URI}
- * ("http://www.w3.org/XML/1998/namespace")</td>
+ * <th scope="row">{@code XMLConstants.XML_NS_URI}
+ * ("http://www.w3.org/XML/1998/namespace")</th>
* <td>{@code XMLConstants.XML_NS_PREFIX} ("xml")</td>
* </tr>
* <tr>
- * <td>{@code XMLConstants.XMLNS_ATTRIBUTE_NS_URI}
- * ("http://www.w3.org/2000/xmlns/")</td>
+ * <th scope="row">{@code XMLConstants.XMLNS_ATTRIBUTE_NS_URI}
+ * ("http://www.w3.org/2000/xmlns/")</th>
* <td>{@code XMLConstants.XMLNS_ATTRIBUTE} ("xmlns")</td>
* </tr>
* <tr>
- * <td>{@code null}</td>
+ * <th scope="row">{@code null}</th>
* <td>{@code IllegalArgumentException} is thrown</td>
* </tr>
* </tbody>
@@ -224,14 +224,14 @@
* <caption>Return value for specified Namespace URIs</caption>
* <thead>
* <tr>
- * <th>Namespace URI parameter</th>
- * <th>prefixes value returned</th>
+ * <th scope="col">Namespace URI parameter</th>
+ * <th scope="col">prefixes value returned</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>bound Namespace URI,
- * including the {@code <default Namespace URI>}</td>
+ * <th scope="row">bound Namespace URI,
+ * including the {@code <default Namespace URI>}</th>
* <td>
* {@code Iterator} over prefixes bound to Namespace URI in
* the current scope in an arbitrary,
@@ -240,23 +240,23 @@
* </td>
* </tr>
* <tr>
- * <td>unbound Namespace URI</td>
+ * <th scope="row">unbound Namespace URI</th>
* <td>empty {@code Iterator}</td>
* </tr>
* <tr>
- * <td>{@code XMLConstants.XML_NS_URI}
- * ("http://www.w3.org/XML/1998/namespace")</td>
+ * <th scope="row">{@code XMLConstants.XML_NS_URI}
+ * ("http://www.w3.org/XML/1998/namespace")</th>
* <td>{@code Iterator} with one element set to
* {@code XMLConstants.XML_NS_PREFIX} ("xml")</td>
* </tr>
* <tr>
- * <td>{@code XMLConstants.XMLNS_ATTRIBUTE_NS_URI}
- * ("http://www.w3.org/2000/xmlns/")</td>
+ * <th scope="row">{@code XMLConstants.XMLNS_ATTRIBUTE_NS_URI}
+ * ("http://www.w3.org/2000/xmlns/")</th>
* <td>{@code Iterator} with one element set to
* {@code XMLConstants.XMLNS_ATTRIBUTE} ("xmlns")</td>
* </tr>
* <tr>
- * <td>{@code null}</td>
+ * <th scope="row">{@code null}</th>
* <td>{@code IllegalArgumentException} is thrown</td>
* </tr>
* </tbody>
--- a/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -190,7 +190,7 @@
if (!type.isAssignableFrom(providerClass)) {
throw new ClassCastException(className + " cannot be cast to " + type.getName());
}
- Object instance = providerClass.newInstance();
+ Object instance = providerClass.getConstructor().newInstance();
final ClassLoader clD = cl;
dPrint(()->"created new instance of " + providerClass +
" using ClassLoader: " + clD);
--- a/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -77,6 +77,7 @@
* @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
* @since 1.4
*/
+@SuppressWarnings("deprecation")
public abstract class SAXParser {
/**
--- a/jaxp/src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/parsers/SecuritySupport.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -83,7 +83,7 @@
return ((Boolean)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- return new Boolean(f.exists());
+ return f.exists();
}
})).booleanValue();
}
--- a/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java Mon Jul 17 09:13:49 2017 -0700
@@ -191,7 +191,7 @@
if (!type.isAssignableFrom(providerClass)) {
throw new ClassCastException(className + " cannot be cast to " + type.getName());
}
- Object instance = providerClass.newInstance();
+ Object instance = providerClass.getConstructor().newInstance();
final ClassLoader clD = cl;
dPrint(()->"created new instance of " + providerClass +
" using ClassLoader: " + clD);
--- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java Mon Jul 17 09:13:49 2017 -0700
@@ -68,15 +68,15 @@
* <caption>Required and optional fields for events added to the writer</caption>
* <thead>
* <tr>
- * <th>Event Type</th>
- * <th>Required Fields</th>
- * <th>Optional Fields</th>
- * <th>Required Behavior</th>
+ * <th scope="col">Event Type</th>
+ * <th scope="col">Required Fields</th>
+ * <th scope="col">Optional Fields</th>
+ * <th scope="col">Required Behavior</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td> START_ELEMENT </td>
+ * <th scope="row"> START_ELEMENT </th>
* <td> QName name </td>
* <td> namespaces , attributes </td>
* <td> A START_ELEMENT will be written by writing the name,
@@ -96,7 +96,7 @@
* </td>
* </tr>
* <tr>
- * <td> END_ELEMENT </td>
+ * <th scope="row"> END_ELEMENT </th>
* <td> Qname name </td>
* <td> None </td>
* <td> A well formed END_ELEMENT tag is written.
@@ -111,7 +111,7 @@
* </td>
* </tr>
* <tr>
- * <td> ATTRIBUTE </td>
+ * <th scope="row"> ATTRIBUTE </th>
* <td> QName name , String value </td>
* <td> QName type </td>
* <td> An attribute is written using the same algorithm
@@ -122,7 +122,7 @@
* </td>
* </tr>
* <tr>
- * <td> NAMESPACE </td>
+ * <th scope="row"> NAMESPACE </th>
* <td> String prefix, String namespaceURI,
* boolean isDefaultNamespaceDeclaration
* </td>
@@ -137,7 +137,7 @@
* </td>
* </tr>
* <tr>
- * <td> PROCESSING_INSTRUCTION </td>
+ * <th scope="row"> PROCESSING_INSTRUCTION </th>
* <td> None</td>
* <td> String target, String data</td>
* <td> The data does not need to be present and may be
@@ -149,7 +149,7 @@
* </td>
* </tr>
* <tr>
- * <td> COMMENT </td>
+ * <th scope="row"> COMMENT </th>
* <td> None </td>
* <td> String comment </td>
* <td> If the comment is present (not null) it is written, otherwise an
@@ -157,7 +157,7 @@
* </td>
* </tr>
* <tr>
- * <td> START_DOCUMENT </td>
+ * <th scope="row"> START_DOCUMENT </th>
* <td> None </td>
* <td> String encoding , boolean standalone, String version </td>
* <td> A START_DOCUMENT event is not required to be written to the
@@ -166,13 +166,13 @@
* </td>
* </tr>
* <tr>
- * <td> END_DOCUMENT </td>
+ * <th scope="row"> END_DOCUMENT </th>
* <td> None </td>
* <td> None </td>
* <td> Nothing is written to the output </td>
* </tr>
* <tr>
- * <td> DTD </td>
+ * <th scope="row"> DTD </th>
* <td> String DocumentTypeDefinition </td>
* <td> None </td>
* <td> The DocumentTypeDefinition is written to the output </td>
--- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -40,23 +40,23 @@
* <caption>Configuration Parameters</caption>
* <thead>
* <tr>
- * <th>Property Name</th>
- * <th>Behavior</th>
- * <th>Return type</th>
- * <th>Default Value</th>
- * <th>Required</th>
+ * <th scope="col">Property Name</th>
+ * <th scope="col">Behavior</th>
+ * <th scope="col">Return type</th>
+ * <th scope="col">Default Value</th>
+ * <th scope="col">Required</th>
* </tr>
* </thead>
* <tbody>
- * <tr><td>javax.xml.stream.isValidating</td><td>Turns on/off implementation specific DTD validation</td><td>Boolean</td><td>False</td><td>No</td></tr>
- * <tr><td>javax.xml.stream.isNamespaceAware</td><td>Turns on/off namespace processing for XML 1.0 support</td><td>Boolean</td><td>True</td><td>True (required) / False (optional)</td></tr>
- * <tr><td>javax.xml.stream.isCoalescing</td><td>Requires the processor to coalesce adjacent character data</td><td>Boolean</td><td>False</td><td>Yes</td></tr>
- * <tr><td>javax.xml.stream.isReplacingEntityReferences</td><td>replace internal entity references with their replacement text and report them as characters</td><td>Boolean</td><td>True</td><td>Yes</td></tr>
- *<tr><td>javax.xml.stream.isSupportingExternalEntities</td><td>Resolve external parsed entities</td><td>Boolean</td><td>Unspecified</td><td>Yes</td></tr>
- *<tr><td>javax.xml.stream.supportDTD</td><td>Use this property to request processors that do not support DTDs</td><td>Boolean</td><td>True</td><td>Yes</td></tr>
- *<tr><td>javax.xml.stream.reporter</td><td>sets/gets the impl of the XMLReporter </td><td>javax.xml.stream.XMLReporter</td><td>Null</td><td>Yes</td></tr>
- *<tr><td>javax.xml.stream.resolver</td><td>sets/gets the impl of the XMLResolver interface</td><td>javax.xml.stream.XMLResolver</td><td>Null</td><td>Yes</td></tr>
- *<tr><td>javax.xml.stream.allocator</td><td>sets/gets the impl of the XMLEventAllocator interface</td><td>javax.xml.stream.util.XMLEventAllocator</td><td>Null</td><td>Yes</td></tr>
+ * <tr><th scope="row">javax.xml.stream.isValidating</th><td>Turns on/off implementation specific DTD validation</td><td>Boolean</td><td>False</td><td>No</td></tr>
+ * <tr><th scope="row">javax.xml.stream.isNamespaceAware</th><td>Turns on/off namespace processing for XML 1.0 support</td><td>Boolean</td><td>True</td><td>True (required) / False (optional)</td></tr>
+ * <tr><th scope="row">javax.xml.stream.isCoalescing</th><td>Requires the processor to coalesce adjacent character data</td><td>Boolean</td><td>False</td><td>Yes</td></tr>
+ * <tr><th scope="row">javax.xml.stream.isReplacingEntityReferences</th><td>replace internal entity references with their replacement text and report them as characters</td><td>Boolean</td><td>True</td><td>Yes</td></tr>
+ *<tr><th scope="row">javax.xml.stream.isSupportingExternalEntities</th><td>Resolve external parsed entities</td><td>Boolean</td><td>Unspecified</td><td>Yes</td></tr>
+ *<tr><th scope="row">javax.xml.stream.supportDTD</th><td>Use this property to request processors that do not support DTDs</td><td>Boolean</td><td>True</td><td>Yes</td></tr>
+ *<tr><th scope="row">javax.xml.stream.reporter</th><td>sets/gets the impl of the XMLReporter </td><td>javax.xml.stream.XMLReporter</td><td>Null</td><td>Yes</td></tr>
+ *<tr><th scope="row">javax.xml.stream.resolver</th><td>sets/gets the impl of the XMLResolver interface</td><td>javax.xml.stream.XMLResolver</td><td>Null</td><td>Yes</td></tr>
+ *<tr><th scope="row">javax.xml.stream.allocator</th><td>sets/gets the impl of the XMLEventAllocator interface</td><td>javax.xml.stream.util.XMLEventAllocator</td><td>Null</td><td>Yes</td></tr>
* </tbody>
* </table>
*
--- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -40,15 +40,15 @@
* <caption>Configuration Parameters</caption>
* <thead>
* <tr>
- * <th>Property Name</th>
- * <th>Behavior</th>
- * <th>Return type</th>
- * <th>Default Value</th>
- * <th>Required</th>
+ * <th scope="col">Property Name</th>
+ * <th scope="col">Behavior</th>
+ * <th scope="col">Return type</th>
+ * <th scope="col">Default Value</th>
+ * <th scope="col">Required</th>
* </tr>
* </thead>
* <tbody>
- * <tr><td>javax.xml.stream.isRepairingNamespaces</td><td>defaults prefixes
+ * <tr><th scope="row">javax.xml.stream.isRepairingNamespaces</th><td>defaults prefixes
* on the output side</td><td>Boolean</td><td>False</td><td>Yes</td></tr>
* </tbody>
* </table>
--- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java Mon Jul 17 09:13:49 2017 -0700
@@ -75,13 +75,13 @@
* <caption>Valid methods for each state</caption>
* <thead>
* <tr>
- * <th>Event Type</th>
- * <th>Valid Methods</th>
+ * <th scope="col">Event Type</th>
+ * <th scope="col">Valid Methods</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td> All States </td>
+ * <th scope="row"> All States </th>
* <td> getProperty(), hasNext(), require(), close(),
* getNamespaceURI(), isStartElement(),
* isEndElement(), isCharacters(), isWhiteSpace(),
@@ -90,7 +90,7 @@
* </td>
* </tr>
* <tr>
- * <td> START_ELEMENT </td>
+ * <th scope="row"> START_ELEMENT </th>
* <td> next(), getName(), getLocalName(), hasName(), getPrefix(),
* getAttributeXXX(), isAttributeSpecified(),
* getNamespaceXXX(),
@@ -98,58 +98,58 @@
* </td>
* </tr>
* <tr>
- * <td> ATTRIBUTE </td>
+ * <th scope="row"> ATTRIBUTE </th>
* <td> next(), nextTag()
* getAttributeXXX(), isAttributeSpecified(),
* </td>
* </tr>
* <tr>
- * <td> NAMESPACE </td>
+ * <th scope="row"> NAMESPACE </th>
* <td> next(), nextTag()
* getNamespaceXXX()
* </td>
* </tr>
* <tr>
- * <td> END_ELEMENT </td>
+ * <th scope="row"> END_ELEMENT </th>
* <td> next(), getName(), getLocalName(), hasName(), getPrefix(),
* getNamespaceXXX(), nextTag()
* </td>
* </tr>
* <tr>
- * <td> CHARACTERS </td>
+ * <th scope="row"> CHARACTERS </th>
* <td> next(), getTextXXX(), nextTag() </td>
* </tr>
* <tr>
- * <td> CDATA </td>
+ * <th scope="row"> CDATA </th>
* <td> next(), getTextXXX(), nextTag() </td>
* </tr>
* <tr>
- * <td> COMMENT </td>
+ * <th scope="row"> COMMENT </th>
* <td> next(), getTextXXX(), nextTag() </td>
* </tr>
* <tr>
- * <td> SPACE </td>
+ * <th scope="row"> SPACE </th>
* <td> next(), getTextXXX(), nextTag() </td>
* </tr>
* <tr>
- * <td> START_DOCUMENT </td>
+ * <th scope="row"> START_DOCUMENT </th>
* <td> next(), getEncoding(), getVersion(), isStandalone(), standaloneSet(),
* getCharacterEncodingScheme(), nextTag()</td>
* </tr>
* <tr>
- * <td> END_DOCUMENT </td>
+ * <th scope="row"> END_DOCUMENT </th>
* <td> close()</td>
* </tr>
* <tr>
- * <td> PROCESSING_INSTRUCTION </td>
+ * <th scope="row"> PROCESSING_INSTRUCTION </th>
* <td> next(), getPITarget(), getPIData(), nextTag() </td>
* </tr>
* <tr>
- * <td> ENTITY_REFERENCE </td>
+ * <th scope="row"> ENTITY_REFERENCE </th>
* <td> next(), getLocalName(), getText(), nextTag() </td>
* </tr>
* <tr>
- * <td> DTD </td>
+ * <th scope="row"> DTD </th>
* <td> next(), getText(), nextTag() </td>
* </tr>
* </tbody>
--- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java Mon Jul 17 09:13:49 2017 -0700
@@ -42,22 +42,22 @@
* <caption>XML Namespaces, {@code javax.xml.stream.isRepairingNamespaces} and write method behaviour</caption>
* <thead>
* <tr style="border-bottom: 1px solid black">
- * <th>Method</th> <!-- method -->
- * <th colspan="2">{@code isRepairingNamespaces} == true</th>
- * <th colspan="2">{@code isRepairingNamespaces} == false</th>
+ * <th scope="col" rowspan="2">Method</th> <!-- method -->
+ * <th scope="col" colspan="2">{@code isRepairingNamespaces} == true</th>
+ * <th scope="col" colspan="2">{@code isRepairingNamespaces} == false</th>
* </tr>
* <tr>
- * <th></th> <!-- method -->
- * <th>namespaceURI bound</th>
- * <th>namespaceURI unbound</th>
- * <th>namespaceURI bound</th>
- * <th>namespaceURI unbound</th>
+ * <!-- method -->
+ * <th scope="col">namespaceURI bound</th>
+ * <th scope="col">namespaceURI unbound</th>
+ * <th scope="col">namespaceURI bound</th>
+ * <th scope="col">namespaceURI unbound</th>
* </tr>
* </thead>
*
* <tbody>
* <tr>
- * <th>{@code writeAttribute(namespaceURI, localName, value)}</th>
+ * <th scope="row">{@code writeAttribute(namespaceURI, localName, value)}</th>
* <!-- isRepairingNamespaces == true -->
* <td>
* <!-- namespaceURI bound -->
@@ -79,7 +79,7 @@
* </tr>
*
* <tr>
- * <th>{@code writeAttribute(prefix, namespaceURI, localName, value)}</th>
+ * <th scope="row">{@code writeAttribute(prefix, namespaceURI, localName, value)}</th>
* <!-- isRepairingNamespaces == true -->
* <td>
* <!-- namespaceURI bound -->
@@ -109,11 +109,11 @@
* </tr>
*
* <tr>
- * <th>{@code writeStartElement(namespaceURI, localName)}<br>
+ * <th scope="row">{@code writeStartElement(namespaceURI, localName)}<br>
* <br>
* {@code writeEmptyElement(namespaceURI, localName)}</th>
* <!-- isRepairingNamespaces == true -->
- * <td >
+ * <td>
* <!-- namespaceURI bound -->
* {@code <prefix:localName>} <sup>[1]</sup>
* </td>
@@ -133,7 +133,7 @@
* </tr>
*
* <tr>
- * <th>{@code writeStartElement(prefix, localName, namespaceURI)}<br>
+ * <th scope="row">{@code writeStartElement(prefix, localName, namespaceURI)}<br>
* <br>
* {@code writeEmptyElement(prefix, localName, namespaceURI)}</th>
* <!-- isRepairingNamespaces == true -->
@@ -164,25 +164,20 @@
* </td>
* </tr>
* </tbody>
- * <tfoot>
- * <tr>
- * <td colspan="5">
- * Notes:
- * <ul>
- * <li>[1] if namespaceURI == default Namespace URI, then no prefix is written</li>
- * <li>[2] if prefix == "" || null {@literal &&} namespaceURI == "", then
- * no prefix or Namespace declaration is generated or written</li>
- * <li>[3] if prefix == "" || null, then a prefix is randomly generated</li>
- * <li>[4] if prefix == "" || null, then it is treated as the default Namespace and
- * no prefix is generated or written, an xmlns declaration is generated
- * and written if the namespaceURI is unbound</li>
- * <li>[5] if prefix == "" || null, then it is treated as an invalid attempt to
- * define the default Namespace and an XMLStreamException is thrown</li>
- * </ul>
- * </td>
- * </tr>
- * </tfoot>
* </table>
+
+ * Notes:
+ * <ul>
+ * <li>[1] if namespaceURI == default Namespace URI, then no prefix is written</li>
+ * <li>[2] if prefix == "" || null {@literal &&} namespaceURI == "", then
+ * no prefix or Namespace declaration is generated or written</li>
+ * <li>[3] if prefix == "" || null, then a prefix is randomly generated</li>
+ * <li>[4] if prefix == "" || null, then it is treated as the default Namespace and
+ * no prefix is generated or written, an xmlns declaration is generated
+ * and written if the namespaceURI is unbound</li>
+ * <li>[5] if prefix == "" || null, then it is treated as an invalid attempt to
+ * define the default Namespace and an XMLStreamException is thrown</li>
+ * </ul>
*
* @version 1.0
* @author Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
--- a/jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -176,7 +176,7 @@
instance = newInstanceNoServiceLoader(type, providerClass);
}
if (instance == null) {
- instance = providerClass.newInstance();
+ instance = providerClass.getConstructor().newInstance();
}
final ClassLoader clD = cl;
dPrint(()->"created new instance of " + providerClass +
--- a/jaxp/src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/transform/SecuritySupport.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -81,7 +81,7 @@
return ((Boolean)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
- return new Boolean(f.exists());
+ return f.exists();
}
})).booleanValue();
}
--- a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -88,17 +88,17 @@
* <caption>URIs for Supported Schema languages</caption>
* <thead>
* <tr>
- * <th>value</th>
- * <th>language</th>
+ * <th scope="col">value</th>
+ * <th scope="col">language</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>{@link javax.xml.XMLConstants#W3C_XML_SCHEMA_NS_URI} ("{@code http://www.w3.org/2001/XMLSchema}")</td>
+ * <th scope="row">{@link javax.xml.XMLConstants#W3C_XML_SCHEMA_NS_URI} ("{@code http://www.w3.org/2001/XMLSchema}")</th>
* <td><a href="http://www.w3.org/TR/xmlschema-1">W3C XML Schema 1.0</a></td>
* </tr>
* <tr>
- * <td>{@link javax.xml.XMLConstants#RELAXNG_NS_URI} ("{@code http://relaxng.org/ns/structure/1.0}")</td>
+ * <th scope="row">{@link javax.xml.XMLConstants#RELAXNG_NS_URI} ("{@code http://relaxng.org/ns/structure/1.0}")</th>
* <td><a href="http://www.relaxng.org/">RELAX NG 1.0</a></td>
* </tr>
* </tbody>
--- a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -26,6 +26,7 @@
package javax.xml.validation;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.security.AccessControlContext;
@@ -286,41 +287,31 @@
// get Class from className
Class<?> clazz = createClass(className);
if (clazz == null) {
- debugPrintln(()->"failed to getClass(" + className + ")");
- return null;
+ debugPrintln(()->"failed to getClass(" + className + ")");
+ return null;
}
debugPrintln(()->"loaded " + className + " from " + which(clazz));
// instantiate Class as a SchemaFactory
try {
- if (!SchemaFactory.class.isAssignableFrom(clazz)) {
- throw new ClassCastException(clazz.getName()
- + " cannot be cast to " + SchemaFactory.class);
- }
- if (!useServicesMechanism) {
- schemaFactory = newInstanceNoServiceLoader(clazz);
- }
- if (schemaFactory == null) {
- schemaFactory = (SchemaFactory) clazz.newInstance();
- }
- } catch (ClassCastException classCastException) {
- debugPrintln(()->"could not instantiate " + clazz.getName());
- if (debug) {
- classCastException.printStackTrace();
- }
- return null;
- } catch (IllegalAccessException illegalAccessException) {
- debugPrintln(()->"could not instantiate " + clazz.getName());
- if (debug) {
- illegalAccessException.printStackTrace();
- }
- return null;
- } catch (InstantiationException instantiationException) {
- debugPrintln(()->"could not instantiate " + clazz.getName());
- if (debug) {
- instantiationException.printStackTrace();
- }
- return null;
+ if (!SchemaFactory.class.isAssignableFrom(clazz)) {
+ throw new ClassCastException(clazz.getName()
+ + " cannot be cast to " + SchemaFactory.class);
+ }
+ if (!useServicesMechanism) {
+ schemaFactory = newInstanceNoServiceLoader(clazz);
+ }
+ if (schemaFactory == null) {
+ schemaFactory = (SchemaFactory) clazz.getConstructor().newInstance();
+ }
+ } catch (ClassCastException | IllegalAccessException | IllegalArgumentException |
+ InstantiationException | InvocationTargetException | NoSuchMethodException |
+ SecurityException ex) {
+ debugPrintln(()->"could not instantiate " + clazz.getName());
+ if (debug) {
+ ex.printStackTrace();
+ }
+ return null;
}
return schemaFactory;
--- a/jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java Mon Jul 17 09:13:49 2017 -0700
@@ -135,44 +135,44 @@
* <caption>{@code Source} / {@code Result} Accepted</caption>
* <thead>
* <tr>
- * <th></th>
- * <th>{@link javax.xml.transform.stream.StreamSource}</th>
- * <th>{@link javax.xml.transform.sax.SAXSource}</th>
- * <th>{@link javax.xml.transform.dom.DOMSource}</th>
- * <th>{@link javax.xml.transform.stax.StAXSource}</th>
+ * <td></td>>
+ * <th scope="col">{@link javax.xml.transform.stream.StreamSource}</th>
+ * <th scope="col">{@link javax.xml.transform.sax.SAXSource}</th>
+ * <th scope="col">{@link javax.xml.transform.dom.DOMSource}</th>
+ * <th scope="col">{@link javax.xml.transform.stax.StAXSource}</th>
* </tr>
* </thead>
* <tbody style="text-align:center">
* <tr>
- * <td>{@code null}</td>
+ * <th scope="row">{@code null}</th>
* <td>OK</td>
* <td>OK</td>
* <td>OK</td>
* <td>OK</td>
* </tr>
* <tr>
- * <th>{@link javax.xml.transform.stream.StreamResult}</th>
+ * <th scope="row">{@link javax.xml.transform.stream.StreamResult}</th>
* <td>OK</td>
* <td>{@code IllegalArgumentException}</td>
* <td>{@code IllegalArgumentException}</td>
* <td>{@code IllegalArgumentException}</td>
* </tr>
* <tr>
- * <th>{@link javax.xml.transform.sax.SAXResult}</th>
+ * <th scope="row">{@link javax.xml.transform.sax.SAXResult}</th>
* <td>{@code IllegalArgumentException}</td>
* <td>OK</td>
* <td>{@code IllegalArgumentException}</td>
* <td>{@code IllegalArgumentException}</td>
* </tr>
* <tr>
- * <th>{@link javax.xml.transform.dom.DOMResult}</th>
+ * <th scope="row">{@link javax.xml.transform.dom.DOMResult}</th>
* <td>{@code IllegalArgumentException}</td>
* <td>{@code IllegalArgumentException}</td>
* <td>OK</td>
* <td>{@code IllegalArgumentException}</td>
* </tr>
* <tr>
- * <th>{@link javax.xml.transform.stax.StAXResult}</th>
+ * <th scope="row">{@link javax.xml.transform.stax.StAXResult}</th>
* <td>{@code IllegalArgumentException}</td>
* <td>{@code IllegalArgumentException}</td>
* <td>{@code IllegalArgumentException}</td>
--- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java Mon Jul 17 09:13:49 2017 -0700
@@ -38,13 +38,13 @@
* <caption>Evaluation of XPath Expressions</caption>
* <thead>
* <tr>
- * <th>Factor</th>
- * <th>Behavior</th>
+ * <th scope="col">Factor</th>
+ * <th scope="col">Behavior</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>context</td>
+ * <th scope="row">context</th>
* <td>
* The type of the context is implementation-dependent. If the value is
* null, the operation must have no dependency on the context, otherwise
@@ -55,7 +55,7 @@
* </td>
* </tr>
* <tr>
- * <td>variables</td>
+ * <th scope="row">variables</th>
* <td>
* If the expression contains a variable reference, its value will be found through the {@link XPathVariableResolver}
* set with {@link #setXPathVariableResolver(XPathVariableResolver resolver)}.
@@ -65,7 +65,7 @@
* </td>
* </tr>
* <tr>
- * <td>functions</td>
+ * <th scope="row">functions</th>
* <td>
* If the expression contains a function reference, the function will be found through the {@link XPathFunctionResolver}
* set with {@link #setXPathFunctionResolver(XPathFunctionResolver resolver)}.
@@ -74,14 +74,14 @@
* </td>
* </tr>
* <tr>
- * <td>QNames</td>
+ * <th scope="row">QNames</th>
* <td>
* QNames in the expression are resolved against the XPath namespace context
* set with {@link #setNamespaceContext(NamespaceContext nsContext)}.
* </td>
* </tr>
* <tr>
- * <td>result</td>
+ * <th scope="row">result</th>
* <td>
* This result of evaluating an expression is converted to an instance of the desired return type.
* Valid return types are defined in {@link XPathConstants}.
--- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java Mon Jul 17 09:13:49 2017 -0700
@@ -37,13 +37,13 @@
* <caption>Evaluation of XPath Expressions</caption>
* <thead>
* <tr>
- * <th>Factor</th>
- * <th>Behavior</th>
+ * <th scope="col">Factor</th>
+ * <th scope="col">Behavior</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>context</td>
+ * <th scope="row">context</th>
* <td>
* The type of the context is implementation-dependent. If the value is
* null, the operation must have no dependency on the context, otherwise
@@ -54,7 +54,7 @@
* </td>
* </tr>
* <tr>
- * <td>variables</td>
+ * <th scope="row">variables</th>
* <td>
* If the expression contains a variable reference, its value will be found through the {@link XPathVariableResolver}.
* An {@link XPathExpressionException} is raised if the variable resolver is undefined or
@@ -63,7 +63,7 @@
* </td>
* </tr>
* <tr>
- * <td>functions</td>
+ * <th scope="row">functions</th>
* <td>
* If the expression contains a function reference, the function will be found through the {@link XPathFunctionResolver}.
* An {@link XPathExpressionException} is raised if the function resolver is undefined or
@@ -71,13 +71,13 @@
* </td>
* </tr>
* <tr>
- * <td>QNames</td>
+ * <th scope="row">QNames</th>
* <td>
* QNames in the expression are resolved against the XPath namespace context.
* </td>
* </tr>
* <tr>
- * <td>result</td>
+ * <th scope="row">result</th>
* <td>
* This result of evaluating an expression is converted to an instance of the desired return type.
* Valid return types are defined in {@link XPathConstants}.
--- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,6 +26,7 @@
package javax.xml.xpath;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.security.AccessControlContext;
@@ -297,26 +298,16 @@
xPathFactory = newInstanceNoServiceLoader(clazz);
}
if (xPathFactory == null) {
- xPathFactory = (XPathFactory) clazz.newInstance();
+ xPathFactory = (XPathFactory) clazz.getConstructor().newInstance();
}
- } catch (ClassCastException classCastException) {
- debugPrintln(()->"could not instantiate " + clazz.getName());
- if (debug) {
- classCastException.printStackTrace();
- }
- return null;
- } catch (IllegalAccessException illegalAccessException) {
- debugPrintln(()->"could not instantiate " + clazz.getName());
- if (debug) {
- illegalAccessException.printStackTrace();
- }
- return null;
- } catch (InstantiationException instantiationException) {
- debugPrintln(()->"could not instantiate " + clazz.getName());
- if (debug) {
- instantiationException.printStackTrace();
- }
- return null;
+ } catch (ClassCastException | IllegalAccessException | IllegalArgumentException |
+ InstantiationException | InvocationTargetException | NoSuchMethodException |
+ SecurityException ex) {
+ debugPrintln(()->"could not instantiate " + clazz.getName());
+ if (debug) {
+ ex.printStackTrace();
+ }
+ return null;
}
return xPathFactory;
--- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/package-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/package-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -148,37 +148,37 @@
* <caption>Examples of Location Path</caption>
* <thead>
* <tr>
- * <th>Location Path</th>
- * <th>Description</th>
+ * <th scope="col">Location Path</th>
+ * <th scope="col">Description</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>
+ * <th scope="row">
* <code>/foo/bar/<strong>@id</strong></code>
- * </td>
+ * </th>
* <td>
* Selects the attribute <code>id</code> of the <code><bar></code> element
* </td>
* </tr>
* <tr>
- * <td><code>/foo/bar/<strong>text()</strong></code>
- * </td>
+ * <th scope="row"><code>/foo/bar/<strong>text()</strong></code>
+ * </th>
* <td>
* Selects the text nodes of the <code><bar></code> element. No
* distinction is made between escaped and non-escaped character data.
* </td>
* </tr>
* <tr>
- * <td><code>/foo/bar/<strong>comment()</strong></code>
- * </td>
+ * <th scope="row"><code>/foo/bar/<strong>comment()</strong></code>
+ * </th>
* <td>
* Selects all comment nodes contained in the <code><bar></code> element.
* </td>
* </tr>
* <tr>
- * <td><code>/foo/bar/<strong>processing-instruction()</strong></code>
- * </td>
+ * <th scope="row"><code>/foo/bar/<strong>processing-instruction()</strong></code>
+ * </th>
* <td>
* Selects all processing-instruction nodes contained in the
* <code><bar></code> element.
--- a/jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java Mon Jul 17 09:13:49 2017 -0700
@@ -115,17 +115,17 @@
* <caption>Examples of the Original, Normalized and Serialized Values </caption>
* <thead>
* <tr>
- * <th>Examples</th>
- * <th>Parsed
+ * <th scope="col">Examples</th>
+ * <th scope="col">Parsed
* attribute value</th>
- * <th>Initial <code>Attr.value</code></th>
- * <th>Serialized attribute value</th>
+ * <th scope="col">Initial <code>Attr.value</code></th>
+ * <th scope="col">Serialized attribute value</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>
- * Character reference</td>
+ * <th scope="row" valign='top' rowspan='1' colspan='1'>
+ * Character reference</th>
* <td valign='top' rowspan='1' colspan='1'>
* <pre>"x&#178;=5"</pre>
* </td>
@@ -137,8 +137,8 @@
* </td>
* </tr>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>Built-in
- * character entity</td>
+ * <th scope="row" valign='top' rowspan='1' colspan='1'>Built-in
+ * character entity</th>
* <td valign='top' rowspan='1' colspan='1'>
* <pre>"y&lt;6"</pre>
* </td>
@@ -150,7 +150,7 @@
* </td>
* </tr>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>Literal newline between</td>
+ * <th scope="row" valign='top' rowspan='1' colspan='1'>Literal newline between</th>
* <td valign='top' rowspan='1' colspan='1'>
* <pre>
* "x=5&#10;y=6"</pre>
@@ -163,7 +163,7 @@
* </td>
* </tr>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>Normalized newline between</td>
+ * <th scope="row" valign='top' rowspan='1' colspan='1'>Normalized newline between</th>
* <td valign='top' rowspan='1' colspan='1'>
* <pre>"x=5
* y=6"</pre>
@@ -176,7 +176,7 @@
* </td>
* </tr>
* <tr>
- * <td valign='top' rowspan='1' colspan='1'>Entity <code>e</code> with literal newline</td>
+ * <th scope="row" valign='top' rowspan='1' colspan='1'>Entity <code>e</code> with literal newline</th>
* <td valign='top' rowspan='1' colspan='1'>
* <pre>
* <!ENTITY e '...&#10;...'> [...]> "x=5&e;y=6"</pre>
--- a/jaxp/src/java.xml/share/classes/org/w3c/dom/Comment.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/Comment.java Mon Jul 17 09:13:49 2017 -0700
@@ -43,8 +43,8 @@
/**
* This interface inherits from <code>CharacterData</code> and represents the
- * content of a comment, i.e., all the characters between the starting '
- * <code><!--</code>' and ending '<code>--></code>'. Note that this is
+ * content of a comment, i.e., all the characters between the starting
+ * '{@code <!--}' and ending '{@code -->}'. Note that this is
* the definition of a comment in XML, and, in practice, HTML, although some
* HTML tools may implement the full SGML comment structure.
* <p> No lexical check is done on the content of a comment and it is
--- a/jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java Mon Jul 17 09:13:49 2017 -0700
@@ -357,34 +357,34 @@
* <caption>Attributes of the {@code Element} object</caption>
* <thead>
* <tr>
- * <th>Attribute</th>
- * <th>Value</th>
+ * <th scope="col">Attribute</th>
+ * <th scope="col">Value</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td><code>Node.nodeName</code></td>
+ * <th scope="row"><code>Node.nodeName</code></th>
* <td>
* <code>qualifiedName</code></td>
* </tr>
* <tr>
- * <td><code>Node.namespaceURI</code></td>
+ * <th scope="row"><code>Node.namespaceURI</code></th>
* <td>
* <code>namespaceURI</code></td>
* </tr>
* <tr>
- * <td><code>Node.prefix</code></td>
+ * <th scope="row"><code>Node.prefix</code></th>
* <td>prefix, extracted
* from <code>qualifiedName</code>, or <code>null</code> if there is
* no prefix</td>
* </tr>
* <tr>
- * <td><code>Node.localName</code></td>
+ * <th scope="row"><code>Node.localName</code></th>
* <td>local name, extracted from
* <code>qualifiedName</code></td>
* </tr>
* <tr>
- * <td><code>Element.tagName</code></td>
+ * <th scope="row"><code>Element.tagName</code></th>
* <td>
* <code>qualifiedName</code></td>
* </tr>
@@ -426,40 +426,40 @@
* <caption>Attributes of the {@code Attr} object </caption>
* <thead>
* <tr>
- * <th>
+ * <th scope="col">
* Attribute</th>
- * <th>Value</th>
+ * <th scope="col">Value</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td><code>Node.nodeName</code></td>
+ * <th scope="row"><code>Node.nodeName</code></th>
* <td>qualifiedName</td>
* </tr>
* <tr>
- * <td>
- * <code>Node.namespaceURI</code></td>
+ * <th scope="row">
+ * <code>Node.namespaceURI</code></th>
* <td><code>namespaceURI</code></td>
* </tr>
* <tr>
- * <td>
- * <code>Node.prefix</code></td>
+ * <th scope="row">
+ * <code>Node.prefix</code></th>
* <td>prefix, extracted from
* <code>qualifiedName</code>, or <code>null</code> if there is no
* prefix</td>
* </tr>
* <tr>
- * <td><code>Node.localName</code></td>
+ * <th scope="row"><code>Node.localName</code></th>
* <td>local name, extracted from
* <code>qualifiedName</code></td>
* </tr>
* <tr>
- * <td><code>Attr.name</code></td>
+ * <th scope="row"><code>Attr.name</code></th>
* <td>
* <code>qualifiedName</code></td>
* </tr>
* <tr>
- * <td><code>Node.nodeValue</code></td>
+ * <th scope="row"><code>Node.nodeValue</code></th>
* <td>the empty
* string</td>
* </tr>
--- a/jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java Mon Jul 17 09:13:49 2017 -0700
@@ -65,23 +65,23 @@
* <caption style="display:none">Interface table</caption>
* <thead>
* <tr>
- * <th>Interface</th>
- * <th>nodeName</th>
- * <th>nodeValue</th>
- * <th>attributes</th>
+ * <th scope="col">Interface</th>
+ * <th scope="col">nodeName</th>
+ * <th scope="col">nodeValue</th>
+ * <th scope="col">attributes</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>
- * <code>Attr</code></td>
+ * <th scope="row">
+ * <code>Attr</code></th>
* <td>same as <code>Attr.name</code></td>
* <td>same as
* <code>Attr.value</code></td>
* <td><code>null</code></td>
* </tr>
* <tr>
- * <td><code>CDATASection</code></td>
+ * <th scope="row"><code>CDATASection</code></th>
* <td>
* <code>"#cdata-section"</code></td>
* <td>same as <code>CharacterData.data</code>, the
@@ -89,7 +89,7 @@
* <td><code>null</code></td>
* </tr>
* <tr>
- * <td><code>Comment</code></td>
+ * <th scope="row"><code>Comment</code></th>
* <td>
* <code>"#comment"</code></td>
* <td>same as <code>CharacterData.data</code>, the
@@ -97,58 +97,58 @@
* <td><code>null</code></td>
* </tr>
* <tr>
- * <td><code>Document</code></td>
+ * <th scope="row"><code>Document</code></th>
* <td>
* <code>"#document"</code></td>
* <td><code>null</code></td>
* <td><code>null</code></td>
* </tr>
* <tr>
- * <td>
- * <code>DocumentFragment</code></td>
+ * <th scope="row">
+ * <code>DocumentFragment</code></th>
* <td><code>"#document-fragment"</code></td>
* <td>
* <code>null</code></td>
* <td><code>null</code></td>
* </tr>
* <tr>
- * <td><code>DocumentType</code></td>
+ * <th scope="row"><code>DocumentType</code></th>
* <td>same as
* <code>DocumentType.name</code></td>
* <td><code>null</code></td>
* <td><code>null</code></td>
* </tr>
* <tr>
- * <td>
- * <code>Element</code></td>
+ * <th scope="row">
+ * <code>Element</code></th>
* <td>same as <code>Element.tagName</code></td>
* <td><code>null</code></td>
* <td>
* <code>NamedNodeMap</code></td>
* </tr>
* <tr>
- * <td><code>Entity</code></td>
+ * <th scope="row"><code>Entity</code></th>
* <td>entity name</td>
* <td><code>null</code></td>
* <td>
* <code>null</code></td>
* </tr>
* <tr>
- * <td><code>EntityReference</code></td>
+ * <th scope="row"><code>EntityReference</code></th>
* <td>name of entity referenced</td>
* <td>
* <code>null</code></td>
* <td><code>null</code></td>
* </tr>
* <tr>
- * <td><code>Notation</code></td>
+ * <th scope="row"><code>Notation</code></th>
* <td>notation name</td>
* <td>
* <code>null</code></td>
* <td><code>null</code></td>
* </tr>
* <tr>
- * <td><code>ProcessingInstruction</code></td>
+ * <th scope="row"><code>ProcessingInstruction</code></th>
* <td>same
* as <code>ProcessingInstruction.target</code></td>
* <td>same as
@@ -156,7 +156,7 @@
* <td><code>null</code></td>
* </tr>
* <tr>
- * <td><code>Text</code></td>
+ * <th scope="row"><code>Text</code></th>
* <td>
* <code>"#text"</code></td>
* <td>same as <code>CharacterData.data</code>, the content
@@ -696,28 +696,28 @@
* <caption style="display:none">Node/Content table</caption>
* <thead>
* <tr>
- * <th>Node type</th>
- * <th>Content</th>
+ * <th scope="col">Node type</th>
+ * <th scope="col">Content</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>
+ * <th scope="row">
* ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE,
- * DOCUMENT_FRAGMENT_NODE</td>
+ * DOCUMENT_FRAGMENT_NODE</th>
* <td>concatenation of the <code>textContent</code>
* attribute value of every child node, excluding COMMENT_NODE and
* PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the
* node has no children.</td>
* </tr>
* <tr>
- * <td>TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE,
- * PROCESSING_INSTRUCTION_NODE</td>
+ * <th scope="row">TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE,
+ * PROCESSING_INSTRUCTION_NODE</th>
* <td><code>nodeValue</code></td>
* </tr>
* <tr>
- * <td>DOCUMENT_NODE,
- * DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
+ * <th scope="row">DOCUMENT_NODE,
+ * DOCUMENT_TYPE_NODE, NOTATION_NODE</th>
* <td><em>null</em></td>
* </tr>
* </tbody>
@@ -751,28 +751,28 @@
* <caption style="display:none">Node/Content table</caption>
* <thead>
* <tr>
- * <th>Node type</th>
- * <th>Content</th>
+ * <th scope="col">Node type</th>
+ * <th scope="col">Content</th>
* </tr>
* </thead>
* <tbody>
* <tr>
- * <td>
+ * <th scope="row">
* ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE,
- * DOCUMENT_FRAGMENT_NODE</td>
+ * DOCUMENT_FRAGMENT_NODE</th>
* <td>concatenation of the <code>textContent</code>
* attribute value of every child node, excluding COMMENT_NODE and
* PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the
* node has no children.</td>
* </tr>
* <tr>
- * <td>TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE,
- * PROCESSING_INSTRUCTION_NODE</td>
+ * <th scope="row">TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE,
+ * PROCESSING_INSTRUCTION_NODE</th>
* <td><code>nodeValue</code></td>
* </tr>
* <tr>
- * <td>DOCUMENT_NODE,
- * DOCUMENT_TYPE_NODE, NOTATION_NODE</td>
+ * <th scope="row">DOCUMENT_NODE,
+ * DOCUMENT_TYPE_NODE, NOTATION_NODE</th>
* <td><em>null</em></td>
* </tr>
* </tbody>
--- a/jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java Mon Jul 17 09:13:49 2017 -0700
@@ -50,6 +50,7 @@
import java.io.InputStream;
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -183,9 +184,13 @@
} else {
sourceClass = Class.forName(sourceName);
}
- DOMImplementationSource source =
- (DOMImplementationSource) sourceClass.newInstance();
- sources.addElement(source);
+ try {
+ DOMImplementationSource source =
+ (DOMImplementationSource) sourceClass.getConstructor().newInstance();
+ sources.addElement(source);
+ } catch (NoSuchMethodException | InvocationTargetException e) {
+ throw new InstantiationException(e.getMessage());
+ }
}
}
return new DOMImplementationRegistry(sources);
--- a/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/ls/LSSerializer.java Mon Jul 17 09:13:49 2017 -0700
@@ -136,7 +136,7 @@
* <p> Within markup, but outside of attributes, any occurrence of a character
* that cannot be represented in the output character encoding is reported
* as a <code>DOMError</code> fatal error. An example would be serializing
- * the element <LaCa\u00f1ada/> with <code>encoding="us-ascii"</code>.
+ * the element <LaCañada/> with <code>encoding="us-ascii"</code>.
* This will result with a generation of a <code>DOMError</code>
* "wf-invalid-character-in-node-name" (as proposed in "<a href='http://www.w3.org/TR/DOM-Level-3-Core/core.html#parameter-well-formed'>
* well-formed</a>").
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/NewInstance.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -32,6 +32,7 @@
package org.xml.sax.helpers;
+import java.lang.reflect.InvocationTargetException;
import java.util.Objects;
/**
@@ -90,7 +91,11 @@
driverClass = classLoader.loadClass(className);
}
- return type.cast(driverClass.newInstance());
+ try {
+ return type.cast(driverClass.getConstructor().newInstance());
+ } catch (NoSuchMethodException | SecurityException | InvocationTargetException ex) {
+ throw new InstantiationException(ex.getMessage());
+ }
}
}
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/ParserAdapter.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -79,6 +79,7 @@
* @see org.xml.sax.XMLReader
* @see org.xml.sax.Parser
*/
+@SuppressWarnings("deprecation")
public class ParserAdapter implements XMLReader, DocumentHandler
{
private static SecuritySupport ss = new SecuritySupport();
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/SecuritySupport.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -86,7 +86,7 @@
boolean doesFileExist(final File f) {
return (AccessController.doPrivileged((PrivilegedAction<Boolean>)() ->
- new Boolean(f.exists())));
+ f.exists()));
}
}
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -73,6 +73,7 @@
* @see org.xml.sax.Parser
* @see org.xml.sax.XMLReader
*/
+@SuppressWarnings("deprecation")
public class XMLReaderAdapter implements Parser, ContentHandler
{
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/helpers/XMLReaderFactory.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -100,7 +100,6 @@
* Obtains a new instance of a {@link org.xml.sax.XMLReader}.
* This method uses the following ordered lookup procedure to find and load
* the {@link org.xml.sax.XMLReader} implementation class:
- * <p>
* <ol>
* <li>If the system property {@code org.xml.sax.driver}
* has a value, that is used as an XMLReader class name. </li>
--- a/jaxp/src/java.xml/share/classes/org/xml/sax/package-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/src/java.xml/share/classes/org/xml/sax/package-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -48,16 +48,20 @@
* <em>setFeature</em>. Those standard identifiers are:
*
*
- * <table border="1" cellpadding="3" cellspacing="0" width="100%">
- * <tr align="center" bgcolor="#ccccff">
- * <th>Feature ID</th>
- * <th>Access</th>
- * <th>Default</th>
- * <th>Description</th>
+ * <table class="striped">
+ * <caption>Standard Features</caption>
+ * <thead>
+ * <tr>
+ * <th scope="col">Feature ID</th>
+ * <th scope="col">Access</th>
+ * <th scope="col">Default</th>
+ * <th scope="col">Description</th>
* </tr>
+ * </thead>
*
+ * <tbody>
* <tr>
- * <td>external-general-entities</td>
+ * <th scope="row">external-general-entities</th>
* <td><em>read/write</em></td>
* <td><em>unspecified</em></td>
* <td> Reports whether this parser processes external
@@ -66,7 +70,7 @@
* </tr>
*
* <tr>
- * <td>external-parameter-entities</td>
+ * <th scope="row">external-parameter-entities</th>
* <td><em>read/write</em></td>
* <td><em>unspecified</em></td>
* <td> Reports whether this parser processes external
@@ -75,7 +79,7 @@
* </tr>
*
* <tr>
- * <td>is-standalone</td>
+ * <th scope="row">is-standalone</th>
* <td>(parsing) <em>read-only</em>, (not parsing) <em>none</em></td>
* <td>not applicable</td>
* <td> May be examined only during a parse, after the
@@ -86,7 +90,7 @@
* </tr>
*
* <tr>
- * <td>lexical-handler/parameter-entities</td>
+ * <th scope="row">lexical-handler/parameter-entities</th>
* <td><em>read/write</em></td>
* <td><em>unspecified</em></td>
* <td> A value of "true" indicates that the LexicalHandler will report
@@ -95,7 +99,7 @@
* </tr>
*
* <tr>
- * <td>namespaces</td>
+ * <th scope="row">namespaces</th>
* <td><em>read/write</em></td>
* <td>true</td>
* <td> A value of "true" indicates namespace URIs and unprefixed local names
@@ -104,7 +108,7 @@
* </tr>
*
* <tr>
- * <td>namespace-prefixes</td>
+ * <th scope="row">namespace-prefixes</th>
* <td><em>read/write</em></td>
* <td>false</td>
* <td> A value of "true" indicates that XML qualified names (with prefixes) and
@@ -113,7 +117,7 @@
* </tr>
*
* <tr>
- * <td>resolve-dtd-uris</td>
+ * <th scope="row">resolve-dtd-uris</th>
* <td><em>read/write</em></td>
* <td><em>true</em></td>
* <td> A value of "true" indicates that system IDs in declarations will
@@ -135,7 +139,7 @@
* </tr>
*
* <tr>
- * <td>string-interning</td>
+ * <th scope="row">string-interning</th>
* <td><em>read/write</em></td>
* <td><em>unspecified</em></td>
* <td> Has a value of "true" if all XML names (for elements, prefixes,
@@ -148,7 +152,7 @@
* </tr>
*
* <tr>
- * <td>unicode-normalization-checking</td>
+ * <th scope="row">unicode-normalization-checking</th>
* <td><em>read/write</em></td>
* <td><em>false</em></td>
* <td> Controls whether the parser reports Unicode normalization
@@ -161,7 +165,7 @@
* </tr>
*
* <tr>
- * <td>use-attributes2</td>
+ * <th scope="row">use-attributes2</th>
* <td><em>read-only</em></td>
* <td>not applicable</td>
* <td> Returns "true" if the <em>Attributes</em> objects passed by
@@ -175,7 +179,7 @@
* </tr>
*
* <tr>
- * <td>use-locator2</td>
+ * <th scope="row">use-locator2</th>
* <td><em>read-only</em></td>
* <td>not applicable</td>
* <td> Returns "true" if the <em>Locator</em> objects passed by
@@ -188,7 +192,7 @@
* </tr>
*
* <tr>
- * <td>use-entity-resolver2</td>
+ * <th scope="row">use-entity-resolver2</th>
* <td><em>read/write</em></td>
* <td><em>true</em></td>
* <td> Returns "true" if, when <em>setEntityResolver</em> is given
@@ -200,7 +204,7 @@
* </tr>
*
* <tr>
- * <td>validation</td>
+ * <th scope="row">validation</th>
* <td><em>read/write</em></td>
* <td><em>unspecified</em></td>
* <td> Controls whether the parser is reporting all validity
@@ -209,7 +213,7 @@
* </tr>
*
* <tr>
- * <td>xmlns-uris</td>
+ * <th scope="row">xmlns-uris</th>
* <td><em>read/write</em></td>
* <td><em>false</em></td>
* <td> Controls whether, when the <em>namespace-prefixes</em> feature
@@ -225,13 +229,14 @@
* </tr>
*
* <tr>
- * <td>xml-1.1</td>
+ * <th scope="row">xml-1.1</th>
* <td><em>read-only</em></td>
* <td>not applicable</td>
* <td> Returns "true" if the parser supports both XML 1.1 and XML 1.0.
* Returns "false" if the parser supports only XML 1.0.
* </td>
* </tr>
+ * </tbody>
* </table>
*
* <p>
@@ -262,14 +267,18 @@
* <code>dom-node</code>. Manage those properties using
* <em>setProperty()</em>. Those identifiers are:
*
- * <table border="1" cellpadding="3" cellspacing="0" width="100%">
- * <tr align="center" bgcolor="#ccccff">
- * <th>Property ID</th>
- * <th>Description</th>
+ * <table class="striped">
+ * <caption>Standard Property IDs</caption>
+ * <thead>
+ * <tr>
+ * <th scope="col">Property ID</th>
+ * <th scope="col">Description</th>
* </tr>
+ * </thead>
*
+ * <tbody>
* <tr>
- * <td>declaration-handler</td>
+ * <th scope="row">declaration-handler</th>
* <td> Used to see most DTD declarations except those treated
* as lexical ("document element name is ...") or which are
* mandatory for all SAX parsers (<em>DTDHandler</em>).
@@ -279,7 +288,7 @@
* </tr>
*
* <tr>
- * <td>document-xml-version</td>
+ * <th scope="row">document-xml-version</th>
* <td> May be examined only during a parse, after the startDocument()
* callback has been completed; read-only. This property is a
* literal string describing the actual XML version of the document,
@@ -288,7 +297,7 @@
* </tr>
*
* <tr>
- * <td>dom-node</td>
+ * <th scope="row">dom-node</th>
* <td> For "DOM Walker" style parsers, which ignore their
* <em>parser.parse()</em> parameters, this is used to
* specify the DOM (sub)tree being walked by the parser.
@@ -298,7 +307,7 @@
* </tr>
*
* <tr>
- * <td>lexical-handler</td>
+ * <th scope="row">lexical-handler</th>
* <td> Used to see some syntax events that are essential in some
* applications: comments, CDATA delimiters, selected general
* entity inclusions, and the start and end of the DTD
@@ -309,11 +318,12 @@
* </tr>
*
* <tr>
- * <td>xml-string</td>
+ * <th scope="row">xml-string</th>
* <td> Readable only during a parser callback, this exposes a <b>TBS</b>
* chunk of characters responsible for the current event.
* </td>
* </tr>
+ * </tbody>
* </table>
*
* <p>
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java Mon Jul 17 09:13:49 2017 -0700
@@ -45,8 +45,6 @@
/*
* @test
* @bug 8145974
- * @modules javax.xml
- * @test
* @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
* @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.SurrogatesTest
* @run testng/othervm stream.XMLStreamWriterTest.SurrogatesTest
--- a/jaxws/.hgtags Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxws/.hgtags Mon Jul 17 09:13:49 2017 -0700
@@ -435,3 +435,6 @@
712a3a657654079514590d37a0f4894d43541d5c jdk-10+12
a5d361b9d1f7f78a675f3baef0d1fd32deee9ea2 jdk-9+175
46a14aad004aa0b980d5f4ff7810d894fd5a36ae jdk-10+13
+bddeaa49ffd55567ad232548c38aa270e1a1420a jdk-10+14
+ea819b6009d33a72e6672bab6c101d51db0cfb4c jdk-9+176
+b44a721aee3d3b2537754e559fe9ecccadea548b jdk-9+177
--- a/jaxws/src/java.activation/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxws/src/java.activation/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,7 +26,7 @@
/**
* Defines the JavaBeans Activation Framework (JAF) API.
*
- * <p> This module is upgradeble.
+ * <p> This module is upgradeable.
*
* @moduleGraph
* @since 9
--- a/jaxws/src/java.xml.bind/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxws/src/java.xml.bind/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,7 +26,7 @@
/**
* Defines the Java Architecture for XML Binding (JAXB) API.
*
- * <p> This module is upgradeble.
+ * <p> This module is upgradeable.
*
* @uses javax.xml.bind.JAXBContextFactory
*
--- a/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -27,7 +27,7 @@
* Defines a subset of the Common Annotations API to support programs running
* on the Java SE Platform.
*
- * <p> This module is upgradeble.
+ * <p> This module is upgradeable.
*
* @moduleGraph
* @since 9
--- a/jaxws/src/java.xml.ws/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jaxws/src/java.xml.ws/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -27,7 +27,7 @@
* Defines the Java API for XML-Based Web Services (JAX-WS), and
* the Web Services Metadata API.
*
- * <p> This module is upgradeble.
+ * <p> This module is upgradeable.
*
* @uses javax.xml.soap.MessageFactory
* @uses javax.xml.soap.SAAJMetaFactory
--- a/jdk/.hgtags Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/.hgtags Mon Jul 17 09:13:49 2017 -0700
@@ -432,3 +432,6 @@
5f504872a75b71f2fb19299f0d1e3395cf32eaa0 jdk-10+12
e6c4f6ef717d104dba880e2dae538690c993b46f jdk-9+175
4540d6376f3ef22305cca546f85f9b2ce9a210c4 jdk-10+13
+7a2bc0a80087b63c909df2af6ec7d9ef44e6d7f7 jdk-10+14
+9f27d513658d5375b0e26846857d92563f279073 jdk-9+176
+80acf577b7d0b886fb555c9916552844f6cc72af jdk-9+177
--- a/jdk/make/lib/Awt2dLibraries.gmk Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/make/lib/Awt2dLibraries.gmk Mon Jul 17 09:13:49 2017 -0700
@@ -749,12 +749,14 @@
$(BUILD_LIBJAWT): $(BUILD_LIBAWT)
- $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
- $(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%, %, $@))
- $(call MakeDir, $(@D))
- $(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
+ $(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
+ FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX), \
+ DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
+ ))
- TARGETS += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
+ $(COPY_JAWT_LIB): $(BUILD_LIBJAWT)
+
+ TARGETS += $(COPY_JAWT_LIB)
else # OPENJDK_TARGET_OS not windows
--- a/jdk/make/src/classes/build/tools/taglet/ModuleGraph.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/make/src/classes/build/tools/taglet/ModuleGraph.java Mon Jul 17 09:13:49 2017 -0700
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Set;
import javax.lang.model.element.Element;
+import javax.lang.model.element.ModuleElement;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.doclet.Taglet;
import static jdk.javadoc.doclet.Taglet.Location.*;
@@ -62,7 +63,7 @@
return "";
}
- String moduleName = element.getSimpleName().toString();
+ String moduleName = ((ModuleElement) element).getQualifiedName().toString();
String imageFile = moduleName + "-graph.png";
int thumbnailHeight = -1;
String hoverImage = "";
--- a/jdk/src/java.base/macosx/native/libjava/java_props_macosx.c Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/macosx/native/libjava/java_props_macosx.c Mon Jul 17 09:13:49 2017 -0700
@@ -47,6 +47,7 @@
#define LOCALEIDLENGTH 128
char *getMacOSXLocale(int cat) {
const char* retVal = NULL;
+ char localeString[LOCALEIDLENGTH];
switch (cat) {
case LC_MESSAGES:
@@ -74,73 +75,114 @@
}
CFRelease(languages);
- retVal = languageString;
+ // Explicitly supply region, if there is none
+ char *hyphenPos = strchr(languageString, '-');
+ int langStrLen = strlen(languageString);
+
+ if (hyphenPos == NULL || // languageString contains ISO639 only, e.g., "en"
+ languageString + langStrLen - hyphenPos == 5) { // ISO639-ScriptCode, e.g., "en-Latn"
+ CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
+ localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding());
+ char *underscorePos = strrchr(localeString, '_');
+ char *region = NULL;
- // Special case for Portuguese in Brazil:
- // The language code needs the "_BR" region code (to distinguish it
- // from Portuguese in Portugal), but this is missing when using the
- // "Portuguese (Brazil)" language.
- // If language is "pt" and the current locale is pt_BR, return pt_BR.
- char localeString[LOCALEIDLENGTH];
- if (strcmp(retVal, "pt") == 0 &&
- CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
- localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding()) &&
- strcmp(localeString, "pt_BR") == 0) {
- retVal = localeString;
+ if (underscorePos != NULL) {
+ region = underscorePos + 1;
+ }
+
+ if (region != NULL) {
+ strcat(languageString, "-");
+ strcat(languageString, region);
+ }
}
+
+ retVal = languageString;
}
break;
+
default:
{
- char localeString[LOCALEIDLENGTH];
if (!CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding())) {
return NULL;
}
+
retVal = localeString;
}
break;
}
if (retVal != NULL) {
- // Language IDs use the language designators and (optional) region
- // and script designators of BCP 47. So possible formats are:
- //
- // "en" (language designator only)
- // "haw" (3-letter lanuage designator)
- // "en-GB" (language with alpha-2 region designator)
- // "es-419" (language with 3-digit UN M.49 area code)
- // "zh-Hans" (language with ISO 15924 script designator)
- // "zh-Hans-US" (language with ISO 15924 script designator and region)
- // "zh-Hans-419" (language with ISO 15924 script designator and UN M.49)
- //
- // In the case of region designators (alpha-2 and/or UN M.49), we convert
- // to our locale string format by changing '-' to '_'. That is, if
- // the '-' is followed by fewer than 4 chars.
- char* scriptOrRegion = strchr(retVal, '-');
- if (scriptOrRegion != NULL) {
- int length = strlen(scriptOrRegion);
- if (length > 5) {
- // Region and script both exist. Honor the script for now
- scriptOrRegion[5] = '\0';
- } else if (length < 5) {
- *scriptOrRegion = '_';
+ return strdup(convertToPOSIXLocale(retVal));
+ }
+
+ return NULL;
+}
- assert((length == 3 &&
- // '-' followed by a 2 character region designator
- isalpha(scriptOrRegion[1]) &&
- isalpha(scriptOrRegion[2])) ||
- (length == 4 &&
- // '-' followed by a 3-digit UN M.49 area code
- isdigit(scriptOrRegion[1]) &&
- isdigit(scriptOrRegion[2]) &&
- isdigit(scriptOrRegion[3])));
- }
+/* Language IDs use the language designators and (optional) region
+ * and script designators of BCP 47. So possible formats are:
+ *
+ * "en" (language designator only)
+ * "haw" (3-letter lanuage designator)
+ * "en-GB" (language with alpha-2 region designator)
+ * "es-419" (language with 3-digit UN M.49 area code)
+ * "zh-Hans" (language with ISO 15924 script designator)
+ * "zh-Hans-US" (language with ISO 15924 script designator and region)
+ * "zh-Hans-419" (language with ISO 15924 script designator and UN M.49)
+ *
+ * convert these tags into POSIX conforming locale string, i.e.,
+ * lang{_region}{@script}. e.g., for "zh-Hans-US" into "zh_US@Hans"
+ */
+const char * convertToPOSIXLocale(const char* src) {
+ char* scriptRegion = strchr(src, '-');
+ if (scriptRegion != NULL) {
+ int length = strlen(scriptRegion);
+ char* region = strchr(scriptRegion + 1, '-');
+ char* atMark = NULL;
+
+ if (region == NULL) {
+ // CFLocaleGetIdentifier() returns '_' before region
+ region = strchr(scriptRegion + 1, '_');
}
- return strdup(retVal);
+ *scriptRegion = '_';
+ if (length > 5) {
+ // Region and script both exist.
+ char tmpScript[4];
+ int regionLength = length - 6;
+ atMark = scriptRegion + 1 + regionLength;
+ memcpy(tmpScript, scriptRegion + 1, 4);
+ memmove(scriptRegion + 1, region + 1, regionLength);
+ memcpy(atMark + 1, tmpScript, 4);
+ } else if (length == 5) {
+ // script only
+ atMark = scriptRegion;
+ }
+
+ if (atMark != NULL) {
+ *atMark = '@';
+
+ // assert script code
+ assert(isalpha(atMark[1]) &&
+ isalpha(atMark[2]) &&
+ isalpha(atMark[3]) &&
+ isalpha(atMark[4]));
+ }
+
+ assert(((length == 3 || length == 8) &&
+ // '_' followed by a 2 character region designator
+ isalpha(scriptRegion[1]) &&
+ isalpha(scriptRegion[2])) ||
+ ((length == 4 || length == 9) &&
+ // '_' followed by a 3-digit UN M.49 area code
+ isdigit(scriptRegion[1]) &&
+ isdigit(scriptRegion[2]) &&
+ isdigit(scriptRegion[3])) ||
+ // '@' followed by a 4 character script code (already validated above)
+ (length == 5));
}
- return NULL;
+
+ return src;
}
char *setupMacOSXLocale(int cat) {
--- a/jdk/src/java.base/macosx/native/libjava/java_props_macosx.h Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/macosx/native/libjava/java_props_macosx.h Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, 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
@@ -26,6 +26,7 @@
#include "java_props.h"
char *setupMacOSXLocale(int cat);
+const char *convertToPOSIXLocale(const char* src);
void setOSNameAndVersion(java_props_t *sprops);
void setUserHome(java_props_t *sprops);
void setProxyProperties(java_props_t *sProps);
--- a/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java Mon Jul 17 09:13:49 2017 -0700
@@ -340,14 +340,6 @@
* </tr>
*
* <tr>
- * <td>usePolicy</td>
- * <td>Granting this permission disables the Java Plug-In's default
- * security prompting behavior.</td>
- * <td>For more information, refer to the <a href=
- * "../../../technotes/guides/deploy/index.html">deployment guide</a>.
- * </td>
- * </tr>
- * <tr>
* <td>manageProcess</td>
* <td>Native process termination and information about processes
* {@link ProcessHandle}.</td>
--- a/jdk/src/java.base/share/classes/java/util/Locale.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/java/util/Locale.java Mon Jul 17 09:13:49 2017 -0700
@@ -3257,6 +3257,9 @@
* Returns a list of matching {@code Locale} instances using the filtering
* mechanism defined in RFC 4647.
*
+ * This filter operation on the given {@code locales} ensures that only
+ * unique matching locale(s) are returned.
+ *
* @param priorityList user's Language Priority List in which each language
* tag is sorted in descending order based on priority or weight
* @param locales {@code Locale} instances used for matching
@@ -3284,6 +3287,9 @@
* {@link #filter(List, Collection, FilteringMode)} when {@code mode} is
* {@link FilteringMode#AUTOSELECT_FILTERING}.
*
+ * This filter operation on the given {@code locales} ensures that only
+ * unique matching locale(s) are returned.
+ *
* @param priorityList user's Language Priority List in which each language
* tag is sorted in descending order based on priority or weight
* @param locales {@code Locale} instances used for matching
@@ -3304,6 +3310,17 @@
* Returns a list of matching languages tags using the basic filtering
* mechanism defined in RFC 4647.
*
+ * This filter operation on the given {@code tags} ensures that only
+ * unique matching tag(s) are returned with preserved case. In case of
+ * duplicate matching tags with the case difference, the first matching
+ * tag with preserved case is returned.
+ * For example, "de-ch" is returned out of the duplicate matching tags
+ * "de-ch" and "de-CH", if "de-ch" is checked first for matching in the
+ * given {@code tags}. Note that if the given {@code tags} is an unordered
+ * {@code Collection}, the returned matching tag out of duplicate tags is
+ * subject to change, depending on the implementation of the
+ * {@code Collection}.
+ *
* @param priorityList user's Language Priority List in which each language
* tag is sorted in descending order based on priority or weight
* @param tags language tags
@@ -3331,6 +3348,17 @@
* {@link #filterTags(List, Collection, FilteringMode)} when {@code mode}
* is {@link FilteringMode#AUTOSELECT_FILTERING}.
*
+ * This filter operation on the given {@code tags} ensures that only
+ * unique matching tag(s) are returned with preserved case. In case of
+ * duplicate matching tags with the case difference, the first matching
+ * tag with preserved case is returned.
+ * For example, "de-ch" is returned out of the duplicate matching tags
+ * "de-ch" and "de-CH", if "de-ch" is checked first for matching in the
+ * given {@code tags}. Note that if the given {@code tags} is an unordered
+ * {@code Collection}, the returned matching tag out of duplicate tags is
+ * subject to change, depending on the implementation of the
+ * {@code Collection}.
+ *
* @param priorityList user's Language Priority List in which each language
* tag is sorted in descending order based on priority or weight
* @param tags language tags
@@ -3370,6 +3398,9 @@
* Returns the best-matching language tag using the lookup mechanism
* defined in RFC 4647.
*
+ * This lookup operation on the given {@code tags} ensures that the
+ * first matching tag with preserved case is returned.
+ *
* @param priorityList user's Language Priority List in which each language
* tag is sorted in descending order based on priority or weight
* @param tags language tangs used for matching
--- a/jdk/src/java.base/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,8 +26,8 @@
/**
* Defines the foundational APIs of the Java SE Platform.
*
- * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
- * <dt class="simpleTagLabel">Providers:</dt>
+ * <dl>
+ * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Providers:</dt>
* <dd> The JDK implementation of this module provides an implementation of
* the {@index jrt jrt} {@linkplain java.nio.file.spi.FileSystemProvider
* file system provider} to enumerate and read the class and resource
@@ -36,8 +36,8 @@
* {@link java.nio.file.FileSystems#newFileSystem
* FileSystems.newFileSystem(URI.create("jrt:/"))}.
* <p></dd>
- * <dt class="simpleTagLabel">Tool Guides:</dt>
- * <dd> {@extLink java_tool_reference java launcher},
+ * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Tool Guides:</dt>
+ * <dd style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif"> {@extLink java_tool_reference java launcher},
* {@extLink keytool_tool_reference keytool}</dd>
* </dl>
*
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_de.properties Mon Jul 17 09:13:49 2017 -0700
@@ -35,7 +35,7 @@
unterst\u00FCtzt und verwendet,\n falls verf\u00FCgbar. Der nicht skalierte Bilddateiname (Beispiel: image.ext)\n muss immer als Argument an die Option "-splash" \u00FCbergeben werden.\n Das am besten geeignete angegebene skalierte Bild wird\n automatisch ausgew\u00E4hlt.\n Weitere Informationen finden Sie in der Dokumentation zur SplashScreen-API\n @argument files\n Eine oder mehrere Argumentdateien mit Optionen\n -disable-@files\n Verhindert die weitere Erweiterung von Argumentdateien\nUm ein Argument f\u00FCr eine lange Option anzugeben, k\u00F6nnen Sie --<Name>=<Wert> oder\n--<Name> <Wert> verwenden.\n
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\n -Xbatch Deaktiviert Hintergrundkompilierung\n -Xbootclasspath/a: <Durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n an Ende von Bootstrap Classpath anh\u00E4ngen\n -Xcheck:jni F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n -Xcomp Erzwingt Kompilierung von Methoden beim ersten Aufruf\n -Xdebug Wird zur Abw\u00E4rtskompatiblit\u00E4t bereitgestellt\n -Xdiag Zeigt zus\u00E4tzliche Diagnosemeldungen an\n -Xfuture Aktiviert strengste Pr\u00FCfungen, wird als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet\n -Xint Nur Ausf\u00FChrung im interpretierten Modus\n -Xinternalversion\n Zeigt detailliertere JVM-Versionsinformationen an als die\n Option "-version"\n -Xloggc:<Datei> Protokolliert GC-Status in einer Datei mit Zeitstempeln\n -Xmixed Ausf\u00FChrung im gemischten Modus (Standard)\n -Xmn<Gr\u00F6\u00DFe> Legt die anf\u00E4ngliche und die maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n f\u00FCr die junge Generation (Nursery) fest\n -Xms<Gr\u00F6\u00DFe> Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n -Xmx<Gr\u00F6\u00DFe> Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n -Xnoclassgc Deaktiviert die Klassen-Garbage Collection\n -Xprof Gibt CPU-Profilierungsdaten aus (veraltet)\n -Xrs Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n -Xshare:auto Verwendet, wenn m\u00F6glich, freigegebene Klassendaten (Standard)\n -Xshare:off Versucht nicht, freigegebene Klassendaten zu verwenden\n -Xshare:on Erfordert die Verwendung von freigegebenen Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n -XshowSettings Zeigt alle Einstellungen an und f\u00E4hrt fort\n -XshowSettings:all\n Zeigt alle Einstellungen an und f\u00E4hrt fort\n -XshowSettings:locale\n Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n -XshowSettings:properties\n Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n -Xss<Gr\u00F6\u00DFe> Legt Stack-Gr\u00F6\u00DFe des Java-Threads fest\n -Xverify Legt den Modus der Bytecodeverifizierung fest\n --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n Aktualisiert <Modul>, damit <Zielmodul> ungeachtet der\n Moduldeklaration gelesen wird. \n <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n Module zu lesen.\n --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration\n in <Zielmodul> zu exportieren.\n <Zielmodul> kann ALL-UNNAMED sein, um in alle \n unbenannten Module zu exportieren.\n --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration\n in <Zielmodul> zu \u00F6ffnen.\n --permit-illegal-access\n L\u00E4sst unzul\u00E4ssigen Zugriff f\u00FCr Mitglieder mit den Typen in den benannten Modulen\n nach Code in unbenannten Modulen zu. Diese Kompatibilit\u00E4tsoption wird\n im n\u00E4chsten Release entfernt.\n --limit-modules <Modulname>[,<Modulname>...]\n Grenzt die Gesamtmenge der beobachtbaren Module ein\n --patch-module <Modul>=<Datei>({0}<Datei>)*\n \u00DCberschreibt oder erweitert ein Modul in JAR-Dateien\n oder -Verzeichnissen mit \
+java.launcher.X.usage=\n -Xbatch Deaktiviert Hintergrundkompilierung\n -Xbootclasspath/a: <Durch {0} getrennte Verzeichnisse und ZIP-/JAR-Dateien>\n an Ende von Bootstrap Classpath anh\u00E4ngen\n -Xcheck:jni F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen aus\n -Xcomp Erzwingt Kompilierung von Methoden beim ersten Aufruf\n -Xdebug Wird zur Abw\u00E4rtskompatiblit\u00E4t bereitgestellt\n -Xdiag Zeigt zus\u00E4tzliche Diagnosemeldungen an\n -Xfuture Aktiviert strengste Pr\u00FCfungen, wird als m\u00F6glicher zuk\u00FCnftiger Standardwert erwartet\n -Xint Nur Ausf\u00FChrung im interpretierten Modus\n -Xinternalversion\n Zeigt detailliertere JVM-Versionsinformationen an als die\n Option "-version"\n -Xloggc:<Datei> Protokolliert GC-Status in einer Datei mit Zeitstempeln\n -Xmixed Ausf\u00FChrung im gemischten Modus (Standard)\n -Xmn<Gr\u00F6\u00DFe> Legt die anf\u00E4ngliche und die maximale Gr\u00F6\u00DFe (in Byte) des Heaps\n f\u00FCr die junge Generation (Nursery) fest\n -Xms<Gr\u00F6\u00DFe> Legt die anf\u00E4ngliche Java-Heap-Gr\u00F6\u00DFe fest\n -Xmx<Gr\u00F6\u00DFe> Legt die maximale Java-Heap-Gr\u00F6\u00DFe fest\n -Xnoclassgc Deaktiviert die Klassen-Garbage Collection\n -Xprof Gibt CPU-Profilierungsdaten aus (veraltet)\n -Xrs Reduziert die Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n -Xshare:auto Verwendet, wenn m\u00F6glich, freigegebene Klassendaten (Standard)\n -Xshare:off Versucht nicht, freigegebene Klassendaten zu verwenden\n -Xshare:on Erfordert die Verwendung von freigegebenen Klassendaten, verl\u00E4uft sonst nicht erfolgreich.\n -XshowSettings Zeigt alle Einstellungen an und f\u00E4hrt fort\n -XshowSettings:all\n Zeigt alle Einstellungen an und f\u00E4hrt fort\n -XshowSettings:locale\n Zeigt alle gebietsschemabezogenen Einstellungen an und f\u00E4hrt fort\n -XshowSettings:properties\n Zeigt alle Eigenschaftseinstellungen an und f\u00E4hrt fort\n -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen an und f\u00E4hrt fort\n -Xss<Gr\u00F6\u00DFe> Legt Stack-Gr\u00F6\u00DFe des Java-Threads fest\n -Xverify Legt den Modus der Bytecodeverifizierung fest\n --add-reads <Modul>=<Zielmodul>(,<Zielmodul>)*\n Aktualisiert <Modul>, damit <Zielmodul> ungeachtet der\n Moduldeklaration gelesen wird. \n <Zielmodul> kann ALL-UNNAMED sein, um alle unbenannten\n Module zu lesen.\n --add-exports <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration\n in <Zielmodul> zu exportieren.\n <Zielmodul> kann ALL-UNNAMED sein, um in alle \n unbenannten Module zu exportieren.\n --add-opens <Modul>/<Package>=<Zielmodul>(,<Zielmodul>)*\n Aktualisiert <Modul>, um <Package> ungeachtet der Moduldeklaration\n in <Zielmodul> zu \u00F6ffnen.\n --limit-modules <Modulname>[,<Modulname>...]\n Grenzt die Gesamtmenge der beobachtbaren Module ein\n --patch-module <Modul>=<Datei>({0}<Datei>)*\n \u00DCberschreibt oder erweitert ein Modul in JAR-Dateien\n oder -Verzeichnissen mit \
Klassen und Ressourcen.\n --disable-@files Deaktiviert die weitere Erweiterung von Argumentdateien\n\nDiese zus\u00E4tzlichen Optionen k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.
# Translators please note do not translate the options themselves
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_es.properties Mon Jul 17 09:13:49 2017 -0700
@@ -35,7 +35,7 @@
mostrar pantalla de presentaci\u00F3n con imagen especificada\n Las im\u00E1genes a escala HiDPI est\u00E1n soportadas y se usan autom\u00E1ticamente\n si est\u00E1n disponibles. El nombre de archivo de la imagen sin escala, por ejemplo, image.ext,\n siempre debe transmitirse como el argumento para la opci\u00F3n -splash.\n La imagen a escala m\u00E1s adecuada que se haya proporcionado se escoger\u00E1\n autom\u00E1ticamente.\n Consulte la documentaci\u00F3n de la API de la pantalla de presentaci\u00F3n para obtener m\u00E1s informaci\u00F3n.\n @argument files\n uno o m\u00E1s archivos de argumentos que contienen opciones\n -disable-@files\n evitar una mayor expansi\u00F3n del archivo de argumentos\nPara especificar un argumento para una opci\u00F3n larga, puede usar --<nombre>=<valor> o\n--<nombre> <valor>.\n
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\ -Xbatch desactivar compilaci\u00F3n de fondo\n -Xbootclasspath/a:<directorios y archivos zip/jar separados por {0}>\n agregar al final de la ruta de la clase de inicializaci\u00F3n de datos\n -Xcheck:jni realizar comprobaciones adicionales para las funciones de JNI\n -Xcomp fuerza la compilaci\u00F3n de m\u00E9todos en la primera llamada\n -Xdebug se proporciona para ofrecer compatibilidad con versiones anteriores\n -Xdiag mostrar mensajes de diagn\u00F3stico adicionales\n -Xfuture activar las comprobaciones m\u00E1s estrictas, anticip\u00E1ndose al futuro valor por defecto\n -Xint solo ejecuci\u00F3n de modo interpretado\n -Xinternalversion\n muestra una informaci\u00F3n de la versi\u00F3n de JVM m\u00E1s detallada que la\n opci\u00F3n -version\n -Xloggc:<archivo> registrar el estado de GC en un archivo con registros de hora\n -Xmixed ejecuci\u00F3n de modo mixto (por defecto)\n -Xmn<size> define el tama\u00F1o inicial y m\u00E1ximo (en bytes) de la pila\n para la generaci\u00F3n m\u00E1s joven (espacio infantil)\n -Xms<size> define el tama\u00F1o inicial de la pila de Java\n -Xmx<size> define el tama\u00F1o m\u00E1ximo de la pila de Java\n -Xnoclassgc desactivar la recolecci\u00F3n de basura de clases\n -Xprof datos de creaci\u00F3n de perfiles de CPU de salida (anticuados)\n -Xrs reducir el uso de se\u00F1ales de sistema operativo por parte de Java/VM (consulte la documentaci\u00F3n)\n -Xshare:auto usar datos de clase compartidos si es posible (valor por defecto)\n -Xshare:off no intentar usar datos de clase compartidos\n -Xshare:on es obligatorio el uso de datos de clase compartidos, de lo contrario se producir\u00E1 un fallo.\n -XshowSettings mostrar toda la configuraci\u00F3n y continuar\n -XshowSettings:all\n mostrar todos los valores y continuar\n -XshowSettings:locale\n mostrar todos los valores relacionados con la configuraci\u00F3n regional y continuar\n -XshowSettings:properties\n mostrar todos los valores de propiedad y continuar\n -XshowSettings:vm mostrar todos los valores relacionados con vm y continuar\n -Xss<size> definir tama\u00F1o de la pila del thread de Java\n -Xverify define el modo del verificador de c\u00F3digo de bytes\n --add-reads <m\u00F3dulo>=<m\u00F3dulo-destino>(,<m\u00F3dulo-destino>)*\n actualiza <m\u00F3dulo> para leer <m\u00F3dulo-destino>, independientement\n de la declaraci\u00F3n del m\u00F3dulo. \n <m\u00F3dulo-destino> puede ser ALL-UNNAMED para leer todos los\n m\u00F3dulos sin nombre.\n --add-exports <m\u00F3dulo>/<paquete>=<modulo-destino>(,<m\u00F3dulo-destino>)*\n actualiza <m\u00F3dulo> para exportar <paquete> en <m\u00F3dulo-destino>,\n independientemente de la declaraci\u00F3n del m\u00F3dulo.\n <m\u00F3dulo-destino> puede ser ALL-UNNAMED para exportar a todos los\n m\u00F3dulos sin nombre.\n --add-opens <m\u00F3dulo>/<paquete>=<m\u00F3dulo-destino>(,<m\u00F3dulo-destino>)*\n actualiza <m\u00F3dulo> para abrir <paquete> en\n <m\u00F3dulo-destino>, independientemente de la declaraci\u00F3n del m\u00F3dulo.\n --permit-illegal-access\n permitir el acceso no v\u00E1lido a miembros de tipos en m\u00F3dulos con nombre\n por c\u00F3digo en m\u00F3dulos sin nombre. Esta opci\u00F3n de compatibilidad\n se eliminar\u00E1 en la pr\u00F3xima versi\u00F3n.\n --limit-modules <nombre \
+java.launcher.X.usage=\ -Xbatch desactivar compilaci\u00F3n de fondo\n -Xbootclasspath/a:<directorios y archivos zip/jar separados por {0}>\n agregar al final de la ruta de la clase de inicializaci\u00F3n de datos\n -Xcheck:jni realizar comprobaciones adicionales para las funciones de JNI\n -Xcomp fuerza la compilaci\u00F3n de m\u00E9todos en la primera llamada\n -Xdebug se proporciona para ofrecer compatibilidad con versiones anteriores\n -Xdiag mostrar mensajes de diagn\u00F3stico adicionales\n -Xfuture activar las comprobaciones m\u00E1s estrictas, anticip\u00E1ndose al futuro valor por defecto\n -Xint solo ejecuci\u00F3n de modo interpretado\n -Xinternalversion\n muestra una informaci\u00F3n de la versi\u00F3n de JVM m\u00E1s detallada que la\n opci\u00F3n -version\n -Xloggc:<archivo> registrar el estado de GC en un archivo con registros de hora\n -Xmixed ejecuci\u00F3n de modo mixto (por defecto)\n -Xmn<size> define el tama\u00F1o inicial y m\u00E1ximo (en bytes) de la pila\n para la generaci\u00F3n m\u00E1s joven (espacio infantil)\n -Xms<size> define el tama\u00F1o inicial de la pila de Java\n -Xmx<size> define el tama\u00F1o m\u00E1ximo de la pila de Java\n -Xnoclassgc desactivar la recolecci\u00F3n de basura de clases\n -Xprof datos de creaci\u00F3n de perfiles de CPU de salida (anticuados)\n -Xrs reducir el uso de se\u00F1ales de sistema operativo por parte de Java/VM (consulte la documentaci\u00F3n)\n -Xshare:auto usar datos de clase compartidos si es posible (valor por defecto)\n -Xshare:off no intentar usar datos de clase compartidos\n -Xshare:on es obligatorio el uso de datos de clase compartidos, de lo contrario se producir\u00E1 un fallo.\n -XshowSettings mostrar toda la configuraci\u00F3n y continuar\n -XshowSettings:all\n mostrar todos los valores y continuar\n -XshowSettings:locale\n mostrar todos los valores relacionados con la configuraci\u00F3n regional y continuar\n -XshowSettings:properties\n mostrar todos los valores de propiedad y continuar\n -XshowSettings:vm mostrar todos los valores relacionados con vm y continuar\n -Xss<size> definir tama\u00F1o de la pila del thread de Java\n -Xverify define el modo del verificador de c\u00F3digo de bytes\n --add-reads <m\u00F3dulo>=<m\u00F3dulo-destino>(,<m\u00F3dulo-destino>)*\n actualiza <m\u00F3dulo> para leer <m\u00F3dulo-destino>, independientement\n de la declaraci\u00F3n del m\u00F3dulo. \n <m\u00F3dulo-destino> puede ser ALL-UNNAMED para leer todos los\n m\u00F3dulos sin nombre.\n --add-exports <m\u00F3dulo>/<paquete>=<modulo-destino>(,<m\u00F3dulo-destino>)*\n actualiza <m\u00F3dulo> para exportar <paquete> en <m\u00F3dulo-destino>,\n independientemente de la declaraci\u00F3n del m\u00F3dulo.\n <m\u00F3dulo-destino> puede ser ALL-UNNAMED para exportar a todos los\n m\u00F3dulos sin nombre.\n --add-opens <m\u00F3dulo>/<paquete>=<m\u00F3dulo-destino>(,<m\u00F3dulo-destino>)*\n actualiza <m\u00F3dulo> para abrir <paquete> en\n <m\u00F3dulo-destino>, independientemente de la declaraci\u00F3n del m\u00F3dulo.\n --limit-modules <nombre \
m\u00F3dulo>[,<nombre m\u00F3dulo>...]\n limitar el universo de m\u00F3dulos observables\n --patch-module <m\u00F3dulo>=<archivo>({0}<archivo>)*\n anular o aumentar un m\u00F3dulo con clases y recursos\n en directorios o archivos JAR.\n --disable-@files desactivar una mayor expansi\u00F3n del archivo de argumentos\n\nEstas opciones adicionales est\u00E1n sujetas a cambios sin previo aviso.\n
# Translators please note do not translate the options themselves
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_fr.properties Mon Jul 17 09:13:49 2017 -0700
@@ -35,8 +35,7 @@
java.lang.instrument\n -splash:<imagepath>\n afficher l'\u00E9cran d'accueil avec l'image indiqu\u00E9e\n Les images redimensionn\u00E9es HiDPI sont automatiquement prises en charge et utilis\u00E9es\n si elles sont disponibles. Le nom de fichier d'une image non redimensionn\u00E9e, par ex. image.ext,\n doit toujours \u00EAtre transmis comme argument \u00E0 l'option -splash.\n L'image redimensionn\u00E9e fournie la plus appropri\u00E9e sera automatiquement\n s\u00E9lectionn\u00E9e.\n Pour plus d'informations, reportez-vous \u00E0 la documentation relative \u00E0 l'API SplashScreen\n fichiers @argument\n fichiers d'arguments contenant des options\n -disable-@files\n emp\u00EAcher le d\u00E9veloppement suppl\u00E9mentaire de fichiers d'arguments\nAfin d'indiquer un argument pour une option longue, vous pouvez utiliser --<name>=<value> ou\n--<name> <value>.\n
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\n -Xbatch d\u00E9sactivation de la compilation en arri\u00E8re-plan\n -Xbootclasspath/a:<r\u00E9pertoires et fichiers ZIP/JAR s\u00E9par\u00E9s par des {0}>\n ajout \u00E0 la fin du chemin de classe bootstrap\n -Xcheck:jni ex\u00E9cution de contr\u00F4les suppl\u00E9mentaires pour les fonctions JNI\n -Xcomp force la compilation de m\u00E9thodes au premier appel\n -Xdebug fourni pour la compatibilit\u00E9 amont\n -Xdiag affichage de messages de diagnostic suppl\u00E9mentaires\n -Xfuture activation des contr\u00F4les les plus stricts en vue d''anticiper la future valeur par d\u00E9faut\n -Xint ex\u00E9cution en mode interpr\u00E9t\u00E9 uniquement\n -Xinternalversion\n affiche des informations de version JVM plus d\u00E9taill\u00E9es que\n l''option -version\n -Xloggc:<file> journalisation du statut de l''op\u00E9ration de ramasse-miette dans un fichier avec horodatage\n -Xmixed ex\u00E9cution en mode mixte (valeur par d\u00E9faut)\n -Xmn<size> d\u00E9finit les tailles initiale et maximale (en octets) de la portion de m\u00E9moire\n pour la jeune g\u00E9n\u00E9ration (nursery)\n -Xms<size> d\u00E9finition de la taille initiale des portions de m\u00E9moire Java\n -Xmx<size> d\u00E9finition de la taille maximale des portions de m\u00E9moire Java\n -Xnoclassgc d\u00E9sactivation de l''op\u00E9ration de ramasse-miette de la classe\n -Xprof sortie des donn\u00E9es de profilage d''UC (en phase d''abandon)\n -Xrs r\u00E9duction de l''utilisation des signaux OS par Java/la machine virtuelle (voir documentation)\n -Xshare:auto utilisation des donn\u00E9es de classe partag\u00E9es si possible (valeur par d\u00E9faut)\n -Xshare:off aucune tentative d''utilisation des donn\u00E9es de classe partag\u00E9es\n -Xshare:on utilisation des donn\u00E9es de classe partag\u00E9es obligatoire ou \u00E9chec de l''op\u00E9ration.\n -XshowSettings affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n -XshowSettings:all\n affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n -XshowSettings:locale\n affichage de tous les param\u00E8tres d''environnement local et poursuite de l''op\u00E9ration\n -XshowSettings:properties\n affichage de tous les param\u00E8tres de propri\u00E9t\u00E9 et poursuite de l''op\u00E9ration\n -XshowSettings:vm affichage de tous les param\u00E8tres de machine virtuelle et poursuite de l''op\u00E9ration\n -Xss<size> d\u00E9finition de la taille de pile de threads Java\n -Xverify d\u00E9finit le mode du v\u00E9rificateur de code ex\u00E9cutable\n --add-reads <module>=<target-module>(,<target-module>)*\n met \u00E0 jour <module> pour lire <target-module>, sans tenir compte\n de la d\u00E9claration de module. \n <target-module> peut \u00EAtre ALL-UNNAMED pour lire tous les modules\n sans nom.\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n met \u00E0 jour <module> pour exporter <package> vers <target-module>,\n sans tenir compte de la d\u00E9claration de module.\n <target-module> peut \u00EAtre ALL-UNNAMED pour exporter tous les\n modules sans nom.\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n met \u00E0 jour <module> pour ouvrir <package> dans\n <target-module>, sans tenir compte de la d\u00E9claration de module.\n --permit-illegal-access\n autoriser l''acc\u00E8s non autoris\u00E9 \u00E0 des \
-membres de types dans des modules nomm\u00E9s\n par code dans des modules sans nom. Cette option de compatibilit\u00E9 sera\n enlev\u00E9e dans la prochaine version.\n --limit-modules <nom de module>[,<nom de module>...]\n limiter l''univers de modules observables\n --patch-module <module>=<file>({0}<file>)*\n Remplacement ou augmentation d''un module avec des classes et des ressources\n dans des fichiers ou des r\u00E9pertoires JAR.\n --disable-@files d\u00E9sactivation d''autres d\u00E9veloppements de fichier d''argument\n\nCes options suppl\u00E9mentaires peuvent \u00EAtre modifi\u00E9es sans pr\u00E9avis.\n
+java.launcher.X.usage=\n -Xbatch d\u00E9sactivation de la compilation en arri\u00E8re-plan\n -Xbootclasspath/a:<r\u00E9pertoires et fichiers ZIP/JAR s\u00E9par\u00E9s par des {0}>\n ajout \u00E0 la fin du chemin de classe bootstrap\n -Xcheck:jni ex\u00E9cution de contr\u00F4les suppl\u00E9mentaires pour les fonctions JNI\n -Xcomp force la compilation de m\u00E9thodes au premier appel\n -Xdebug fourni pour la compatibilit\u00E9 amont\n -Xdiag affichage de messages de diagnostic suppl\u00E9mentaires\n -Xfuture activation des contr\u00F4les les plus stricts en vue d''anticiper la future valeur par d\u00E9faut\n -Xint ex\u00E9cution en mode interpr\u00E9t\u00E9 uniquement\n -Xinternalversion\n affiche des informations de version JVM plus d\u00E9taill\u00E9es que\n l''option -version\n -Xloggc:<file> journalisation du statut de l''op\u00E9ration de ramasse-miette dans un fichier avec horodatage\n -Xmixed ex\u00E9cution en mode mixte (valeur par d\u00E9faut)\n -Xmn<size> d\u00E9finit les tailles initiale et maximale (en octets) de la portion de m\u00E9moire\n pour la jeune g\u00E9n\u00E9ration (nursery)\n -Xms<size> d\u00E9finition de la taille initiale des portions de m\u00E9moire Java\n -Xmx<size> d\u00E9finition de la taille maximale des portions de m\u00E9moire Java\n -Xnoclassgc d\u00E9sactivation de l''op\u00E9ration de ramasse-miette de la classe\n -Xprof sortie des donn\u00E9es de profilage d''UC (en phase d''abandon)\n -Xrs r\u00E9duction de l''utilisation des signaux OS par Java/la machine virtuelle (voir documentation)\n -Xshare:auto utilisation des donn\u00E9es de classe partag\u00E9es si possible (valeur par d\u00E9faut)\n -Xshare:off aucune tentative d''utilisation des donn\u00E9es de classe partag\u00E9es\n -Xshare:on utilisation des donn\u00E9es de classe partag\u00E9es obligatoire ou \u00E9chec de l''op\u00E9ration.\n -XshowSettings affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n -XshowSettings:all\n affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n -XshowSettings:locale\n affichage de tous les param\u00E8tres d''environnement local et poursuite de l''op\u00E9ration\n -XshowSettings:properties\n affichage de tous les param\u00E8tres de propri\u00E9t\u00E9 et poursuite de l''op\u00E9ration\n -XshowSettings:vm affichage de tous les param\u00E8tres de machine virtuelle et poursuite de l''op\u00E9ration\n -Xss<size> d\u00E9finition de la taille de pile de threads Java\n -Xverify d\u00E9finit le mode du v\u00E9rificateur de code ex\u00E9cutable\n --add-reads <module>=<target-module>(,<target-module>)*\n met \u00E0 jour <module> pour lire <target-module>, sans tenir compte\n de la d\u00E9claration de module. \n <target-module> peut \u00EAtre ALL-UNNAMED pour lire tous les modules\n sans nom.\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n met \u00E0 jour <module> pour exporter <package> vers <target-module>,\n sans tenir compte de la d\u00E9claration de module.\n <target-module> peut \u00EAtre ALL-UNNAMED pour exporter tous les\n modules sans nom.\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n met \u00E0 jour <module> pour ouvrir <package> dans\n <target-module>, sans tenir compte de la d\u00E9claration de module.\n --limit-modules <nom de module>[,<nom de module>...]\n limiter l''univers de modules observables\n --patch-module <module>=<file>({0}<file>)*\n Remplacement ou augmentation d''un module avec des classes et des ressources\n dans des fichiers ou des r\u00E9pertoires JAR.\n --disable-@files d\u00E9sactivation d''autres d\u00E9veloppements de fichier d''argument\n\nCes options suppl\u00E9mentaires peuvent \u00EAtre modifi\u00E9es sans pr\u00E9avis.\n
# Translators please note do not translate the options themselves
java.launcher.X.macosx.usage=\nLes options suivantes sont propres \u00E0 Mac OS X :\n -XstartOnFirstThread\n ex\u00E9cute la m\u00E9thode main() sur le premier thread (AppKit)\n -Xdock:name=<nom d'application>\n remplace le nom d'application par d\u00E9faut affich\u00E9 dans l'ancrage\n -Xdock:icon=<chemin vers le fichier d'ic\u00F4ne>\n remplace l'ic\u00F4ne par d\u00E9faut affich\u00E9e dans l'ancrage\n\n
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_it.properties Mon Jul 17 09:13:49 2017 -0700
@@ -35,7 +35,7 @@
automaticamente\n se disponibili. I nomi file delle immagini non ridimensionate, ad esempio image.ext,\n devono essere sempre passati come argomenti all'opzione -splash.\n Verr\u00E0 scelta automaticamente l'immagine ridimensionata pi\u00F9 appropriata\n fornita.\n Per ulteriori informazioni, vedere la documentazione relativa all'API SplashScreen\n @file argomenti\n Uno o pi\u00F9 file argomenti contenenti opzioni\n -disable-@files\n Impedisce l'ulteriore espansione di file argomenti\nPer specificare un argomento per un'opzione lunga, \u00E8 possibile usare --<nome>=<valore> oppure\n--<nome> <valore>.\n
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\n -Xbatch Disabilita la compilazione in background.\n -Xbootclasspath/a:<directory e file zip/jar separati da {0}>\n Aggiunge alla fine del classpath di bootstrap.\n -Xcheck:jni Esegue controlli aggiuntivi per le funzioni JNI.\n -Xcomp Forza la compilazione dei metodi al primo richiamo.\n -Xdebug Fornito per la compatibilit\u00E0 con le versioni precedenti.\n -Xdiag Mostra ulteriori messaggi diagnostici.\n -Xfuture Abilita i controlli pi\u00F9 limitativi anticipando le impostazioni predefinite future.\n -Xint Esecuzione solo in modalit\u00E0 convertita.\n -Xinternalversion\n Visualizza informazioni pi\u00F9 dettagliate sulla versione JVM rispetto\n all''opzione -version.\n -Xloggc:<file> Registra lo stato GC in un file con indicatori orari.\n -Xmixed Esecuzione in modalit\u00E0 mista (impostazione predefinita).\n -Xmn<dimensione> Imposta le dimensioni iniziale e massima (in byte) dell''heap\n per la young generation (nursery).\n -Xms<dimensione> Imposta la dimensione heap Java iniziale.\n -Xmx<dimensione> Imposta la dimensione heap Java massima.\n -Xnoclassgc Disabilta la garbage collection della classe.\n -Xprof Visualizza i dati di profilo della CPU (non pi\u00F9 valida).\n -Xrs Riduce l''uso di segnali del sistema operativo da Java/VM (vedere la documentazione).\n -Xshare:auto Utilizza i dati di classe condivisi se possibile (impostazione predefinita).\n -Xshare:off Non tenta di utilizzare i dati di classe condivisi.\n -Xshare:on Richiede l''uso dei dati di classe condivisi, altrimenti l''esecuzione non riesce.\n -XshowSettings Mostra tutte le impostazioni e continua.\n -XshowSettings:all\n Mostra tutte le impostazioni e continua.\n -XshowSettings:locale\n Mostra tutte le impostazioni correlate alle impostazioni nazionali e continua.\n -XshowSettings:properties\n Mostra tutte le impostazioni delle propriet\u00E0 e continua.\n -XshowSettings:vm Mostra tutte le impostazioni correlate alla VM e continua.\n -Xss<dimensione> Imposta la dimensione dello stack di thread Java.\n -Xverify Imposta la modalit\u00E0 del verificatore bytecode.\n --add-reads:<modulo>=<modulo destinazione>(,<modulo destinazione>)*\n Aggiorna <modulo> per leggere <modulo destinazione>, indipendentemente\n dalla dichiarazione del modulo.\n <modulo destinazione> pu\u00F2 essere ALL-UNNAMED per leggere tutti i\n moduli senza nome.\n -add-exports:<modulo>/<package>=<modulo destinazione>(,<modulo destinazione>)*\n Aggiorna <modulo> per esportare <package> in <modulo destinazione>,\n indipendentemente dalla dichiarazione del modulo.\n <modulo destinazione> pu\u00F2 essere ALL-UNNAMED per esportare tutti i\n moduli senza nome.\n --add-opens <modulo>/<package>=<modulo destinazione>(,<modulo destinazione>)*\n Aggiorna <modulo> per aprire <package> in\n <modulo destinazione>, indipendentemente dalla dichiarazione del modulo.\n --permit-illegal-access\n Permette l''accesso non consentito ai membri dei tipi nei moduli denominati\n mediante codice in moduli senza nome. Questa opzione di compatibilit\u00E0 verr\u00E0\n rimossa nella release successiva.\n --limit-modules <nome modulo>[,<nome modulo>...]\n Limita l''universo di moduli osservabili\n -patch-module <modulo>=<file>({0}<file>)*\n Sostituisce o migliora un modulo con \
+java.launcher.X.usage=\n -Xbatch Disabilita la compilazione in background.\n -Xbootclasspath/a:<directory e file zip/jar separati da {0}>\n Aggiunge alla fine del classpath di bootstrap.\n -Xcheck:jni Esegue controlli aggiuntivi per le funzioni JNI.\n -Xcomp Forza la compilazione dei metodi al primo richiamo.\n -Xdebug Fornito per la compatibilit\u00E0 con le versioni precedenti.\n -Xdiag Mostra ulteriori messaggi diagnostici.\n -Xfuture Abilita i controlli pi\u00F9 limitativi anticipando le impostazioni predefinite future.\n -Xint Esecuzione solo in modalit\u00E0 convertita.\n -Xinternalversion\n Visualizza informazioni pi\u00F9 dettagliate sulla versione JVM rispetto\n all''opzione -version.\n -Xloggc:<file> Registra lo stato GC in un file con indicatori orari.\n -Xmixed Esecuzione in modalit\u00E0 mista (impostazione predefinita).\n -Xmn<dimensione> Imposta le dimensioni iniziale e massima (in byte) dell''heap\n per la young generation (nursery).\n -Xms<dimensione> Imposta la dimensione heap Java iniziale.\n -Xmx<dimensione> Imposta la dimensione heap Java massima.\n -Xnoclassgc Disabilta la garbage collection della classe.\n -Xprof Visualizza i dati di profilo della CPU (non pi\u00F9 valida).\n -Xrs Riduce l''uso di segnali del sistema operativo da Java/VM (vedere la documentazione).\n -Xshare:auto Utilizza i dati di classe condivisi se possibile (impostazione predefinita).\n -Xshare:off Non tenta di utilizzare i dati di classe condivisi.\n -Xshare:on Richiede l''uso dei dati di classe condivisi, altrimenti l''esecuzione non riesce.\n -XshowSettings Mostra tutte le impostazioni e continua.\n -XshowSettings:all\n Mostra tutte le impostazioni e continua.\n -XshowSettings:locale\n Mostra tutte le impostazioni correlate alle impostazioni nazionali e continua.\n -XshowSettings:properties\n Mostra tutte le impostazioni delle propriet\u00E0 e continua.\n -XshowSettings:vm Mostra tutte le impostazioni correlate alla VM e continua.\n -Xss<dimensione> Imposta la dimensione dello stack di thread Java.\n -Xverify Imposta la modalit\u00E0 del verificatore bytecode.\n --add-reads:<modulo>=<modulo destinazione>(,<modulo destinazione>)*\n Aggiorna <modulo> per leggere <modulo destinazione>, indipendentemente\n dalla dichiarazione del modulo.\n <modulo destinazione> pu\u00F2 essere ALL-UNNAMED per leggere tutti i\n moduli senza nome.\n -add-exports:<modulo>/<package>=<modulo destinazione>(,<modulo destinazione>)*\n Aggiorna <modulo> per esportare <package> in <modulo destinazione>,\n indipendentemente dalla dichiarazione del modulo.\n <modulo destinazione> pu\u00F2 essere ALL-UNNAMED per esportare tutti i\n moduli senza nome.\n --add-opens <modulo>/<package>=<modulo destinazione>(,<modulo destinazione>)*\n Aggiorna <modulo> per aprire <package> in\n <modulo destinazione>, indipendentemente dalla dichiarazione del modulo.\n --limit-modules <nome modulo>[,<nome modulo>...]\n Limita l''universo di moduli osservabili\n -patch-module <modulo>=<file>({0}<file>)*\n Sostituisce o migliora un modulo con \
classi e risorse\n in file JAR o directory.\n --disable-@files Disabilita l''ulteriore espansione di file argomenti.\n\nQueste opzioni non standard sono soggette a modifiche senza preavviso.\n
# Translators please note do not translate the options themselves
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ja.properties Mon Jul 17 09:13:49 2017 -0700
@@ -37,7 +37,7 @@
# Translators please note do not translate the options themselves
java.launcher.X.usage=\n -Xbatch \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xbootclasspath/a:<{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304A\u3088\u3073zip/jar\u30D5\u30A1\u30A4\u30EB>\n \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3059\u308B\n -Xcheck:jni JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3059\u308B\n -Xcomp \u521D\u56DE\u547C\u51FA\u3057\u6642\u306B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5F37\u5236\u3059\u308B\n -Xdebug \u4E0B\u4F4D\u4E92\u63DB\u6027\u306E\u305F\u3081\u306B\u63D0\u4F9B\n -Xdiag \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\n -Xfuture \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3059\u308B\n -Xint \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n -Xinternalversion\n -version\u30AA\u30D7\u30B7\u30E7\u30F3\u3088\u308A\u8A73\u7D30\u306AJVM\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\n \u8868\u793A\u3059\u308B\n -Xloggc:<file> \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3059\u308B\n -Xmixed \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xmn<size> \u82E5\u3044\u4E16\u4EE3(\u30CA\u30FC\u30B5\u30EA)\u306E\u30D2\u30FC\u30D7\u306E\u521D\u671F\u304A\u3088\u3073\u6700\u5927\u30B5\u30A4\u30BA(\u30D0\u30A4\u30C8\u5358\u4F4D)\n \u3092\u8A2D\u5B9A\u3059\u308B\n -Xms<size> Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xmx<size> Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xnoclassgc \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n -Xprof CPU\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u30FB\u30C7\u30FC\u30BF\u3092\u51FA\u529B\u3059\u308B\n -Xrs Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3059\u308B(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n -Xshare:auto \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)\n -Xshare:off \u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u306A\u3044\n -Xshare:on \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3059\u308B\u3002\n -XshowSettings \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:all\n \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:locale\n \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:properties\n \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n -XshowSettings:vm \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n \
--Xss<size> Java\u306E\u30B9\u30EC\u30C3\u30C9\u30FB\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xverify \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u691C\u8A3C\u6A5F\u80FD\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3059\u308B\n --add-reads <module>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\n \u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n \u8AAD\u307F\u53D6\u308C\u307E\u3059\u3002\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066\n <package>\u3092<target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n --permit-illegal-access\n \u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30B3\u30FC\u30C9\u306B\u3088\u308B\u3001\u540D\u524D\u306E\u3042\u308B\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30BF\u30A4\u30D7\u306E\u30E1\u30F3\u30D0\u30FC\u3078\u306E\u4E0D\u6B63\u30A2\u30AF\u30BB\u30B9\u3092\n \u8A31\u53EF\u3057\u307E\u3059\u3002\u3053\u306E\u4E92\u63DB\u6027\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001\u6B21\u306E\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u307E\u3059\u3002\n --limit-modules <module name>[,<module name>...]\n \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n --patch-module <module>=<file>({0}<file>)*\n JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\n --disable-@files \u3055\u3089\u306A\u308B\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n\n\u3053\u308C\u3089\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u304F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n
+-Xss<size> Java\u306E\u30B9\u30EC\u30C3\u30C9\u30FB\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n -Xverify \u30D0\u30A4\u30C8\u30B3\u30FC\u30C9\u691C\u8A3C\u6A5F\u80FD\u306E\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3059\u308B\n --add-reads <module>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<target-module>\n \u3092\u8AAD\u307F\u53D6\u308A\u307E\u3059\u3002 \n <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\n \u8AAD\u307F\u53D6\u308C\u307E\u3059\u3002\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066<package>\u3092<target-module>\u306B\n \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\n <target-module>\u3092ALL-UNNAMED\u306B\u8A2D\u5B9A\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u540D\u524D\u306E\u306A\u3044\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\n \u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3067\u304D\u307E\u3059\u3002\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n \u30E2\u30B8\u30E5\u30FC\u30EB\u5BA3\u8A00\u306B\u95A2\u4FC2\u306A\u304F\u3001<module>\u3092\u66F4\u65B0\u3057\u3066\n <package>\u3092<target-module>\u306B\u958B\u304D\u307E\u3059\u3002\n --limit-modules <module name>[,<module name>...]\n \u53C2\u7167\u53EF\u80FD\u306A\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u9818\u57DF\u3092\u5236\u9650\u3057\u307E\u3059\n --patch-module <module>=<file>({0}<file>)*\n JAR\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30EA\u30BD\u30FC\u30B9\u3067\n \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u62E1\u5F35\u3057\u307E\u3059\n --disable-@files \u3055\u3089\u306A\u308B\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\n\n\u3053\u308C\u3089\u306E\u8FFD\u52A0\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u4E88\u544A\u306A\u304F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n
# Translators please note do not translate the options themselves
java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FMac OS X\u56FA\u6709\u3067\u3059:\n -XstartOnFirstThread\n main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n -Xdock:name=<application name>\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n -Xdock:icon=<path to icon file>\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_ko.properties Mon Jul 17 09:13:49 2017 -0700
@@ -36,7 +36,7 @@
# Translators please note do not translate the options themselves
java.launcher.X.usage=\n -Xbatch \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xbootclasspath/a:<{0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC \uBC0F zip/jar \uD30C\uC77C>\n \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n -Xcheck:jni JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n -Xcomp \uCCAB\uBC88\uC9F8 \uD638\uCD9C\uC5D0\uC11C \uBA54\uC18C\uB4DC \uCEF4\uD30C\uC77C\uC744 \uAC15\uC81C\uD569\uB2C8\uB2E4.\n -Xdebug \uC5ED \uD638\uD658\uC131\uC744 \uC704\uD574 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\n -Xdiag \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n -Xfuture \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xint \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n -Xinternalversion\n -version \uC635\uC158\uBCF4\uB2E4 \uC0C1\uC138\uD55C JVM \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n -Xloggc:<\uD30C\uC77C> \uC2DC\uAC04 \uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n -Xmixed \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xmn<\uD06C\uAE30> \uC80A\uC740 \uC138\uB300(Nursery)\uB97C \uC704\uD574 \uD799\uC758 \uCD08\uAE30 \uBC0F \uCD5C\uB300\n \uD06C\uAE30(\uBC14\uC774\uD2B8)\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xms<\uD06C\uAE30> \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xmx<\uD06C\uAE30> \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xnoclassgc \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xprof CPU \uD504\uB85C\uD30C\uC77C \uC791\uC131 \uB370\uC774\uD130\uB97C \uCD9C\uB825\uD569\uB2C8\uB2E4(\uC0AC\uC6A9\uB418\uC9C0 \uC54A\uC74C).\n -Xrs Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n -Xshare:auto \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n -Xshare:off \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -Xshare:on \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n -XshowSettings \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:all\n \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:locale\n \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:properties\n \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n -Xss<\uD06C\uAE30> Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n -Xverify \uBC14\uC774\uD2B8\uCF54\uB4DC \uAC80\uC99D\uC790\uC758 \uBAA8\uB4DC\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n \
- --add-reads <\uBAA8\uB4C8>=<\uB300\uC0C1-\uBAA8\uB4C8>(,<\uB300\uC0C1-\uBAA8\uB4C8>)*\n \uBAA8\uB4C8 \uC120\uC5B8\uC5D0 \uAD00\uACC4\uC5C6\uC774 <\uB300\uC0C1-\uBAA8\uB4C8>\uC744 \uC77D\uB3C4\uB85D\n <\uBAA8\uB4C8>\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n <\uB300\uC0C1-\uBAA8\uB4C8>\uC740 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC740 \uBAA8\uB4E0 \uBAA8\uB4C8\uC744 \uC77D\uC744 \uC218 \uC788\uB294\n ALL-UNNAMED\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n --add-exports <\uBAA8\uB4C8>/<\uD328\uD0A4\uC9C0>=<\uB300\uC0C1-\uBAA8\uB4C8>(,<\uB300\uC0C1-\uBAA8\uB4C8>)*\n \uBAA8\uB4C8 \uC120\uC5B8\uC5D0 \uAD00\uACC4\uC5C6\uC774 <\uD328\uD0A4\uC9C0>\uB97C <\uB300\uC0C1-\uBAA8\uB4C8>\uB85C \uC775\uC2A4\uD3EC\uD2B8\uD558\uB3C4\uB85D\n <\uBAA8\uB4C8>\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n <\uB300\uC0C1-\uBAA8\uB4C8>\uC740 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC740 \uBAA8\uB4E0 \uBAA8\uB4C8\uB85C \uC775\uC2A4\uD3EC\uD2B8\uD560 \uC218 \uC788\uB294\n ALL-UNNAMED\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n --add-opens <\uBAA8\uB4C8>/<\uD328\uD0A4\uC9C0>=<\uB300\uC0C1-\uBAA8\uB4C8>(,<\uB300\uC0C1-\uBAA8\uB4C8>)*\n \uBAA8\uB4C8 \uC120\uC5B8\uC5D0 \uAD00\uACC4\uC5C6\uC774 <\uD328\uD0A4\uC9C0>\uB97C <\uB300\uC0C1-\uBAA8\uB4C8>\uB85C \uC5F4\uB3C4\uB85D\n <\uBAA8\uB4C8>\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n --permit-illegal-access\n \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC740 \uBAA8\uB4C8\uC758 \uCF54\uB4DC\uB97C \uC0AC\uC6A9\uD558\uC5EC \uC774\uB984\uC774 \uC9C0\uC815\uB41C\n \uBAA8\uB4C8\uC758 \uC720\uD615 \uBA64\uBC84\uC5D0 \uB300\uD55C \uC798\uBABB\uB41C \uC561\uC138\uC2A4\uB97C \uD5C8\uC6A9\uD569\uB2C8\uB2E4. \uC774 \uD638\uD658\uC131\n \uC635\uC158\uC740 \uB2E4\uC74C \uB9B4\uB9AC\uC2A4\uC5D0\uC11C \uC81C\uAC70\uB429\uB2C8\uB2E4.\n --limit-modules <\uBAA8\uB4C8 \uC774\uB984>[,<\uBAA8\uB4C8 \uC774\uB984>...]\n \uAD00\uCC30 \uAC00\uB2A5\uD55C \uBAA8\uB4C8\uC758 \uACF5\uC6A9\uC744 \uC81C\uD55C\uD569\uB2C8\uB2E4.\n --patch-module <\uBAA8\uB4C8>=<\uD30C\uC77C>({0}<\uD30C\uC77C>)*\n JAR \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uC758 \uD074\uB798\uC2A4\uC640 \uB9AC\uC18C\uC2A4\uB85C\n \uBAA8\uB4C8\uC744 \uBB34\uD6A8\uD654\uD558\uAC70\uB098 \uC778\uC218\uD654\uD569\uB2C8\uB2E4.\n --disable-@files \uCD94\uAC00 \uC778\uC218 \uD30C\uC77C \uD655\uC7A5\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\n\uC774\uB7EC\uD55C \uCD94\uAC00 \uC635\uC158\uC740 \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
+ --add-reads <\uBAA8\uB4C8>=<\uB300\uC0C1-\uBAA8\uB4C8>(,<\uB300\uC0C1-\uBAA8\uB4C8>)*\n \uBAA8\uB4C8 \uC120\uC5B8\uC5D0 \uAD00\uACC4\uC5C6\uC774 <\uB300\uC0C1-\uBAA8\uB4C8>\uC744 \uC77D\uB3C4\uB85D\n <\uBAA8\uB4C8>\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n <\uB300\uC0C1-\uBAA8\uB4C8>\uC740 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC740 \uBAA8\uB4E0 \uBAA8\uB4C8\uC744 \uC77D\uC744 \uC218 \uC788\uB294\n ALL-UNNAMED\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n --add-exports <\uBAA8\uB4C8>/<\uD328\uD0A4\uC9C0>=<\uB300\uC0C1-\uBAA8\uB4C8>(,<\uB300\uC0C1-\uBAA8\uB4C8>)*\n \uBAA8\uB4C8 \uC120\uC5B8\uC5D0 \uAD00\uACC4\uC5C6\uC774 <\uD328\uD0A4\uC9C0>\uB97C <\uB300\uC0C1-\uBAA8\uB4C8>\uB85C \uC775\uC2A4\uD3EC\uD2B8\uD558\uB3C4\uB85D\n <\uBAA8\uB4C8>\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n <\uB300\uC0C1-\uBAA8\uB4C8>\uC740 \uC774\uB984\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC740 \uBAA8\uB4E0 \uBAA8\uB4C8\uB85C \uC775\uC2A4\uD3EC\uD2B8\uD560 \uC218 \uC788\uB294\n ALL-UNNAMED\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n --add-opens <\uBAA8\uB4C8>/<\uD328\uD0A4\uC9C0>=<\uB300\uC0C1-\uBAA8\uB4C8>(,<\uB300\uC0C1-\uBAA8\uB4C8>)*\n \uBAA8\uB4C8 \uC120\uC5B8\uC5D0 \uAD00\uACC4\uC5C6\uC774 <\uD328\uD0A4\uC9C0>\uB97C <\uB300\uC0C1-\uBAA8\uB4C8>\uB85C \uC5F4\uB3C4\uB85D\n <\uBAA8\uB4C8>\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n --limit-modules <\uBAA8\uB4C8 \uC774\uB984>[,<\uBAA8\uB4C8 \uC774\uB984>...]\n \uAD00\uCC30 \uAC00\uB2A5\uD55C \uBAA8\uB4C8\uC758 \uACF5\uC6A9\uC744 \uC81C\uD55C\uD569\uB2C8\uB2E4.\n --patch-module <\uBAA8\uB4C8>=<\uD30C\uC77C>({0}<\uD30C\uC77C>)*\n JAR \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uC758 \uD074\uB798\uC2A4\uC640 \uB9AC\uC18C\uC2A4\uB85C\n \uBAA8\uB4C8\uC744 \uBB34\uD6A8\uD654\uD558\uAC70\uB098 \uC778\uC218\uD654\uD569\uB2C8\uB2E4.\n --disable-@files \uCD94\uAC00 \uC778\uC218 \uD30C\uC77C \uD655\uC7A5\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\n\uC774\uB7EC\uD55C \uCD94\uAC00 \uC635\uC158\uC740 \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
# Translators please note do not translate the options themselves
java.launcher.X.macosx.usage=\n\uB2E4\uC74C\uC740 Mac OS X\uC5D0 \uD2B9\uC815\uB41C \uC635\uC158\uC785\uB2C8\uB2E4.\n -XstartOnFirstThread\n \uCCAB\uBC88\uC9F8 (AppKit) \uC2A4\uB808\uB4DC\uC5D0 main() \uBA54\uC18C\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4.\n -Xdock:name=<application name>\n \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC560\uD50C\uB9AC\uCF00\uC774\uC158 \uC774\uB984\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n -Xdock:icon=<path to icon file>\n \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC544\uC774\uCF58\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n\n
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_pt_BR.properties Mon Jul 17 09:13:49 2017 -0700
@@ -35,7 +35,7 @@
mostra a tela inicial com a imagem especificada\n Imagens HiDPI dimensionadas s\u00E3o suportadas automaticamente e utilizadas,\n se dispon\u00EDveis. O nome do arquivo de imagem n\u00E3o dimensionada, por exemplo, image.ext,\n deve ser informado sempre como argumento para a op\u00E7\u00E3o -splash.\n A imagem dimensionada mais apropriada fornecida ser\u00E1 selecionada\n automaticamente.\n Consulte a documenta\u00E7\u00E3o da API de Tela Inicial para obter mais informa\u00E7\u00F5es\n @arquivos de argumento\n Um ou mais arquivos de argumentos que cont\u00EAm op\u00E7\u00F5es\n -disable-@files\n impede expans\u00E3o adicional de arquivo de argumentos\nnPara especificar um argumento para uma op\u00E7\u00E3o longa, voc\u00EA pode usar --<name>=<value> ou\n--<name> <value>.\n
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\n -Xbatch desativa compila\u00E7\u00E3o em segundo plano\n -Xbootclasspath/a:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n anexa ao final do caminho de classe de bootstrap\n -Xcheck:jni executa verifica\u00E7\u00F5es adicionais de fun\u00E7\u00F5es JNI\n -Xcomp for\u00E7a a compila\u00E7\u00E3o de m\u00E9todos na primeira chamada\n -Xdebug fornecido para compatibilidade reversa\n -Xdiag mostra mensagens adicionais de diagn\u00F3stico\n -Xfuture ativa verifica\u00E7\u00F5es de n\u00EDvel m\u00E1ximo, antecipando padr\u00E3o futuro\n -Xint somente execu\u00E7\u00E3o de modo interpretado\n -Xinternalversion\n exibe informa\u00E7\u00F5es mais detalhadas da vers\u00E3o da JVM do que a\n op\u00E7\u00E3o -version\n -Xloggc:<file> registra status de GC em um arquivo com timestamps\n -Xmixed execu\u00E7\u00E3o em modo misto (padr\u00E3o)\n -Xmn<size> define o tamanho inicial e m\u00E1ximo (em bytes) do heap\n para a gera\u00E7\u00E3o jovem (infantil)\n -Xms<size> define tamanho inicial do heap Java\n -Xmx<size> define tamanho m\u00E1ximo do heap Java\n -Xnoclassgc desativa coleta de lixo de classe\n -Xprof gera dados de perfil de cpu (obsoleto)\n -Xrs reduz uso de sinais do SO por Java/VM (ver documenta\u00E7\u00E3o)\n -Xshare:auto usa dados de classe compartilhados se poss\u00EDvel (padr\u00E3o)\n -Xshare:off n\u00E3o tenta usar dados de classe compartilhados\n -Xshare:on exige o uso de dados de classe compartilhados; caso contr\u00E1rio, falhar\u00E1.\n -XshowSettings mostra todas as defini\u00E7\u00F5es e continua\n -XshowSettings:all\n mostra todas as defini\u00E7\u00F5es e continua\n -XshowSettings:locale\n mostra todas as defini\u00E7\u00F5es relacionadas \u00E0 configura\u00E7\u00E3o regional e continua\n -XshowSettings:properties\n mostra todas as defini\u00E7\u00F5es de propriedade e continua\n -XshowSettings:vm mostra todas as defini\u00E7\u00F5es relacionadas a vm e continua\n -Xss<size> define o tamanho da pilha de thread java\n -Xverify define o modo do verificador de c\u00F3digo de byte\n --add-reads <module>=<target-module>(,<target-module>)*\n atualiza <module> para ler <target-module>, independentemente\n da declara\u00E7\u00E3o de m\u00F3dulo. \n <target-module> pode ser ALL-UNNAMED para ler todos os m\u00F3dulos\n sem nome.\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n atualiza <module> para exportar <package> para <target-module>,\n independentemente da declara\u00E7\u00E3o de m\u00F3dulo.\n <target-module> pode ser ALL-UNNAMED para exportar todos os\n m\u00F3dulos sem nome.\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n atualiza <module> para abrir <package> para\n <target-module>, independentemente da declara\u00E7\u00E3o de m\u00F3dulo.\n --permit-illegal-access\n permite acesso inv\u00E1lido aos membros dos tipos nos m\u00F3dulos com nome\n por c\u00F3digo nos m\u00F3dulos sem nomes. Esta op\u00E7\u00E3o de compatibilidade ser\u00E1\n removida na pr\u00F3xima release.\n --limit-modules <module name>[,<module name>...]\n limita o universo de m\u00F3dulos observ\u00E1veis\n--patch-module <module>=<file>({0}<file>)*\n substitui ou amplia um m\u00F3dulo com classes e recursos\n em arquivos ou \
+java.launcher.X.usage=\n -Xbatch desativa compila\u00E7\u00E3o em segundo plano\n -Xbootclasspath/a:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n anexa ao final do caminho de classe de bootstrap\n -Xcheck:jni executa verifica\u00E7\u00F5es adicionais de fun\u00E7\u00F5es JNI\n -Xcomp for\u00E7a a compila\u00E7\u00E3o de m\u00E9todos na primeira chamada\n -Xdebug fornecido para compatibilidade reversa\n -Xdiag mostra mensagens adicionais de diagn\u00F3stico\n -Xfuture ativa verifica\u00E7\u00F5es de n\u00EDvel m\u00E1ximo, antecipando padr\u00E3o futuro\n -Xint somente execu\u00E7\u00E3o de modo interpretado\n -Xinternalversion\n exibe informa\u00E7\u00F5es mais detalhadas da vers\u00E3o da JVM do que a\n op\u00E7\u00E3o -version\n -Xloggc:<file> registra status de GC em um arquivo com timestamps\n -Xmixed execu\u00E7\u00E3o em modo misto (padr\u00E3o)\n -Xmn<size> define o tamanho inicial e m\u00E1ximo (em bytes) do heap\n para a gera\u00E7\u00E3o jovem (infantil)\n -Xms<size> define tamanho inicial do heap Java\n -Xmx<size> define tamanho m\u00E1ximo do heap Java\n -Xnoclassgc desativa coleta de lixo de classe\n -Xprof gera dados de perfil de cpu (obsoleto)\n -Xrs reduz uso de sinais do SO por Java/VM (ver documenta\u00E7\u00E3o)\n -Xshare:auto usa dados de classe compartilhados se poss\u00EDvel (padr\u00E3o)\n -Xshare:off n\u00E3o tenta usar dados de classe compartilhados\n -Xshare:on exige o uso de dados de classe compartilhados; caso contr\u00E1rio, falhar\u00E1.\n -XshowSettings mostra todas as defini\u00E7\u00F5es e continua\n -XshowSettings:all\n mostra todas as defini\u00E7\u00F5es e continua\n -XshowSettings:locale\n mostra todas as defini\u00E7\u00F5es relacionadas \u00E0 configura\u00E7\u00E3o regional e continua\n -XshowSettings:properties\n mostra todas as defini\u00E7\u00F5es de propriedade e continua\n -XshowSettings:vm mostra todas as defini\u00E7\u00F5es relacionadas a vm e continua\n -Xss<size> define o tamanho da pilha de thread java\n -Xverify define o modo do verificador de c\u00F3digo de byte\n --add-reads <module>=<target-module>(,<target-module>)*\n atualiza <module> para ler <target-module>, independentemente\n da declara\u00E7\u00E3o de m\u00F3dulo. \n <target-module> pode ser ALL-UNNAMED para ler todos os m\u00F3dulos\n sem nome.\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n atualiza <module> para exportar <package> para <target-module>,\n independentemente da declara\u00E7\u00E3o de m\u00F3dulo.\n <target-module> pode ser ALL-UNNAMED para exportar todos os\n m\u00F3dulos sem nome.\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n atualiza <module> para abrir <package> para\n <target-module>, independentemente da declara\u00E7\u00E3o de m\u00F3dulo.\n --limit-modules <module name>[,<module name>...]\n limita o universo de m\u00F3dulos observ\u00E1veis\n--patch-module <module>=<file>({0}<file>)*\n substitui ou amplia um m\u00F3dulo com classes e recursos\n em arquivos ou \
diret\u00F3rios JAR.\n\nEssas op\u00E7\u00F5es extras est\u00E3o sujeitas a altera\u00E7\u00E3o sem aviso.\n
# Translators please note do not translate the options themselves
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_sv.properties Mon Jul 17 09:13:49 2017 -0700
@@ -35,7 +35,7 @@
tillg\u00E4ngliga. Filnamnet p\u00E5 den oskal\u00E4ndrade bilden, t.ex. image.ext,\n ska alltid \u00F6verf\u00F6ras som argument till alternativet -splash.\n Den l\u00E4mpligaste skal\u00E4ndrade bilden v\u00E4ljs\n automatiskt.\n Mer information finns i dokumentationen f\u00F6r API:t SplashScreen\n @argument filer\n en eller flera argumentfiler som inneh\u00E5ller alternativ\n -disable-@files\n f\u00F6rhindra ytterligare ut\u00F6kning av argumentfiler\nOm du vill ange ett argument f\u00F6r ett l\u00E5ngt alternativ kan du anv\u00E4nda --<namn>=<v\u00E4rde> eller\n--<namn> <v\u00E4rde>.\n
# Translators please note do not translate the options themselves
-java.launcher.X.usage=\n -Xbatch avaktivera bakgrundskompilering\n -Xbootclasspath/a:<kataloger och zip-/jar-filer avgr\u00E4nsade med {0}>\n l\u00E4gg till sist i klass\u00F6kv\u00E4gen f\u00F6r programladdning\n -Xcheck:jni utf\u00F6r fler kontroller f\u00F6r JNI-funktioner\n -Xcomp tvingar kompilering av metoder vid det f\u00F6rsta anropet\n -Xdebug tillhandah\u00E5lls f\u00F6r bak\u00E5tkompatibilitet\n -Xdiag visa fler diagnostiska meddelanden\n -Xfuture aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n -Xint endast exekvering i tolkat l\u00E4ge\n -Xinternalversion\n visar mer detaljerad information om JVM-version \u00E4n\n alternativet -version\n -Xloggc:<fil> logga GC-status till en fil med tidsst\u00E4mplar\n -Xmixed exekvering i blandat l\u00E4ge (standard)\n -Xmn<storlek> anger ursprunglig och maximal storlek (i byte) f\u00F6r h\u00F6gen f\u00F6r\n generationen med nyare objekt (h\u00F6gen f\u00F6r tilldelning av nya objekt)\n -Xms<storlek> ange ursprunglig storlek f\u00F6r Java-heap-utrymmet\n -Xmx<storlek> ange st\u00F6rsta storlek f\u00F6r Java-heap-utrymmet\n -Xnoclassgc avaktivera klasskr\u00E4pinsamling\n -Xprof utdata f\u00F6r processorprofilering (inaktuellt)\n -Xrs minska operativsystemssignalanv\u00E4ndning f\u00F6r Java/VM (se dokumentationen)\n -Xshare:auto anv\u00E4nd delade klassdata om m\u00F6jligt (standard)\n -Xshare:off f\u00F6rs\u00F6k inte anv\u00E4nda delade klassdata\n -Xshare:on kr\u00E4v anv\u00E4ndning av delade klassdata, utf\u00F6r inte i annat fall.\n -XshowSettings visa alla inst\u00E4llningar och forts\u00E4tt\n -XshowSettings:all\n visa alla inst\u00E4llningar och forts\u00E4tt\n -XshowSettings:locale\n visa alla spr\u00E5kkonventionsrelaterade inst\u00E4llningar och forts\u00E4tt\n -XshowSettings:properties\n visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n -Xss<storlek> ange storlek f\u00F6r java-tr\u00E5dsstacken\n -Xverify anger l\u00E4ge f\u00F6r bytekodverifieraren\n --add-reads <modul>=<m\u00E5lmodul>(,<m\u00E5lmodul>)*\n uppdaterar <modul> f\u00F6r att l\u00E4sa <m\u00E5lmodul>, oavsett\n moduldeklarationen. \n <m\u00E5lmodul> kan vara ALL-UNNAMED f\u00F6r att l\u00E4sa alla\n ej namngivna moduler.\n --add-exports <modul>/<paket>=<m\u00E5lmodul>(,<m\u00E5lmodul>)*\n uppdaterar <modul> f\u00F6r att exportera <paket> till <m\u00E5lmodul>,\n oavsett moduldeklarationen.\n <m\u00E5lmodul> kan vara ALL-UNNAMED f\u00F6r att exportera till alla\n ej namngivna moduler.\n --add-opens <modul>/<paket>=<m\u00E5lmodul>(,<m\u00E5lmodul>)*\n uppdaterar <modul> f\u00F6r att \u00F6ppna <paket> till\n <m\u00E5lmodul>, oavsett moduldeklarationen.\n --permit-illegal-access\n till\u00E5t otill\u00E5ten \u00E5tkomst till medlemmar av typer i namngivna\n moduler av kod i ej namngivna moduler. Det h\u00E4r \n kompatibilitetsalternativet tas bort i n\u00E4sta utg\u00E5va.\n --limit-modules <modulnamn>[,<modulnamn>...]\n begr\u00E4nsar universumet med observerbara moduler\n --patch-module <modul>=<fil>({0}<fil>)*\n \u00E5sidos\u00E4tt eller ut\u00F6ka en modul med klasser och resurser\n i JAR-filer eller kataloger.\n --disable-@files avaktivera ytterligare \
+java.launcher.X.usage=\n -Xbatch avaktivera bakgrundskompilering\n -Xbootclasspath/a:<kataloger och zip-/jar-filer avgr\u00E4nsade med {0}>\n l\u00E4gg till sist i klass\u00F6kv\u00E4gen f\u00F6r programladdning\n -Xcheck:jni utf\u00F6r fler kontroller f\u00F6r JNI-funktioner\n -Xcomp tvingar kompilering av metoder vid det f\u00F6rsta anropet\n -Xdebug tillhandah\u00E5lls f\u00F6r bak\u00E5tkompatibilitet\n -Xdiag visa fler diagnostiska meddelanden\n -Xfuture aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n -Xint endast exekvering i tolkat l\u00E4ge\n -Xinternalversion\n visar mer detaljerad information om JVM-version \u00E4n\n alternativet -version\n -Xloggc:<fil> logga GC-status till en fil med tidsst\u00E4mplar\n -Xmixed exekvering i blandat l\u00E4ge (standard)\n -Xmn<storlek> anger ursprunglig och maximal storlek (i byte) f\u00F6r h\u00F6gen f\u00F6r\n generationen med nyare objekt (h\u00F6gen f\u00F6r tilldelning av nya objekt)\n -Xms<storlek> ange ursprunglig storlek f\u00F6r Java-heap-utrymmet\n -Xmx<storlek> ange st\u00F6rsta storlek f\u00F6r Java-heap-utrymmet\n -Xnoclassgc avaktivera klasskr\u00E4pinsamling\n -Xprof utdata f\u00F6r processorprofilering (inaktuellt)\n -Xrs minska operativsystemssignalanv\u00E4ndning f\u00F6r Java/VM (se dokumentationen)\n -Xshare:auto anv\u00E4nd delade klassdata om m\u00F6jligt (standard)\n -Xshare:off f\u00F6rs\u00F6k inte anv\u00E4nda delade klassdata\n -Xshare:on kr\u00E4v anv\u00E4ndning av delade klassdata, utf\u00F6r inte i annat fall.\n -XshowSettings visa alla inst\u00E4llningar och forts\u00E4tt\n -XshowSettings:all\n visa alla inst\u00E4llningar och forts\u00E4tt\n -XshowSettings:locale\n visa alla spr\u00E5kkonventionsrelaterade inst\u00E4llningar och forts\u00E4tt\n -XshowSettings:properties\n visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n -Xss<storlek> ange storlek f\u00F6r java-tr\u00E5dsstacken\n -Xverify anger l\u00E4ge f\u00F6r bytekodverifieraren\n --add-reads <modul>=<m\u00E5lmodul>(,<m\u00E5lmodul>)*\n uppdaterar <modul> f\u00F6r att l\u00E4sa <m\u00E5lmodul>, oavsett\n moduldeklarationen. \n <m\u00E5lmodul> kan vara ALL-UNNAMED f\u00F6r att l\u00E4sa alla\n ej namngivna moduler.\n --add-exports <modul>/<paket>=<m\u00E5lmodul>(,<m\u00E5lmodul>)*\n uppdaterar <modul> f\u00F6r att exportera <paket> till <m\u00E5lmodul>,\n oavsett moduldeklarationen.\n <m\u00E5lmodul> kan vara ALL-UNNAMED f\u00F6r att exportera till alla\n ej namngivna moduler.\n --add-opens <modul>/<paket>=<m\u00E5lmodul>(,<m\u00E5lmodul>)*\n uppdaterar <modul> f\u00F6r att \u00F6ppna <paket> till\n <m\u00E5lmodul>, oavsett moduldeklarationen.\n --limit-modules <modulnamn>[,<modulnamn>...]\n begr\u00E4nsar universumet med observerbara moduler\n --patch-module <modul>=<fil>({0}<fil>)*\n \u00E5sidos\u00E4tt eller ut\u00F6ka en modul med klasser och resurser\n i JAR-filer eller kataloger.\n --disable-@files avaktivera ytterligare \
argumentfilsut\u00F6kning\n\nDe h\u00E4r extraalternativen kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n
# Translators please note do not translate the options themselves
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_CN.properties Mon Jul 17 09:13:49 2017 -0700
@@ -36,7 +36,7 @@
# Translators please note do not translate the options themselves
java.launcher.X.usage=\n -Xbatch \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n -Xbootclasspath/a:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n -Xcheck:jni \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n -Xcomp \u5728\u9996\u6B21\u8C03\u7528\u65F6\u5F3A\u5236\u4F7F\u7528\u7684\u7F16\u8BD1\u65B9\u6CD5\n -Xdebug \u4E3A\u5B9E\u73B0\u5411\u540E\u517C\u5BB9\u800C\u63D0\u4F9B\n -Xdiag \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n -Xfuture \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5, \u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\n -Xint \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n -Xinternalversion\n \u663E\u793A\u6BD4 -version \u9009\u9879\u66F4\u8BE6\u7EC6\u7684 JVM\n \u7248\u672C\u4FE1\u606F\n -Xloggc:<\u6587\u4EF6> \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D (\u5E26\u65F6\u95F4\u6233)\n -Xmixed \u6DF7\u5408\u6A21\u5F0F\u6267\u884C (\u9ED8\u8BA4\u503C)\n -Xmn<\u5927\u5C0F> \u4E3A\u5E74\u8F7B\u4EE3 (\u65B0\u751F\u4EE3) \u8BBE\u7F6E\u521D\u59CB\u548C\u6700\u5927\u5806\u5927\u5C0F\n (\u4EE5\u5B57\u8282\u4E3A\u5355\u4F4D)\n -Xms<\u5927\u5C0F> \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n -Xmx<\u5927\u5C0F> \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n -Xnoclassgc \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n -Xprof \u8F93\u51FA cpu \u5206\u6790\u6570\u636E (\u5DF2\u8FC7\u65F6)\n -Xrs \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528 (\u8BF7\u53C2\u9605\u6587\u6863)\n -Xshare:auto \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E (\u9ED8\u8BA4\u503C)\n -Xshare:off \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n -Xshare:on \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E, \u5426\u5219\u5C06\u5931\u8D25\u3002\n -XshowSettings \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:all\n \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:locale\n \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EEDe\n -XshowSettings:properties\n \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -XshowSettings:vm \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n -Xss<\u5927\u5C0F> \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n -Xverify \u8BBE\u7F6E\u5B57\u8282\u7801\u9A8C\u8BC1\u5668\u7684\u6A21\u5F0F\n --add-reads <\u6A21\u5757>=<\u76EE\u6807\u6A21\u5757>(,<\u76EE\u6807\u6A21\u5757>)*\n \u66F4\u65B0 <\u6A21\u5757> \u4EE5\u8BFB\u53D6 <\u76EE\u6807\u6A21\u5757>,\n \u800C\u65E0\u8BBA\u6A21\u5757\u58F0\u660E\u5982\u4F55\u3002\n <\u76EE\u6807\u6A21\u5757> \u53EF\u4EE5\u662F ALL-UNNAMED \u4EE5\u8BFB\u53D6\u6240\u6709\u672A\u547D\u540D\n \u6A21\u5757\u3002\n --add-exports <\u6A21\u5757>/<\u7A0B\u5E8F\u5305>=<\u76EE\u6807\u6A21\u5757>(,<\u76EE\u6807\u6A21\u5757>)*\n \u66F4\u65B0 <\u6A21\u5757> \u4EE5\u5C06 <\u7A0B\u5E8F\u5305> \u5BFC\u51FA\u5230 <\u76EE\u6807\u6A21\u5757>,\n \u800C\u65E0\u8BBA\u6A21\u5757\u58F0\u660E\u5982\u4F55\u3002\n <\u76EE\u6807\u6A21\u5757> \u53EF\u4EE5\u662F ALL-UNNAMED \u4EE5\u5BFC\u51FA\u5230\u6240\u6709\n \u672A\u547D\u540D\u6A21\u5757\u3002\n --add-opens <\u6A21\u5757>/<\u7A0B\u5E8F\u5305>=<\u76EE\u6807\u6A21\u5757>(,<\u76EE\u6807\u6A21\u5757>)*\n \u66F4\u65B0 <\u6A21\u5757> \
-\u4EE5\u5728 <\u76EE\u6807\u6A21\u5757> \u4E2D\n \u6253\u5F00 <\u7A0B\u5E8F\u5305>, \u800C\u65E0\u8BBA\u6A21\u5757\u58F0\u660E\u5982\u4F55\u3002\n --permit-illegal-access\n \u5141\u8BB8\u901A\u8FC7\u672A\u547D\u540D\u6A21\u5757\u4E2D\u7684\u4EE3\u7801\u5BF9\u547D\u540D\u6A21\u5757\u4E2D\u7684\n \u7C7B\u578B\u6210\u5458\u8FDB\u884C\u975E\u6CD5\u8BBF\u95EE\u3002\u5C06\u5728\u4E0B\u4E00\u4E2A\u53D1\u884C\u7248\u4E2D\n \u5220\u9664\u6B64\u517C\u5BB9\u6027\u9009\u9879\u3002\n --limit-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n --patch-module <\u6A21\u5757>=<\u6587\u4EF6>({0}<\u6587\u4EF6>)*\n \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n --disable-@files \u7981\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+\u4EE5\u5728 <\u76EE\u6807\u6A21\u5757> \u4E2D\n \u6253\u5F00 <\u7A0B\u5E8F\u5305>, \u800C\u65E0\u8BBA\u6A21\u5757\u58F0\u660E\u5982\u4F55\u3002\n --limit-modules <\u6A21\u5757\u540D\u79F0>[,<\u6A21\u5757\u540D\u79F0>...]\n \u9650\u5236\u53EF\u89C2\u5BDF\u6A21\u5757\u7684\u9886\u57DF\n --patch-module <\u6A21\u5757>=<\u6587\u4EF6>({0}<\u6587\u4EF6>)*\n \u4F7F\u7528 JAR \u6587\u4EF6\u6216\u76EE\u5F55\u4E2D\u7684\u7C7B\u548C\u8D44\u6E90\n \u8986\u76D6\u6216\u589E\u5F3A\u6A21\u5757\u3002\n --disable-@files \u7981\u6B62\u8FDB\u4E00\u6B65\u6269\u5C55\u53C2\u6570\u6587\u4EF6\n\n\u8FD9\u4E9B\u989D\u5916\u9009\u9879\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
# Translators please note do not translate the options themselves
java.launcher.X.macosx.usage=\n\u4EE5\u4E0B\u9009\u9879\u4E3A Mac OS X \u7279\u5B9A\u7684\u9009\u9879:\n -XstartOnFirstThread\n \u5728\u7B2C\u4E00\u4E2A (AppKit) \u7EBF\u7A0B\u4E0A\u8FD0\u884C main() \u65B9\u6CD5\n -Xdock:name=<\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0>\n \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n -Xdock:icon=<\u56FE\u6807\u6587\u4EF6\u7684\u8DEF\u5F84>\n \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u56FE\u6807\n\n
--- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher_zh_TW.properties Mon Jul 17 09:13:49 2017 -0700
@@ -36,7 +36,7 @@
# Translators please note do not translate the options themselves
java.launcher.X.usage=\n -Xbatch \u505C\u7528\u80CC\u666F\u7DE8\u8B6F\n -Xbootclasspath/a:<\u4EE5 {0} \u5340\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n \u9644\u52A0\u81F3\u555F\u52D5\u5B89\u88DD\u985E\u5225\u8DEF\u5F91\u7684\u7D50\u5C3E\n -Xcheck:jni \u57F7\u884C\u984D\u5916\u7684 JNI \u51FD\u6578\u6AA2\u67E5\n -Xcomp \u5F37\u5236\u7DE8\u8B6F\u7B2C\u4E00\u500B\u547C\u53EB\u7684\u65B9\u6CD5\n -Xdebug \u91DD\u5C0D\u56DE\u6EAF\u76F8\u5BB9\u6027\u63D0\u4F9B\n -Xdiag \u986F\u793A\u984D\u5916\u7684\u8A3A\u65B7\u8A0A\u606F\n -Xfuture \u555F\u7528\u6700\u56B4\u683C\u7684\u6AA2\u67E5\uFF0C\u9810\u5148\u4F5C\u70BA\u5C07\u4F86\u7684\u9810\u8A2D\n -Xint \u50C5\u9650\u89E3\u8B6F\u6A21\u5F0F\u57F7\u884C\n -Xinternalversion\n \u986F\u793A\u6BD4 -version \u9078\u9805\u66F4\u70BA\u8A73\u7D30\u7684\n JVM \u7248\u672C\u8CC7\u8A0A\n -Xloggc:<file> \u5C07 GC \u72C0\u614B\u8A18\u9304\u81F3\u6A94\u6848\u4E14\u9023\u540C\u6642\u6233\n -Xmixed \u6DF7\u5408\u6A21\u5F0F\u57F7\u884C (\u9810\u8A2D)\n -Xmn<size> \u8A2D\u5B9A\u65B0\u751F\u4EE3 (\u990A\u6210\u5340) \u4E4B\u5806\u96C6\u7684\u8D77\u59CB\u5927\u5C0F\u548C\n \u5927\u5C0F\u4E0A\u9650 (\u4F4D\u5143\u7D44)\n -Xms<size> \u8A2D\u5B9A\u8D77\u59CB Java \u5806\u96C6\u5927\u5C0F\n -Xmx<size> \u8A2D\u5B9A Java \u5806\u96C6\u5927\u5C0F\u4E0A\u9650\n -Xnoclassgc \u505C\u7528\u985E\u5225\u8CC7\u6E90\u56DE\u6536\n -Xprof \u8F38\u51FA cpu \u5206\u6790\u8CC7\u6599 (\u5DF2\u4E0D\u518D\u4F7F\u7528)\n -Xrs \u6E1B\u5C11 Java/VM \u4F7F\u7528\u7684\u4F5C\u696D\u7CFB\u7D71\u4FE1\u865F (\u8ACB\u53C3\u95B1\u6587\u4EF6)\n -Xshare:auto \u5728\u53EF\u80FD\u7684\u60C5\u6CC1\u4E0B\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599 (\u9810\u8A2D)\n -Xshare:off \u4E0D\u5617\u8A66\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\n -Xshare:on \u9700\u8981\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\uFF0C\u5426\u5247\u6703\u5931\u6557\u3002\n -XshowSettings \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n -XshowSettings:all\n \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n -XshowSettings:locale\n \u986F\u793A\u6240\u6709\u5730\u5340\u8A2D\u5B9A\u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n -XshowSettings:properties\n \u986F\u793A\u6240\u6709\u5C6C\u6027\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n -XshowSettings:vm \u986F\u793A\u6240\u6709 VM \u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\u9032\u884C\u4F5C\u696D\n -Xss<size> \u8A2D\u5B9A Java \u57F7\u884C\u7DD2\u5806\u758A\u5927\u5C0F\n -Xverify \u8A2D\u5B9A Bytecode \u9A57\u8B49\u7A0B\u5F0F\u7684\u6A21\u5F0F\n --add-reads <module>=<target-module>(,<target-module>)*\n \u66F4\u65B0 <module> \u4EE5\u8B80\u53D6 <target-module>\uFF0C\u4E0D\u8AD6\n \u6A21\u7D44\u5BA3\u544A\u70BA\u4F55\u3002\n \u53EF\u5C07 <target-module> \u8A2D\u70BA ALL-UNNAMED \u4EE5\u8B80\u53D6\u6240\u6709\u672A\u547D\u540D\u7684\n \u6A21\u7D44\u3002\n --add-exports <module>/<package>=<target-module>(,<target-module>)*\n \u66F4\u65B0 <module> \u4EE5\u4FBF\u5C07 <package> \u532F\u51FA\u81F3 <target-module>\uFF0C\n \u4E0D\u8AD6\u6A21\u7D44\u5BA3\u544A\u70BA\u4F55\u3002\n \u53EF\u5C07 <target-module> \u8A2D\u70BA ALL-UNNAMED \u4EE5\u532F\u51FA\u81F3\u6240\u6709\n \u672A\u547D\u540D\u7684\u6A21\u7D44\u3002\n --add-opens <module>/<package>=<target-module>(,<target-module>)*\n \u66F4\u65B0 <module> \
-\u4EE5\u4FBF\u5C07 <package> \u958B\u555F\u81F3\n <target-module>\uFF0C\u4E0D\u8AD6\u6A21\u7D44\u5BA3\u544A\u70BA\u4F55\u3002\n --permit-illegal-access\n \u5141\u8A31\u672A\u547D\u540D\u6A21\u7D44\u4E2D\u7684\u7A0B\u5F0F\u78BC\u5C0D\u5DF2\u547D\u540D\u6A21\u7D44\u4E2D\u7684\n \u985E\u578B\u6210\u54E1\u9032\u884C\u975E\u6CD5\u5B58\u53D6\u3002\u6B64\u76F8\u5BB9\u6027\u9078\u9805\u5C07\u5728\n \u4E0B\u4E00\u500B\u7248\u672C\u4E2D\u79FB\u9664\u3002\n --limit-modules <module name>[,<module name>...]\n \u9650\u5236\u53EF\u76E3\u6E2C\u6A21\u7D44\u7684\u7BC4\u570D\n --patch-module <module>=<file>({0}<file>)*\n \u8986\u5BEB\u6216\u52A0\u5F37\u542B\u6709 JAR \u6A94\u6848\u6216\u76EE\u9304\u4E2D\n \u985E\u5225\u548C\u8CC7\u6E90\u7684\u6A21\u7D44\u3002\n --disable-@files \u505C\u7528\u9032\u4E00\u6B65\u7684\u5F15\u6578\u6A94\u6848\u64F4\u5145\n\n\u4E0A\u8FF0\u7684\u984D\u5916\u9078\u9805\u82E5\u6709\u8B8A\u66F4\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+\u4EE5\u4FBF\u5C07 <package> \u958B\u555F\u81F3\n <target-module>\uFF0C\u4E0D\u8AD6\u6A21\u7D44\u5BA3\u544A\u70BA\u4F55\u3002\n --limit-modules <module name>[,<module name>...]\n \u9650\u5236\u53EF\u76E3\u6E2C\u6A21\u7D44\u7684\u7BC4\u570D\n --patch-module <module>=<file>({0}<file>)*\n \u8986\u5BEB\u6216\u52A0\u5F37\u542B\u6709 JAR \u6A94\u6848\u6216\u76EE\u9304\u4E2D\n \u985E\u5225\u548C\u8CC7\u6E90\u7684\u6A21\u7D44\u3002\n --disable-@files \u505C\u7528\u9032\u4E00\u6B65\u7684\u5F15\u6578\u6A94\u6848\u64F4\u5145\n\n\u4E0A\u8FF0\u7684\u984D\u5916\u9078\u9805\u82E5\u6709\u8B8A\u66F4\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
# Translators please note do not translate the options themselves
java.launcher.X.macosx.usage=\n\u4E0B\u5217\u662F Mac OS X \u7279\u5B9A\u9078\u9805:\n -XstartOnFirstThread\n \u5728\u7B2C\u4E00\u500B (AppKit) \u57F7\u884C\u7DD2\u57F7\u884C main() \u65B9\u6CD5\n -Xdock:name=<application name>\n \u8986\u5BEB\u7D50\u5408\u8AAA\u660E\u756B\u9762\u4E2D\u986F\u793A\u7684\u9810\u8A2D\u61C9\u7528\u7A0B\u5F0F\u540D\u7A31\n -Xdock:icon=<path to icon file>\n \u8986\u5BEB\u7D50\u5408\u8AAA\u660E\u756B\u9762\u4E2D\u986F\u793A\u7684\u9810\u8A2D\u5716\u793A\n\n
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java Mon Jul 17 09:13:49 2017 -0700
@@ -302,6 +302,8 @@
Command.IMPORTPASS.setAltName("-importpassword");
}
+ // If an option is allowed multiple times, remember to record it
+ // in the optionsSet.contains() block in parseArgs().
enum Option {
ALIAS("alias", "<alias>", "alias.name.of.the.entry.to.process"),
DESTALIAS("destalias", "<alias>", "destination.alias"),
@@ -423,9 +425,31 @@
String confFile = null;
+ // Records all commands and options set. Used to check dups.
+ Set<String> optionsSet = new HashSet<>();
+
for (i=0; i < args.length; i++) {
String flags = args[i];
if (flags.startsWith("-")) {
+ String lowerFlags = flags.toLowerCase(Locale.ROOT);
+ if (optionsSet.contains(lowerFlags)) {
+ switch (lowerFlags) {
+ case "-ext":
+ case "-id":
+ case "-provider":
+ case "-addprovider":
+ case "-providerclass":
+ case "-providerarg":
+ // These options are allowed multiple times
+ break;
+ default:
+ weakWarnings.add(String.format(
+ rb.getString("option.1.set.twice"),
+ lowerFlags));
+ }
+ } else {
+ optionsSet.add(lowerFlags);
+ }
if (collator.compare(flags, "-conf") == 0) {
if (i == args.length - 1) {
errorNeedArgument(flags);
@@ -433,7 +457,15 @@
confFile = args[++i];
} else {
Command c = Command.getCommand(flags);
- if (c != null) command = c;
+ if (c != null) {
+ if (command == null) {
+ command = c;
+ } else {
+ throw new Exception(String.format(
+ rb.getString("multiple.commands.1.2"),
+ command.name, c.name));
+ }
+ }
}
}
}
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Resources.java Mon Jul 17 09:13:49 2017 -0700
@@ -42,6 +42,8 @@
// keytool: Help part
{".OPTION.", " [OPTION]..."},
{"Options.", "Options:"},
+ {"option.1.set.twice", "The %s option is specified multiple times. All except the last one will be ignored."},
+ {"multiple.commands.1.2", "Only one command is allowed: both %1$s and %2$s were specified."},
{"Use.keytool.help.for.all.available.commands",
"Use \"keytool -help\" for all available commands"},
{"Key.and.Certificate.Management.Tool",
--- a/jdk/src/java.base/share/classes/sun/security/util/AuthResources.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/AuthResources.java Mon Jul 17 09:13:49 2017 -0700
@@ -103,6 +103,7 @@
{"COLON", ": "},
{".error.adding.Permission.", ": error adding Permission "},
{"SPACE", " "},
+ {"NEWLINE", "\n"},
{".error.adding.Entry.", ": error adding Entry "},
{"LPARAM", "("},
{"RPARAM", ")"},
--- a/jdk/src/java.base/share/classes/sun/security/util/Resources.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/Resources.java Mon Jul 17 09:13:49 2017 -0700
@@ -115,6 +115,7 @@
"unable to perform substitution on alias, {0}"},
{"substitution.value.prefix.unsupported",
"substitution value, {0}, unsupported"},
+ {"SPACE", " "},
{"LPARAM", "("},
{"RPARAM", ")"},
{"type.can.t.be.null","type can't be null"},
--- a/jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -34,6 +34,9 @@
import static java.util.Locale.FilteringMode.*;
import static java.util.Locale.LanguageRange.*;
import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
/**
* Implementation for BCP47 Locale matching
@@ -126,12 +129,16 @@
return new ArrayList<String>(tags);
} else {
for (String tag : tags) {
- tag = tag.toLowerCase(Locale.ROOT);
- if (tag.startsWith(range)) {
+ // change to lowercase for case-insensitive matching
+ String lowerCaseTag = tag.toLowerCase(Locale.ROOT);
+ if (lowerCaseTag.startsWith(range)) {
int len = range.length();
- if ((tag.length() == len || tag.charAt(len) == '-')
- && !list.contains(tag)
- && !shouldIgnoreFilterBasicMatch(zeroRanges, tag)) {
+ if ((lowerCaseTag.length() == len
+ || lowerCaseTag.charAt(len) == '-')
+ && !caseInsensitiveMatch(list, lowerCaseTag)
+ && !shouldIgnoreFilterBasicMatch(zeroRanges,
+ lowerCaseTag)) {
+ // preserving the case of the input tag
list.add(tag);
}
}
@@ -152,14 +159,17 @@
private static Collection<String> removeTagsMatchingBasicZeroRange(
List<LanguageRange> zeroRange, Collection<String> tags) {
if (zeroRange.isEmpty()) {
+ tags = removeDuplicates(tags);
return tags;
}
List<String> matchingTags = new ArrayList<>();
for (String tag : tags) {
- tag = tag.toLowerCase(Locale.ROOT);
- if (!shouldIgnoreFilterBasicMatch(zeroRange, tag)) {
- matchingTags.add(tag);
+ // change to lowercase for case-insensitive matching
+ String lowerCaseTag = tag.toLowerCase(Locale.ROOT);
+ if (!shouldIgnoreFilterBasicMatch(zeroRange, lowerCaseTag)
+ && !caseInsensitiveMatch(matchingTags, lowerCaseTag)) {
+ matchingTags.add(tag); // preserving the case of the input tag
}
}
@@ -167,6 +177,26 @@
}
/**
+ * Remove duplicate tags from the given {@code tags} by
+ * ignoring case considerations.
+ */
+ private static Collection<String> removeDuplicates(
+ Collection<String> tags) {
+ Set<String> distinctTags = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+ return tags.stream().filter(x -> distinctTags.add(x))
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * Returns true if the given {@code list} contains an element which matches
+ * with the given {@code tag} ignoring case considerations.
+ */
+ private static boolean caseInsensitiveMatch(List<String> list, String tag) {
+ return list.stream().anyMatch((element)
+ -> (element.equalsIgnoreCase(tag)));
+ }
+
+ /**
* The tag which is falling in the basic exclusion range(s) should not
* be considered as the matching tag. Ignores the tag matching with the
* non-zero ranges, if the tag also matches with one of the basic exclusion
@@ -216,8 +246,9 @@
}
String[] rangeSubtags = range.split("-");
for (String tag : tags) {
- tag = tag.toLowerCase(Locale.ROOT);
- String[] tagSubtags = tag.split("-");
+ // change to lowercase for case-insensitive matching
+ String lowerCaseTag = tag.toLowerCase(Locale.ROOT);
+ String[] tagSubtags = lowerCaseTag.split("-");
if (!rangeSubtags[0].equals(tagSubtags[0])
&& !rangeSubtags[0].equals("*")) {
continue;
@@ -225,9 +256,11 @@
int rangeIndex = matchFilterExtendedSubtags(rangeSubtags,
tagSubtags);
- if (rangeSubtags.length == rangeIndex && !list.contains(tag)
- && !shouldIgnoreFilterExtendedMatch(zeroRanges, tag)) {
- list.add(tag);
+ if (rangeSubtags.length == rangeIndex
+ && !caseInsensitiveMatch(list, lowerCaseTag)
+ && !shouldIgnoreFilterExtendedMatch(zeroRanges,
+ lowerCaseTag)) {
+ list.add(tag); // preserve the case of the input tag
}
}
}
@@ -245,14 +278,17 @@
private static Collection<String> removeTagsMatchingExtendedZeroRange(
List<LanguageRange> zeroRange, Collection<String> tags) {
if (zeroRange.isEmpty()) {
+ tags = removeDuplicates(tags);
return tags;
}
List<String> matchingTags = new ArrayList<>();
for (String tag : tags) {
- tag = tag.toLowerCase(Locale.ROOT);
- if (!shouldIgnoreFilterExtendedMatch(zeroRange, tag)) {
- matchingTags.add(tag);
+ // change to lowercase for case-insensitive matching
+ String lowerCaseTag = tag.toLowerCase(Locale.ROOT);
+ if (!shouldIgnoreFilterExtendedMatch(zeroRange, lowerCaseTag)
+ && !caseInsensitiveMatch(matchingTags, lowerCaseTag)) {
+ matchingTags.add(tag); // preserve the case of the input tag
}
}
@@ -368,10 +404,11 @@
String rangeForRegex = range.replace("*", "\\p{Alnum}*");
while (rangeForRegex.length() > 0) {
for (String tag : tags) {
- tag = tag.toLowerCase(Locale.ROOT);
- if (tag.matches(rangeForRegex)
- && !shouldIgnoreLookupMatch(zeroRanges, tag)) {
- return tag;
+ // change to lowercase for case-insensitive matching
+ String lowerCaseTag = tag.toLowerCase(Locale.ROOT);
+ if (lowerCaseTag.matches(rangeForRegex)
+ && !shouldIgnoreLookupMatch(zeroRanges, lowerCaseTag)) {
+ return tag; // preserve the case of the input tag
}
}
--- a/jdk/src/java.base/unix/native/libjava/locale_str.h Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.base/unix/native/libjava/locale_str.h Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -211,6 +211,16 @@
"iqtelif", "Latn",
"latin", "Latn",
#endif
+ "Arab", "Arab",
+ "Cyrl", "Cyrl",
+ "Deva", "Deva",
+ "Ethi", "Ethi",
+ "Hans", "Hans",
+ "Hant", "Hant",
+ "Latn", "Latn",
+ "Sund", "Sund",
+ "Syrc", "Syrc",
+ "Tfng", "Tfng",
"", "",
};
--- a/jdk/src/java.management.rmi/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.management.rmi/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -27,16 +27,16 @@
* Defines the {@linkplain javax.management.remote.rmi RMI connector}
* for the Java Management Extensions (JMX) Remote API.
*
- * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
- * <dt class="simpleTagLabel">Providers:</dt>
- * <dd>This module provides
- * {@link javax.management.remote.JMXConnectorProvider} service
- * that creates the JMX connector clients using RMI protocol.
+ * <dl>
+ * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Providers:</dt>
+ * <dd>This module provides the
+ * {@link javax.management.remote.JMXConnectorProvider} service,
+ * which creates JMX connector clients using the RMI protocol.
* Instances of {@code JMXConnector} can be obtained via the
* {@link javax.management.remote.JMXConnectorFactory#newJMXConnector
* JMXConnectorFactory.newJMXConnector} factory method.
- * It also provides {@link javax.management.remote.JMXConnectorServerProvider} service
- * that creates the JMX connector servers using RMI protocol.
+ * It also provides the {@link javax.management.remote.JMXConnectorServerProvider} service,
+ * which creates JMX connector servers using the RMI protocol.
* Instances of {@code JMXConnectorServer} can be obtained via the
* {@link javax.management.remote.JMXConnectorServerFactory#newJMXConnectorServer
* JMXConnectorServerFactory.newJMXConnectorServer} factory method.
--- a/jdk/src/java.se.ee/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.se.ee/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,8 +26,9 @@
/**
* Defines the full API of the Java SE Platform.
* <P>
- * This module requires {@code java.se} and supplements it with modules
- * that define CORBA and Java EE APIs. These modules are upgradeable.
+ * This module requires the <a href="java.se-summary.html">{@code java.se}</a>
+ * module and supplements it with modules that define the CORBA and Java EE
+ * APIs. These modules are upgradeable.
*
* @moduleGraph
* @since 9
--- a/jdk/src/java.se/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.se/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,11 +26,12 @@
/**
* Defines the core Java SE API.
* <P>
- * The modules defining CORBA and Java EE APIs are not required by
- * this module, but they are required by {@code java.se.ee}.
+ * The modules defining the CORBA and Java EE APIs are not required by
+ * this module, but they are required by the
+ * <a href="java.se.ee-summary.html">{@code java.se.ee}</a> module.
*
- * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
- * <dt class="simpleTagLabel">Optional for Java SE Platform:</dt>
+ * <dl>
+ * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Optional for the Java SE Platform:</dt>
* <dd>
* <a href="../specs/jni/index.html">Java Native Interface (JNI)</a><br>
* <a href="../specs/jvmti.html">Java Virtual Machine Tool Interface (JVM TI)</a><br>
--- a/jdk/src/java.transaction/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/java.transaction/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -24,10 +24,10 @@
*/
/**
- * Defines a subset of the Java Transaction API (JTA) to support CORBA interop.
+ * Defines a subset of the Java Transaction API (JTA) to support CORBA interoperation.
* <P>
* The subset consists of RMI exception types which are mapped to CORBA system
- * exceptions by the 'Java Language to IDL Mapping Specification'.
+ * exceptions by the <em>Java Language to IDL Mapping Specification</em>.
*
* @moduleGraph
* @since 9
--- a/jdk/src/jdk.httpserver/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/jdk.httpserver/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -24,7 +24,7 @@
*/
/**
- * Defines the JDK-specific API for HTTP server.
+ * Defines the JDK-specific HTTP server API.
*
* @uses com.sun.net.httpserver.spi.HttpServerProvider
*
--- a/jdk/src/jdk.jartool/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/jdk.jartool/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -32,7 +32,7 @@
* <em>jar</em> via the {@link java.util.spi.ToolProvider ToolProvider} SPI.
* Instances of the tool can be obtained by calling
* {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst}
- * or the {@link java.util.ServiceLoader service loader} with the name
+ * or the {@linkplain java.util.ServiceLoader service loader} with the name
* {@code "jar"}.
*
* <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
--- a/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/jdk.management/share/classes/com/sun/management/package-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -24,10 +24,10 @@
*/
/**
- * This package contains Oracle Corporation's platform extension to
- * the implementation of the
+ * This package contains the JDK's extension to
+ * the standard implementation of the
* {@link java.lang.management} API and also defines the management
- * interface for some other components for the platform.
+ * interface for some other components of the platform.
*
* <p>
* All platform MBeans are registered in the <em>platform MBeanServer</em>
--- a/jdk/src/jdk.management/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/src/jdk.management/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -24,7 +24,7 @@
*/
/**
- * Defines the JDK-specific Management Interfaces for JVM.
+ * Defines JDK-specific management interfaces for the JVM.
*
* @moduleGraph
* @since 9
--- a/jdk/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java Mon Jul 17 09:13:49 2017 -0700
@@ -58,11 +58,15 @@
(byte)0xfe,(byte)0xdc,(byte)0xba,(byte)0x98,
(byte)0x76,(byte)0x54,(byte)0x32,(byte)0x10};
- public static byte[] plain_data = "Isaiah, a little boy is dead. He fell from the roof of an apartment house, just a few days before Christmas. The only person who truly grieves for the boy is Smilla Jasperson, a polar researcher. Smilla was Isaiah's only friend. Isaiah came with his alcoholic mother from Greenland but never really got used to life in Copenhagen. Smilla's mother was also from Greenland. Smilla feels a particular affinity to the arctic landscape. She knows a lot about the snow and how to read its movements and is convinced that the boy's death was not accidental.".getBytes();
-
- // The codemgrtool won't let me checkin this line, so I had to break it up.
-
- /* Smilla decides to embark upon her own investigations but soon finds herself running up against a brick wall. Isaiah's mother, Juliane, mistrusts her and the authorities also make life difficult for Smilla. But she won't let go. Then there's this mechanic a reticent, inscrutable sort of guy who lives in the same apartment building. He also knew the boy and even constructed a workbench for him in his cellar workshop. The mechanic tells Smilla that he'd like to help her, but then again, he may just be one of those who seem to want to dog her heels. End ".getBytes();*/
+ public static byte[] plain_data =
+ ("Isaiah, a little boy is dead. He fell from the roof of an apartment house, "
+ + "just a few days before Christmas. The only person who truly grieves for "
+ + "the boy is Smilla Jasperson, a polar researcher. Smilla was Isaiah's "
+ + "only friend. Isaiah came with his alcoholic mother from Greenland but "
+ + "never really got used to life in Copenhagen. Smilla's mother was also "
+ + "from Greenland. Smilla feels a particular affinity to the arctic landscape. "
+ + "She knows a lot about the snow and how to read its movements and is "
+ + "convinced that the boy's death was not accidental.").getBytes();
static int[] dataSizes = {1024, 8192};
static String[] crypts = {"DES", "DESede"};
--- a/jdk/test/java/lang/ModuleTests/AnnotationsTest.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/lang/ModuleTests/AnnotationsTest.java Mon Jul 17 09:13:49 2017 -0700
@@ -28,6 +28,7 @@
import java.lang.module.ModuleFinder;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
@@ -74,7 +75,7 @@
public void testNamedModule() throws IOException {
// "deprecate" java.xml
- Path dir = Files.createTempDirectory("mods");
+ Path dir = Files.createTempDirectory(Paths.get(""), "mods");
deprecateModule("java.xml", true, "9", dir);
// "load" the cloned java.xml
--- a/jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -43,9 +43,9 @@
if ("skip".equals(expectFileEnc)) {
System.err.println("Expected file.encoding is \"skip\", ignoring");
} else {
- System.err.println("Expected file.encoding: " + expectFileEnc);
- System.err.println("Actual file.encoding: " + fileEnc);
if (fileEnc == null || !fileEnc.equals(expectFileEnc)) {
+ System.err.println("Expected file.encoding: " + expectFileEnc);
+ System.err.println("Actual file.encoding: " + fileEnc);
failed = true;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8003228
+ * @summary Test the value of sun.jnu.encoding on Mac
+ * @requires (os.family == "mac")
+ * @library /test/lib
+ * @build jdk.test.lib.process.*
+ * ExpectedEncoding
+ * @run main MacJNUEncoding US-ASCII UTF-8 C
+ * @run main MacJNUEncoding UTF-8 UTF-8 en_US.UTF-8
+ */
+
+import java.util.Map;
+
+import jdk.test.lib.process.ProcessTools;
+
+public class MacJNUEncoding {
+
+ public static void main(String[] args) throws Exception {
+ if (args.length != 3) {
+ System.out.println("Usage:");
+ System.out.println(" java MacJNUEncoding"
+ + " <expected file.encoding> <expected sun.jnu.encoding> <locale>");
+ throw new IllegalArgumentException("missing arguments");
+ }
+
+ final String locale = args[2];
+ System.out.println("Running test for locale: " + locale);
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true,
+ ExpectedEncoding.class.getName(), args[0], args[1]);
+ Map<String, String> env = pb.environment();
+ env.put("LANG", locale);
+ env.put("LC_ALL", locale);
+ ProcessTools.executeProcess(pb)
+ .outputTo(System.out)
+ .errorTo(System.err)
+ .shouldHaveExitValue(0);
+ }
+}
--- a/jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.sh Thu Jul 06 09:36:17 2017 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-
-# @test
-# @bug 8003228
-# @summary Test the value of sun.jnu.encoding on Mac
-# @author Brent Christian
-#
-# @run shell MacJNUEncoding.sh
-
-# Only run test on Mac
-OS=`uname -s`
-case "$OS" in
- Darwin ) ;;
- * )
- exit 0
- ;;
-esac
-
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${COMPILEJAVA}" = "" ]; then
- COMPILEJAVA="${TESTJAVA}"
-fi
-
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-JAVAC="${COMPILEJAVA}"/bin/javac
-JAVA="${TESTJAVA}"/bin/java
-
-echo "Building test classes..."
-"$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" "${TESTSRC}"/ExpectedEncoding.java
-
-echo ""
-echo "Running test for C locale"
-export LANG=C
-export LC_ALL=C
-"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding US-ASCII UTF-8
-result1=$?
-
-echo ""
-echo "Running test for en_US.UTF-8 locale"
-export LANG=en_US.UTF-8
-export LC_ALL=en_US.UTF-8
-"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding UTF-8 UTF-8
-result2=$?
-
-echo ""
-echo "Cleanup"
-rm ${TESTCLASSES}/ExpectedEncoding.class
-
-if [ ${result1} -ne 0 ] ; then
- echo "Test failed for C locale"
- echo " LANG=\"${LANG}\""
- echo " LC_ALL=\"${LC_ALL}\""
- exit ${result1}
-fi
-if [ ${result2} -ne 0 ] ; then
- echo "Test failed for en_US.UTF-8 locale"
- echo " LANG=\"${LANG}\""
- echo " LC_ALL=\"${LC_ALL}\""
- exit ${result2}
-fi
-exit 0
-
--- a/jdk/test/java/lang/invoke/DefineClassTest.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/lang/invoke/DefineClassTest.java Mon Jul 17 09:13:49 2017 -0700
@@ -37,6 +37,7 @@
import java.net.URLClassLoader;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.MethodVisitor;
@@ -164,14 +165,16 @@
*/
@Test
public void testTwoProtectionDomains() throws Exception {
+ Path here = Paths.get("");
+
// p.C1 in one exploded directory
- Path dir1 = Files.createTempDirectory("classes");
+ Path dir1 = Files.createTempDirectory(here, "classes");
Path p = Files.createDirectory(dir1.resolve("p"));
Files.write(p.resolve("C1.class"), generateClass("p.C1"));
URL url1 = dir1.toUri().toURL();
// p.C2 in another exploded directory
- Path dir2 = Files.createTempDirectory("classes");
+ Path dir2 = Files.createTempDirectory(here, "classes");
p = Files.createDirectory(dir2.resolve("p"));
Files.write(p.resolve("C2.class"), generateClass("p.C2"));
URL url2 = dir2.toUri().toURL();
--- a/jdk/test/java/lang/module/ConfigurationTest.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/lang/module/ConfigurationTest.java Mon Jul 17 09:13:49 2017 -0700
@@ -42,6 +42,7 @@
import java.lang.module.ResolvedModule;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@@ -2117,7 +2118,7 @@
target = null;
}
String name = descriptor.name();
- Path dir = Files.createTempDirectory(name);
+ Path dir = Files.createTempDirectory(Paths.get(""), name);
Path mi = dir.resolve("module-info.class");
try (OutputStream out = Files.newOutputStream(mi)) {
ModuleInfoWriter.write(descriptor, target, out);
--- a/jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java Mon Jul 17 09:13:49 2017 -0700
@@ -48,6 +48,7 @@
@Test
public class ModulesInCustomFileSystem {
+ private static final Path HERE = Paths.get("");
/**
* Test exploded modules in a JAR file system.
@@ -59,7 +60,7 @@
assertEquals(mlib, m2.getParent());
// create JAR file containing m1/** and m2/**
- Path jar = Files.createTempDirectory("mlib").resolve("modules.jar");
+ Path jar = Files.createTempDirectory(HERE, "mlib").resolve("modules.jar");
JarUtils.createJarFile(jar, mlib);
testJarFileSystem(jar);
}
@@ -70,12 +71,12 @@
public void testModularJARsInJarFileSystem() throws Exception {
Path m1 = findModuleDirectory("m1");
Path m2 = findModuleDirectory("m2");
- Path contents = Files.createTempDirectory("contents");
+ Path contents = Files.createTempDirectory(HERE, "contents");
JarUtils.createJarFile(contents.resolve("m1.jar"), m1);
JarUtils.createJarFile(contents.resolve("m2.jar"), m2);
// create JAR file containing m1.jar and m2.jar
- Path jar = Files.createTempDirectory("mlib").resolve("modules.jar");
+ Path jar = Files.createTempDirectory(HERE, "mlib").resolve("modules.jar");
JarUtils.createJarFile(jar, contents);
testJarFileSystem(jar);
}
--- a/jdk/test/java/net/httpclient/TimeoutOrdering.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/net/httpclient/TimeoutOrdering.java Mon Jul 17 09:13:49 2017 -0700
@@ -38,7 +38,6 @@
/**
* @test
- * @key intermittent
* @summary Ensures that timeouts of multiple requests are handled in correct order
* @run main/othervm TimeoutOrdering
*/
--- a/jdk/test/java/net/httpclient/http2/ErrorTest.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/net/httpclient/http2/ErrorTest.java Mon Jul 17 09:13:49 2017 -0700
@@ -25,7 +25,6 @@
* @test
* @bug 8157105
* @library /lib/testlibrary server
- * @key intermittent
* @build jdk.testlibrary.SimpleSSLContext
* @modules jdk.incubator.httpclient/jdk.incubator.http.internal.common
* jdk.incubator.httpclient/jdk.incubator.http.internal.frame
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java Mon Jul 17 09:13:49 2017 -0700
@@ -21,14 +21,19 @@
* questions.
*/
+import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.stream.Stream;
public class SetupJar {
-
public static void main(String args[]) throws Exception {
- Path classes = Paths.get(System.getProperty("test.classes", ""));
- JarUtils.createJarFile(Paths.get("privileged.jar"),
- classes.resolve("bootlib"));
+ String cp = System.getProperty("test.class.path");
+ Path bootlib = Stream.of(cp.split(File.pathSeparator))
+ .map(Paths::get)
+ .filter(e -> e.endsWith("bootlib")) // file name
+ .findAny()
+ .orElseThrow(() -> new InternalError("bootlib not found"));
+ JarUtils.createJarFile(Paths.get("privileged.jar"), bootlib);
}
}
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,7 +26,7 @@
* @summary Stress test connections through the loopback interface
* @run main StressLoopback
* @run main/othervm -Djdk.net.useFastTcpLoopback StressLoopback
- * @key randomness intermittent
+ * @key randomness
*/
import java.nio.ByteBuffer;
--- a/jdk/test/java/nio/channels/DatagramChannel/Disconnect.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/nio/channels/DatagramChannel/Disconnect.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -23,6 +23,7 @@
/* @test
* @bug 7132924
+ * @key intermittent
* @summary Test DatagramChannel.disconnect when DatagramChannel is connected to an IPv4 socket
* @run main Disconnect
* @run main/othervm -Djava.net.preferIPv4Stack=true Disconnect
--- a/jdk/test/java/nio/channels/FileChannel/Transfer4GBFile.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/nio/channels/FileChannel/Transfer4GBFile.java Mon Jul 17 09:13:49 2017 -0700
@@ -23,7 +23,6 @@
/* @test
* @bug 4638365
- * @key intermittent
* @summary Test FileChannel.transferFrom and transferTo for 4GB files
* @run testng/timeout=300 Transfer4GBFile
*/
--- a/jdk/test/java/nio/channels/FileChannel/TransferTo6GBFile.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/nio/channels/FileChannel/TransferTo6GBFile.java Mon Jul 17 09:13:49 2017 -0700
@@ -23,7 +23,6 @@
/* @test
* @bug 6253145
- * @key intermittent
* @summary Test FileChannel.transferTo with file positions up to 8GB
* @run testng/timeout=300 TransferTo6GBFile
*/
--- a/jdk/test/java/util/Locale/Bug7069824.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/util/Locale/Bug7069824.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7069824 8042360
+ * @bug 7069824 8042360 8032842 8175539
* @summary Verify implementation for Locale matching.
* @run main Bug7069824
*/
@@ -747,7 +747,7 @@
priorityList = LanguageRange.parse(ranges);
tagList = generateLanguageTags(tags);
actualTags = showLanguageTags(Locale.filterTags(priorityList, tagList));
- expectedTags = "ja-jp-hepburn, en";
+ expectedTags = "ja-JP-hepburn, en";
if (!expectedTags.equals(actualTags)) {
error = true;
@@ -763,7 +763,7 @@
priorityList = LanguageRange.parse(ranges);
tagList = generateLanguageTags(tags);
actualTags = showLanguageTags(Locale.filterTags(priorityList, tagList, mode));
- expectedTags = "de-de, de-de-x-goethe";
+ expectedTags = "de-DE, de-DE-x-goethe";
if (!expectedTags.equals(actualTags)) {
error = true;
@@ -779,8 +779,8 @@
priorityList = LanguageRange.parse(ranges);
tagList = generateLanguageTags(tags);
actualTags = showLanguageTags(Locale.filterTags(priorityList, tagList, mode));
- expectedTags = "de-de, de-latn-de, de-latf-de, de-de-x-goethe, "
- + "de-latn-de-1996, de-deva-de";
+ expectedTags = "de-DE, de-Latn-DE, de-Latf-DE, de-DE-x-goethe, "
+ + "de-Latn-DE-1996, de-Deva-DE";
if (!expectedTags.equals(actualTags)) {
error = true;
@@ -796,8 +796,8 @@
priorityList = LanguageRange.parse(ranges);
tagList = generateLanguageTags(tags);
actualTags = showLanguageTags(Locale.filterTags(priorityList, tagList, mode));
- expectedTags = "de-de, de-latn-de, de-latf-de, de-de-x-goethe, "
- + "de-latn-de-1996, de-deva-de";
+ expectedTags = "de-DE, de-Latn-DE, de-Latf-DE, de-DE-x-goethe, "
+ + "de-Latn-DE-1996, de-Deva-DE";
if (!expectedTags.equals(actualTags)) {
error = true;
@@ -884,7 +884,7 @@
priorityList = LanguageRange.parse(ranges);
tagList = generateLanguageTags(tags);
actualTag = Locale.lookupTag(priorityList, tagList);
- expectedTag = "fr-jp";
+ expectedTag = "fr-JP";
if (!expectedTag.equals(actualTag)) {
error = true;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Locale/Bug8032842.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 8032842 8175539
+ * @summary Checks that the filterTags() and lookup() methods
+ * preserve the case of matching language tag(s).
+ * Before 8032842 fix these methods return the matching
+ * language tag(s) in lowercase.
+ * Also, checks the filterTags() to return only unique
+ * (ignoring case considerations) matching tags.
+ *
+ */
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Locale.FilteringMode;
+import java.util.Locale.LanguageRange;
+
+public class Bug8032842 {
+
+ public static void main(String[] args) {
+
+ // test filterBasic() for preserving the case of matching tags for
+ // the language range '*', with no duplicates in the matching tags
+ testFilter("*", List.of("de-CH", "hi-in", "En-GB", "ja-Latn-JP",
+ "JA-JP", "en-GB"),
+ List.of("de-CH", "hi-in", "En-GB", "ja-Latn-JP", "JA-JP"),
+ FilteringMode.AUTOSELECT_FILTERING);
+
+ // test filterBasic() for preserving the case of matching tags for
+ // basic ranges other than *, with no duplicates in the matching tags
+ testFilter("mtm-RU, en-GB", List.of("En-Gb", "mTm-RU", "en-US",
+ "en-latn", "en-GB"),
+ List.of("mTm-RU", "En-Gb"), FilteringMode.AUTOSELECT_FILTERING);
+
+ // test filterExtended() for preserving the case of matching tags for
+ // the language range '*', with no duplicates in the matching tags
+ testFilter("*", List.of("de-CH", "hi-in", "En-GB", "hi-IN",
+ "ja-Latn-JP", "JA-JP"),
+ List.of("de-CH", "hi-in", "En-GB", "ja-Latn-JP", "JA-JP"),
+ FilteringMode.EXTENDED_FILTERING);
+
+ // test filterExtended() for preserving the case of matching tags for
+ // extended ranges other than *, with no duplicates in the matching tags
+ testFilter("*-ch;q=0.5, *-Latn;q=0.4", List.of("fr-CH", "de-Ch",
+ "en-latn", "en-US", "en-Latn"),
+ List.of("fr-CH", "de-Ch", "en-latn"),
+ FilteringMode.EXTENDED_FILTERING);
+
+ // test lookupTag() for preserving the case of matching tag
+ testLookup("*-ch;q=0.5", List.of("en", "fR-cH"), "fR-cH");
+
+ }
+
+ public static void testFilter(String ranges, List<String> tags,
+ List<String> expected, FilteringMode mode) {
+ List<LanguageRange> priorityList = LanguageRange.parse(ranges);
+ List<String> actual = Locale.filterTags(priorityList, tags, mode);
+ if (!actual.equals(expected)) {
+ throw new RuntimeException("[filterTags() failed for the language"
+ + " range: " + ranges + ", Expected: " + expected
+ + ", Found: " + actual + "]");
+ }
+ }
+
+ public static void testLookup(String ranges, List<String> tags,
+ String expected) {
+ List<LanguageRange> priorityList = LanguageRange.parse(ranges);
+ String actual = Locale.lookupTag(priorityList, tags);
+ if (!actual.equals(expected)) {
+ throw new RuntimeException("[lookupTag() failed for the language"
+ + " range: " + ranges + ", Expected: " + expected
+ + ", Found: " + actual + "]");
+ }
+ }
+
+}
+
--- a/jdk/test/java/util/ServiceLoader/ModulesTest.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/java/util/ServiceLoader/ModulesTest.java Mon Jul 17 09:13:49 2017 -0700
@@ -33,6 +33,7 @@
* @summary Basic test for ServiceLoader with a provider deployed as a module.
*/
+import java.io.File;
import java.lang.module.Configuration;
import java.lang.module.ModuleFinder;
import java.nio.file.Files;
@@ -49,6 +50,7 @@
import java.util.ServiceLoader.Provider;
import java.util.Set;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import javax.script.ScriptEngineFactory;
import org.testng.annotations.Test;
@@ -236,8 +238,10 @@
*/
@Test
public void testWithAutomaticModule() throws Exception {
+ Path here = Paths.get("");
+ Path jar = Files.createTempDirectory(here, "lib").resolve("pearscript.jar");
Path classes = Paths.get(System.getProperty("test.classes"));
- Path jar = Files.createTempDirectory("lib").resolve("pearscript.jar");
+
JarUtils.createJarFile(jar, classes, "META-INF", "org");
ModuleFinder finder = ModuleFinder.of(jar);
@@ -353,8 +357,7 @@
.isPresent());
ClassLoader scl = ClassLoader.getSystemClassLoader();
- Path dir = Paths.get(System.getProperty("test.classes", "."), "modules");
- ModuleFinder finder = ModuleFinder.of(dir);
+ ModuleFinder finder = ModuleFinder.of(testModulePath());
// layer1
Configuration cf1 = cf0.resolveAndBind(finder, ModuleFinder.of(), Set.of());
@@ -451,11 +454,10 @@
/**
* Create a custom layer by resolving the given module names. The modules
- * are located in the {@code ${test.classes}/modules} directory.
+ * are located on the test module path ({@code ${test.module.path}}).
*/
private ModuleLayer createCustomLayer(String... modules) {
- Path dir = Paths.get(System.getProperty("test.classes", "."), "modules");
- ModuleFinder finder = ModuleFinder.of(dir);
+ ModuleFinder finder = ModuleFinder.of(testModulePath());
Set<String> roots = new HashSet<>();
Collections.addAll(roots, modules);
ModuleLayer bootLayer = ModuleLayer.boot();
@@ -467,6 +469,13 @@
return layer;
}
+ private Path[] testModulePath() {
+ String mp = System.getProperty("test.module.path");
+ return Stream.of(mp.split(File.pathSeparator))
+ .map(Paths::get)
+ .toArray(Path[]::new);
+ }
+
private <E> List<E> collectAll(ServiceLoader<E> loader) {
List<E> list = new ArrayList<>();
Iterator<E> iterator = loader.iterator();
--- a/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -32,7 +32,7 @@
* @test
* @bug 8148516
* @summary Improve the default strength of EC in JDK
- * @modules jdk.crypyo.ec
+ * @modules jdk.crypto.ec
* @run main/othervm ECCurvesconstraints PKIX
* @run main/othervm ECCurvesconstraints SunX509
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/tools/keytool/DupCommands.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8183509
+ * @summary keytool should not allow multiple commands
+ * @library /test/lib
+ * @build jdk.test.lib.SecurityTools
+ * jdk.test.lib.Utils
+ * jdk.test.lib.Asserts
+ * jdk.test.lib.JDKToolFinder
+ * jdk.test.lib.JDKToolLauncher
+ * jdk.test.lib.Platform
+ * jdk.test.lib.process.*
+ * @run main/othervm DupCommands
+ */
+
+import jdk.test.lib.SecurityTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class DupCommands {
+
+ public static void main(String[] args) throws Throwable {
+
+ kt("-list -printcert")
+ .shouldHaveExitValue(1)
+ .shouldContain("Only one command is allowed");
+
+ kt("-import -importcert") // command with different names
+ .shouldHaveExitValue(1)
+ .shouldContain("Only one command is allowed");
+
+ kt("-help -v -v")
+ .shouldHaveExitValue(0)
+ .shouldContain("The -v option is specified multiple times.");
+
+ kt("-help -id 1 -id 2") // some options are allowed multiple times
+ .shouldHaveExitValue(0)
+ .shouldNotContain("specified multiple times.");
+ }
+
+ static OutputAnalyzer kt(String arg) throws Exception {
+ return SecurityTools.keytool(arg);
+ }
+}
--- a/jdk/test/sun/security/tools/keytool/WeakAlg.java Thu Jul 06 09:36:17 2017 -0700
+++ b/jdk/test/sun/security/tools/keytool/WeakAlg.java Mon Jul 17 09:13:49 2017 -0700
@@ -571,7 +571,7 @@
static OutputAnalyzer genkeypair(String alias, String options) {
return kt("-genkeypair -alias " + alias + " -dname CN=" + alias
- + " -keyalg RSA -storetype JKS " + options);
+ + " -storetype JKS " + options);
}
static OutputAnalyzer certreq(String alias, String options) {
--- a/langtools/.hgtags Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/.hgtags Mon Jul 17 09:13:49 2017 -0700
@@ -432,3 +432,6 @@
2bd34895dda246cff9e713401f3544260dfbe80f jdk-10+12
83f6eb009d8f6e94fd348c7d23e4b00754d745db jdk-9+175
123f40b60a18225b1485fad891e3fa173a10e5af jdk-10+13
+add6717b655efa3aa9350e917175f3965cfc0729 jdk-10+14
+0d0ac75b0f6cbe218362e3fac4bb443496e7258f jdk-9+176
+2f01728210c1405ef459e69d9c7247b5df6abb78 jdk-9+177
--- a/langtools/src/java.compiler/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/java.compiler/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -30,7 +30,7 @@
* and define interfaces for tools such as compilers which can be invoked
* from a program.
* <p>
- * This module is upgradeble.
+ * This module is upgradeable.
*
* @moduleGraph
* @since 9
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java Mon Jul 17 09:13:49 2017 -0700
@@ -25,6 +25,8 @@
package com.sun.tools.javac.comp;
+import java.util.ArrayList;
+
import com.sun.source.tree.LambdaExpressionTree;
import com.sun.tools.javac.code.Source;
import com.sun.tools.javac.code.Type;
@@ -69,13 +71,24 @@
import java.util.Map;
import java.util.function.Predicate;
+import com.sun.source.tree.NewClassTree;
+import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.code.Kinds.Kind;
+import com.sun.tools.javac.code.Symbol.ClassSymbol;
+import com.sun.tools.javac.tree.JCTree.JCTry;
+import com.sun.tools.javac.tree.JCTree.JCUnary;
+import com.sun.tools.javac.util.Assert;
+import com.sun.tools.javac.util.DiagnosticSource;
+
import static com.sun.tools.javac.code.Flags.GENERATEDCONSTR;
-import static com.sun.tools.javac.code.Flags.SYNTHETIC;
import static com.sun.tools.javac.code.TypeTag.CLASS;
import static com.sun.tools.javac.tree.JCTree.Tag.APPLY;
+import static com.sun.tools.javac.tree.JCTree.Tag.LABELLED;
import static com.sun.tools.javac.tree.JCTree.Tag.METHODDEF;
import static com.sun.tools.javac.tree.JCTree.Tag.NEWCLASS;
+import static com.sun.tools.javac.tree.JCTree.Tag.NULLCHK;
import static com.sun.tools.javac.tree.JCTree.Tag.TYPEAPPLY;
+import static com.sun.tools.javac.tree.JCTree.Tag.VARDEF;
/**
* Helper class for defining custom code analysis, such as finding instance creation expression
@@ -341,7 +354,8 @@
Env<AttrContext> copyEnvIfNeeded(JCTree tree, Env<AttrContext> env) {
if (!analyzerModes.isEmpty() &&
!env.info.isSpeculative &&
- TreeInfo.isStatement(tree)) {
+ TreeInfo.isStatement(tree) &&
+ !tree.hasTag(LABELLED)) {
Env<AttrContext> analyzeEnv =
env.dup(env.tree, env.info.dup(env.info.scope.dupUnshared(env.info.scope.owner)));
analyzeEnv.info.returnResult = analyzeEnv.info.returnResult != null ?
@@ -368,27 +382,109 @@
* and speculatively type-check the rewritten code to compare results against previously attributed code.
*/
void analyze(JCStatement statement, Env<AttrContext> env) {
- AnalysisContext context = new AnalysisContext();
+ AnalysisContext context = new AnalysisContext(statement, env);
StatementScanner statementScanner = new StatementScanner(context);
statementScanner.scan(statement);
if (!context.treesToAnalyzer.isEmpty()) {
+ deferredAnalysisHelper.queue(context);
+ }
+ }
- //add a block to hoist potential dangling variable declarations
- JCBlock fakeBlock = make.Block(SYNTHETIC, List.of(statement));
+ /**
+ * Helper interface to handle deferral of analysis tasks.
+ */
+ interface DeferredAnalysisHelper {
+ /**
+ * Add a new analysis task to the queue.
+ */
+ void queue(AnalysisContext context);
+ /**
+ * Flush queue with given attribution env.
+ */
+ void flush(Env<AttrContext> flushEnv);
+ }
+
+ /**
+ * Dummy deferral handler.
+ */
+ DeferredAnalysisHelper flushDeferredHelper = new DeferredAnalysisHelper() {
+ @Override
+ public void queue(AnalysisContext context) {
+ //do nothing
+ }
+
+ @Override
+ public void flush(Env<AttrContext> flushEnv) {
+ //do nothing
+ }
+ };
+
+ /**
+ * Simple deferral handler. All tasks belonging to the same outermost class are added to
+ * the same queue. The queue is flushed after flow analysis (only if no error occurred).
+ */
+ DeferredAnalysisHelper queueDeferredHelper = new DeferredAnalysisHelper() {
+
+ Map<ClassSymbol, ArrayList<AnalysisContext>> Q = new HashMap<>();
+
+ @Override
+ public void queue(AnalysisContext context) {
+ ArrayList<AnalysisContext> s = Q.computeIfAbsent(context.env.enclClass.sym.outermostClass(), k -> new ArrayList<>());
+ s.add(context);
+ }
+
+ @Override
+ public void flush(Env<AttrContext> flushEnv) {
+ if (!Q.isEmpty()) {
+ DeferredAnalysisHelper prevHelper = deferredAnalysisHelper;
+ try {
+ deferredAnalysisHelper = flushDeferredHelper;
+ ArrayList<AnalysisContext> s = Q.get(flushEnv.enclClass.sym.outermostClass());
+ while (s != null && !s.isEmpty()) {
+ doAnalysis(s.remove(0));
+ }
+ } finally {
+ deferredAnalysisHelper = prevHelper;
+ }
+ }
+ }
+ };
+
+ DeferredAnalysisHelper deferredAnalysisHelper = queueDeferredHelper;
+
+ void doAnalysis(AnalysisContext context) {
+ DiagnosticSource prevSource = log.currentSource();
+ LocalCacheContext localCacheContext = argumentAttr.withLocalCacheContext();
+ try {
+ log.useSource(context.env.toplevel.getSourceFile());
+
+ JCStatement treeToAnalyze = (JCStatement)context.tree;
+ if (context.env.info.scope.owner.kind == Kind.TYP) {
+ //add a block to hoist potential dangling variable declarations
+ treeToAnalyze = make.Block(Flags.SYNTHETIC, List.of((JCStatement)context.tree));
+ }
TreeMapper treeMapper = new TreeMapper(context);
//TODO: to further refine the analysis, try all rewriting combinations
- deferredAttr.attribSpeculative(fakeBlock, env, attr.statInfo, treeMapper,
- t -> new AnalyzeDeferredDiagHandler(context),
- argumentAttr.withLocalCacheContext());
+ deferredAttr.attribSpeculative(treeToAnalyze, context.env, attr.statInfo, treeMapper,
+ t -> new AnalyzeDeferredDiagHandler(context), argumentAttr.withLocalCacheContext());
context.treeMap.entrySet().forEach(e -> {
context.treesToAnalyzer.get(e.getKey())
.process(e.getKey(), e.getValue(), context.errors.nonEmpty());
});
+ } catch (Throwable ex) {
+ Assert.error("Analyzer error when processing: " + context.tree);
+ } finally {
+ log.useSource(prevSource.getFile());
+ localCacheContext.leave();
}
}
+ public void flush(Env<AttrContext> flushEnv) {
+ deferredAnalysisHelper.flush(flushEnv);
+ }
+
/**
* Simple deferred diagnostic handler which filters out all messages and keep track of errors.
*/
@@ -411,6 +507,23 @@
* trees to be rewritten, errors occurred during the speculative attribution step, etc.
*/
class AnalysisContext {
+
+ JCTree tree;
+
+ Env<AttrContext> env;
+
+ AnalysisContext(JCTree tree, Env<AttrContext> env) {
+ this.tree = tree;
+ this.env = attr.copyEnv(env);
+ /* this is a temporary workaround that should be removed once we have a truly independent
+ * clone operation
+ */
+ if (tree.hasTag(VARDEF)) {
+ // avoid redefinition clashes
+ this.env.info.scope.remove(((JCVariableDecl)tree).sym);
+ }
+ }
+
/** Map from trees to analyzers. */
Map<JCTree, StatementAnalyzer<JCTree, JCTree>> treesToAnalyzer = new HashMap<>();
@@ -452,17 +565,17 @@
@Override
public void visitClassDef(JCClassDecl tree) {
- //do nothing (prevents seeing same stuff twice
+ //do nothing (prevents seeing same stuff twice)
}
@Override
public void visitMethodDef(JCMethodDecl tree) {
- //do nothing (prevents seeing same stuff twice
+ //do nothing (prevents seeing same stuff twice)
}
@Override
public void visitBlock(JCBlock tree) {
- //do nothing (prevents seeing same stuff twice
+ //do nothing (prevents seeing same stuff twice)
}
@Override
@@ -472,28 +585,40 @@
@Override
public void visitForLoop(JCForLoop tree) {
- scan(tree.getInitializer());
+ //skip body and var decl (to prevents same statements to be analyzed twice)
scan(tree.getCondition());
scan(tree.getUpdate());
}
@Override
+ public void visitTry(JCTry tree) {
+ //skip resources (to prevents same statements to be analyzed twice)
+ scan(tree.getBlock());
+ scan(tree.getCatches());
+ scan(tree.getFinallyBlock());
+ }
+
+ @Override
public void visitForeachLoop(JCEnhancedForLoop tree) {
+ //skip body (to prevents same statements to be analyzed twice)
scan(tree.getExpression());
}
@Override
public void visitWhileLoop(JCWhileLoop tree) {
+ //skip body (to prevents same statements to be analyzed twice)
scan(tree.getCondition());
}
@Override
public void visitDoLoop(JCDoWhileLoop tree) {
+ //skip body (to prevents same statements to be analyzed twice)
scan(tree.getCondition());
}
@Override
public void visitIf(JCIf tree) {
+ //skip body (to prevents same statements to be analyzed twice)
scan(tree.getCondition());
}
}
@@ -533,5 +658,17 @@
}
return newLambda;
}
+
+ @Override @DefinedBy(Api.COMPILER_TREE)
+ public JCTree visitNewClass(NewClassTree node, Void aVoid) {
+ JCNewClass oldNewClazz = (JCNewClass)node;
+ JCNewClass newNewClazz = (JCNewClass)super.visitNewClass(node, aVoid);
+ if (!oldNewClazz.args.isEmpty() && oldNewClazz.args.head.hasTag(NULLCHK)) {
+ //workaround to Attr generating trees
+ newNewClazz.encl = ((JCUnary)newNewClazz.args.head).arg;
+ newNewClazz.args = newNewClazz.args.tail;
+ }
+ return newNewClazz;
+ }
}
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Mon Jul 17 09:13:49 2017 -0700
@@ -1207,7 +1207,7 @@
long illegal = flags & ExtendedStandardFlags & ~mask;
if (illegal != 0) {
if ((illegal & INTERFACE) != 0) {
- log.error(pos, Errors.IntfNotAllowedHere);
+ log.error(pos, ((flags & ANNOTATION) != 0) ? Errors.AnnotationDeclNotAllowedHere : Errors.IntfNotAllowedHere);
mask |= INTERFACE;
}
else {
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java Mon Jul 17 09:13:49 2017 -0700
@@ -286,6 +286,10 @@
*/
protected Attr attr;
+ /** The analyzer
+ */
+ protected Analyzer analyzer;
+
/** The attributor.
*/
protected Check chk;
@@ -401,6 +405,7 @@
}
source = Source.instance(context);
attr = Attr.instance(context);
+ analyzer = Analyzer.instance(context);
chk = Check.instance(context);
gen = Gen.instance(context);
flow = Flow.instance(context);
@@ -1392,6 +1397,8 @@
if (shouldStop(CompileState.FLOW))
return;
+ analyzer.flush(env);
+
results.add(env);
}
finally {
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Jul 17 09:13:49 2017 -0700
@@ -311,6 +311,9 @@
compiler.err.cant.extend.intf.annotation=\
''extends'' not allowed for @interfaces
+compiler.err.annotation.decl.not.allowed.here=\
+ annotation type declaration not allowed here
+
# 0: symbol
compiler.err.cant.inherit.from.final=\
cannot inherit from final {0}
--- a/langtools/src/jdk.compiler/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.compiler/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -25,7 +25,7 @@
/**
* Defines the implementation of the
- * {@link javax.tools.ToolProvider#getSystemJavaCompiler system Java compiler}
+ * {@linkplain javax.tools.ToolProvider#getSystemJavaCompiler system Java compiler}
* and its command line equivalent, <em>{@index javac javac tool}</em>,
* as well as <em>{@index javah javah tool}</em>.
*
@@ -40,7 +40,7 @@
*
* <p> Instances of the tools can be obtained by calling
* {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst}
- * or the {@link java.util.ServiceLoader service loader} with the name
+ * or the {@linkplain java.util.ServiceLoader service loader} with the name
* {@code "javac"}.
*
* <p>
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java Mon Jul 17 09:13:49 2017 -0700
@@ -78,16 +78,20 @@
* the following table lists those cases where there is more
* than one tag of a given kind:
*
- * <table border="1">
+ * <table class="striped">
* <caption>Related Tags</caption>
- * <tr><th>{@code kind() }</th> <th>{@code name() }</th></tr>
- * <tr><td>{@code @throws }</td> <td>{@code @throws }</td></tr>
- * <tr><td>{@code @throws }</td> <td>{@code @exception }</td></tr>
- * <tr><td>{@code @see }</td> <td>{@code @see }</td></tr>
- * <tr><td>{@code @see }</td> <td>{@code @link }</td></tr>
- * <tr><td>{@code @see }</td> <td>{@code @linkplain }</td></tr>
- * <tr><td>{@code @serial }</td> <td>{@code @serial }</td></tr>
- * <tr><td>{@code @serial }</td> <td>{@code @serialData }</td></tr>
+ * <thead>
+ * <tr><th scope="col">{@code name() } <th scope="col">{@code kind() }
+ * </thead>
+ * <tbody style="text-align:left">
+ * <tr><th scope="row">{@code @exception } <td>{@code @throws }
+ * <tr><th scope="row">{@code @link } <td>{@code @see }
+ * <tr><th scope="row">{@code @linkplain } <td>{@code @see }
+ * <tr><th scope="row">{@code @see } <td>{@code @see }
+ * <tr><th scope="row">{@code @serial } <td>{@code @serial }
+ * <tr><th scope="row">{@code @serialData } <td>{@code @serial }
+ * <tr><th scope="row">{@code @throws } <td>{@code @throws }
+ * </tbody>
* </table>
*
* @return the kind of this tag.
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -135,18 +135,44 @@
* <h4>Interactions with older options.</h4>
*
* The new {@code --show-*} options provide a more detailed replacement
- * for the older options -public, -protected, -package, -private.
+ * for the older options {@code -public}, {@code -protected}, {@code -package}, {@code -private}.
* Alternatively, the older options can continue to be used as shorter
* forms for combinations of the new options, as described below:
- <table style="font-family: monospace" border=1>
- <caption>Short form options mapping</caption>
- <tr><th>Older option<th colspan="5">Equivalent to these values with the new option
- <tr><th><th>{@code --show-members}<th>{@code --show-types}<th>{@code --show-packages}<th>{@code --show-module-contents}
- <tr><td>{@code -public}<td>public<td>public<td>exported<td>api
- <tr><td>{@code -protected}<td>protected<td>protected<td>exported<td>api
- <tr><td>{@code -package}<td>package<td>package<td>all<td>all
- <tr><td>{@code -private}<td>private<td>private<td>all<td>all
- </table>
+ * <table class="striped">
+ * <caption>Short form options mapping</caption>
+ * <thead>
+ * <tr> <th rowspan="2" scope="col" style="vertical-align:top">
+ * Older option
+ * <th colspan="5" scope="col" style="border-bottom: 1px solid black">
+ * Equivalent to these values with the new option
+ * <tr> <th scope="col">{@code --show-members}
+ * <th scope="col">{@code --show-types}
+ * <th scope="col">{@code --show-packages}
+ * <th scope="col">{@code --show-module-contents}
+ * </thead>
+ * <tbody>
+ * <tr> <th scope="row">{@code -public}
+ * <td>public
+ * <td>public
+ * <td>exported
+ * <td>api
+ * <tr> <th scope="row">{@code -protected}
+ * <td>protected
+ * <td>protected
+ * <td>exported
+ * <td>api
+ * <tr> <th scope="row">{@code -package}
+ * <td>package
+ * <td>package
+ * <td>all
+ * <td>all
+ * <tr> <th scope="row">{@code -private}
+ * <td>private
+ * <td>private
+ * <td>all
+ * <td>all
+ * </tbody>
+ * </table>
* <p>
* <a id="qualified"></a>
* A <em>qualified</em> element name is one that has its package
@@ -283,39 +309,44 @@
* <p>The following table gives a guide to the mapping from old types to their replacements.
* In some cases, there is no direct equivalent.
*
- * <table style="font-family: monospace" border=1>
- <caption>Guide for mapping old types to new types</caption>
- <tr><th>Old Type<th>New Type
- <tr><td>AnnotatedType<td>javax.lang.model.type.Type
- <tr><td>AnnotationDesc<td>javax.lang.model.element.AnnotationMirror
- <tr><td>AnnotationDesc.ElementValuePair<td>javax.lang.model.element.AnnotationValue
- <tr><td>AnnotationTypeDoc<td>javax.lang.model.element.TypeElement
- <tr><td>AnnotationTypeElementDoc<td>javax.lang.model.element.ExecutableElement
- <tr><td>AnnotationValue<td>javax.lang.model.element.AnnotationValue
- <tr><td>ClassDoc<td>javax.lang.model.element.TypeElement
- <tr><td>ConstructorDoc<td>javax.lang.model.element.ExecutableElement
- <tr><td>Doc<td>javax.lang.model.element.Element
- <tr><td>DocErrorReporter<td>jdk.javadoc.doclet.Reporter
- <tr><td>Doclet<td>jdk.javadoc.doclet.Doclet
- <tr><td>ExecutableMemberDoc<td>javax.lang.model.element.ExecutableElement
- <tr><td>FieldDoc<td>javax.lang.model.element.VariableElement
- <tr><td>LanguageVersion<td>javax.lang.model.SourceVersion
- <tr><td>MemberDoc<td>javax.lang.model.element.Element
- <tr><td>MethodDoc<td>javax.lang.model.element.ExecutableElement
- <tr><td>PackageDoc<td>javax.lang.model.element.PackageElement
- <tr><td>Parameter<td>javax.lang.model.element.VariableElement
- <tr><td>ParameterizedType<td>javax.lang.model.type.DeclaredType
- <tr><td>ParamTag<td>com.sun.source.doctree.ParamTree
- <tr><td>ProgramElementDoc<td>javax.lang.model.element.Element
- <tr><td>RootDoc<td>jdk.javadoc.doclet.DocletEnvironment
- <tr><td>SeeTag<td>com.sun.source.doctree.LinkTree<br>com.sun.source.doctree.SeeTree
- <tr><td>SerialFieldTag<td>com.sun.source.doctree.SerialFieldTree
- <tr><td>SourcePosition<td>com.sun.source.util.SourcePositions
- <tr><td>Tag<td>com.sun.source.doctree.DocTree
- <tr><td>ThrowsTag<td>com.sun.source.doctree.ThrowsTree
- <tr><td>Type<td>javax.lang.model.type.Type
- <tr><td>TypeVariable<td>javax.lang.model.type.TypeVariable
- <tr><td>WildcardType<td>javax.lang.model.type.WildcardType
+ * <table class="striped">
+ * <caption>Guide for mapping old types to new types</caption>
+ * <thead>
+ * <tr><th scope="col">Old Type<th scope="col">New Type
+ * </thead>
+ * <tbody style="text-align:left">
+ * <tr><th scope="row">{@code AnnotatedType} <td>{@link javax.lang.model.type.TypeMirror javax.lang.model.type.TypeMirror}
+ * <tr><th scope="row">{@code AnnotationDesc} <td>{@link javax.lang.model.element.AnnotationMirror javax.lang.model.element.AnnotationMirror}
+ * <tr><th scope="row">{@code AnnotationDesc.ElementValuePair}<td>{@link javax.lang.model.element.AnnotationValue javax.lang.model.element.AnnotationValue}
+ * <tr><th scope="row">{@code AnnotationTypeDoc} <td>{@link javax.lang.model.element.TypeElement javax.lang.model.element.TypeElement}
+ * <tr><th scope="row">{@code AnnotationTypeElementDoc} <td>{@link javax.lang.model.element.ExecutableElement javax.lang.model.element.ExecutableElement}
+ * <tr><th scope="row">{@code AnnotationValue} <td>{@link javax.lang.model.element.AnnotationValue javax.lang.model.element.AnnotationValue}
+ * <tr><th scope="row">{@code ClassDoc} <td>{@link javax.lang.model.element.TypeElement javax.lang.model.element.TypeElement}
+ * <tr><th scope="row">{@code ConstructorDoc} <td>{@link javax.lang.model.element.ExecutableElement javax.lang.model.element.ExecutableElement}
+ * <tr><th scope="row">{@code Doc} <td>{@link javax.lang.model.element.Element javax.lang.model.element.Element}
+ * <tr><th scope="row">{@code DocErrorReporter} <td>{@link jdk.javadoc.doclet.Reporter jdk.javadoc.doclet.Reporter}
+ * <tr><th scope="row">{@code Doclet} <td>{@link jdk.javadoc.doclet.Doclet jdk.javadoc.doclet.Doclet}
+ * <tr><th scope="row">{@code ExecutableMemberDoc} <td>{@link javax.lang.model.element.ExecutableElement javax.lang.model.element.ExecutableElement}
+ * <tr><th scope="row">{@code FieldDoc} <td>{@link javax.lang.model.element.VariableElement javax.lang.model.element.VariableElement}
+ * <tr><th scope="row">{@code LanguageVersion} <td>{@link javax.lang.model.SourceVersion javax.lang.model.SourceVersion}
+ * <tr><th scope="row">{@code MemberDoc} <td>{@link javax.lang.model.element.Element javax.lang.model.element.Element}
+ * <tr><th scope="row">{@code MethodDoc} <td>{@link javax.lang.model.element.ExecutableElement javax.lang.model.element.ExecutableElement}
+ * <tr><th scope="row">{@code PackageDoc} <td>{@link javax.lang.model.element.PackageElement javax.lang.model.element.PackageElement}
+ * <tr><th scope="row">{@code Parameter} <td>{@link javax.lang.model.element.VariableElement javax.lang.model.element.VariableElement}
+ * <tr><th scope="row">{@code ParameterizedType} <td>{@link javax.lang.model.type.DeclaredType javax.lang.model.type.DeclaredType}
+ * <tr><th scope="row">{@code ParamTag} <td>{@link com.sun.source.doctree.ParamTree com.sun.source.doctree.ParamTree}
+ * <tr><th scope="row">{@code ProgramElementDoc} <td>{@link javax.lang.model.element.Element javax.lang.model.element.Element}
+ * <tr><th scope="row">{@code RootDoc} <td>{@link jdk.javadoc.doclet.DocletEnvironment jdk.javadoc.doclet.DocletEnvironment}
+ * <tr><th scope="row">{@code SeeTag} <td>{@link com.sun.source.doctree.LinkTree com.sun.source.doctree.LinkTree}<br>
+ * {@link com.sun.source.doctree.SeeTree com.sun.source.doctree.SeeTree}
+ * <tr><th scope="row">{@code SerialFieldTag} <td>{@link com.sun.source.doctree.SerialFieldTree com.sun.source.doctree.SerialFieldTree}
+ * <tr><th scope="row">{@code SourcePosition} <td>{@link com.sun.source.util.SourcePositions com.sun.source.util.SourcePositions}
+ * <tr><th scope="row">{@code Tag} <td>{@link com.sun.source.doctree.DocTree com.sun.source.doctree.DocTree}
+ * <tr><th scope="row">{@code ThrowsTag} <td>{@link com.sun.source.doctree.ThrowsTree com.sun.source.doctree.ThrowsTree}
+ * <tr><th scope="row">{@code Type} <td>{@link javax.lang.model.type.TypeMirror javax.lang.model.type.TypeMirror}
+ * <tr><th scope="row">{@code TypeVariable} <td>{@link javax.lang.model.type.TypeVariable javax.lang.model.type.TypeVariable}
+ * <tr><th scope="row">{@code WildcardType} <td>{@link javax.lang.model.type.WildcardType javax.lang.model.type.WildcardType}
+ * </tbody>
* </table>
*
* @see jdk.javadoc.doclet.Doclet
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java Mon Jul 17 09:13:49 2017 -0700
@@ -140,7 +140,9 @@
int j = 0;
Content dl = new HtmlTree(HtmlTag.DL);
while (i < memberListSize && j < searchListSize) {
- String name = utils.getSimpleName(memberlist.get(i));
+ Element elem = memberlist.get(i);
+ String name = (utils.isModule(elem))
+ ? utils.getFullyQualifiedName(elem) : utils.getSimpleName(elem);
if (name.compareTo(searchList.get(j).getLabel()) < 0) {
addDescription(dl, memberlist.get(i));
i++;
@@ -222,7 +224,7 @@
* @param dlTree the content tree to which the description will be added
*/
protected void addDescription(ModuleElement mdle, Content dlTree, SearchIndexItem si) {
- String moduleName = utils.getSimpleName(mdle);
+ String moduleName = utils.getFullyQualifiedName(mdle);
Content link = getModuleLink(mdle, new StringContent(moduleName));
si.setLabel(moduleName);
si.setCategory(resources.getText("doclet.Modules"));
@@ -246,7 +248,7 @@
protected void addDescription(PackageElement pkg, Content dlTree, SearchIndexItem si) {
Content link = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)));
if (configuration.showModules) {
- si.setContainingModule(utils.getSimpleName(utils.containingModule(pkg)));
+ si.setContainingModule(utils.getFullyQualifiedName(utils.containingModule(pkg)));
}
si.setLabel(utils.getPackageName(pkg));
si.setCategory(resources.getText("doclet.Packages"));
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Mon Jul 17 09:13:49 2017 -0700
@@ -1757,6 +1757,9 @@
return true;
}
+ // Notify the next DocTree handler to take necessary action
+ private boolean commentRemoved = false;
+
/**
* Converts inline tags and text to text strings, expanding the
* inline tags along the way. Called wherever text can contain
@@ -1782,27 +1785,32 @@
CommentHelper ch = utils.getCommentHelper(element);
// Array of all possible inline tags for this javadoc run
configuration.tagletManager.checkTags(utils, element, tags, true);
+ commentRemoved = false;
+
for (ListIterator<? extends DocTree> iterator = tags.listIterator(); iterator.hasNext();) {
+ boolean isFirstNode = !iterator.hasPrevious();
DocTree tag = iterator.next();
- // zap block tags
- if (isFirstSentence && ignoreNonInlineTag(tag))
- continue;
+ boolean isLastNode = !iterator.hasNext();
+
+ if (isFirstSentence) {
+ // Ignore block tags
+ if (ignoreNonInlineTag(tag))
+ continue;
- if (isFirstSentence && iterator.nextIndex() == tags.size() &&
- (tag.getKind() == TEXT && isAllWhiteSpace(ch.getText(tag))))
- continue;
+ // Ignore any trailing whitespace OR whitespace after removed html comment
+ if ((isLastNode || commentRemoved)
+ && tag.getKind() == TEXT
+ && isAllWhiteSpace(ch.getText(tag)))
+ continue;
+
+ // Ignore any leading html comments
+ if ((isFirstNode || commentRemoved) && tag.getKind() == COMMENT) {
+ commentRemoved = true;
+ continue;
+ }
+ }
boolean allDone = new SimpleDocTreeVisitor<Boolean, Content>() {
- // notify the next DocTree handler to take necessary action
- boolean commentRemoved = false;
-
- private boolean isLast(DocTree node) {
- return node.equals(tags.get(tags.size() - 1));
- }
-
- private boolean isFirst(DocTree node) {
- return node.equals(tags.get(0));
- }
private boolean inAnAtag() {
if (utils.isStartElement(tag)) {
@@ -1847,14 +1855,14 @@
if (text.startsWith("/..") && !configuration.docrootparent.isEmpty()) {
result.addContent(configuration.docrootparent);
docRootContent = new ContentBuilder();
- result.addContent(textCleanup(text.substring(3), isLast(node)));
+ result.addContent(textCleanup(text.substring(3), isLastNode));
} else {
if (!docRootContent.isEmpty()) {
docRootContent = copyDocRootContent(docRootContent);
} else {
text = redirectRelativeLinks(element, (TextTree) dt);
}
- result.addContent(textCleanup(text, isLast(node)));
+ result.addContent(textCleanup(text, isLastNode));
}
} else {
docRootContent = copyDocRootContent(docRootContent);
@@ -1868,10 +1876,6 @@
@Override
public Boolean visitComment(CommentTree node, Content c) {
- if (isFirstSentence && isFirst(node)) {
- commentRemoved = true;
- return this.visit(iterator.next(), c);
- }
result.addContent(new RawHtml(node.getBody()));
return false;
}
@@ -1996,8 +2000,7 @@
@Override
public Boolean visitText(TextTree node, Content c) {
String text = node.getBody();
- result.addContent(new RawHtml(textCleanup(text, isLast(node), commentRemoved)));
- commentRemoved = false;
+ result.addContent(new RawHtml(textCleanup(text, isLastNode, commentRemoved)));
return false;
}
@@ -2013,6 +2016,7 @@
}
}.visit(tag, null);
+ commentRemoved = false;
if (allDone)
break;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java Mon Jul 17 09:13:49 2017 -0700
@@ -115,7 +115,7 @@
@Override
public Void visitModule(ModuleElement e, Void p) {
si.setUrl(DocPaths.moduleSummary(e).getPath() + "#" + anchorName);
- si.setHolder(utils.getSimpleName(element));
+ si.setHolder(utils.getFullyQualifiedName(element));
return null;
}
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ModuleSummaryBuilder.java Mon Jul 17 09:13:49 2017 -0700
@@ -111,7 +111,7 @@
* @throws DocletException if there is a problem while building the documentation
*/
protected void buildModuleDoc(Content contentTree) throws DocletException {
- contentTree = moduleWriter.getModuleHeader(mdle.getSimpleName().toString());
+ contentTree = moduleWriter.getModuleHeader(mdle.getQualifiedName().toString());
buildContent(contentTree);
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Mon Jul 17 09:13:49 2017 -0700
@@ -867,3 +867,7 @@
border-left: 1px solid black;
border-right: 1px solid black;
}
+table.striped > tbody > tr > th {
+ font-weight: normal;
+}
+
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexBuilder.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexBuilder.java Mon Jul 17 09:13:49 2017 -0700
@@ -199,7 +199,7 @@
*/
protected void addModulesToIndexMap() {
for (ModuleElement mdle : configuration.modules) {
- String mdleName = mdle.getSimpleName().toString();
+ String mdleName = mdle.getQualifiedName().toString();
char ch = (mdleName.length() == 0)
? '*'
: Character.toUpperCase(mdleName.charAt(0));
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Mon Jul 17 09:13:49 2017 -0700
@@ -1682,7 +1682,7 @@
return new Utils.ElementComparator<Element>() {
@Override
public int compare(Element mod1, Element mod2) {
- return compareNames(mod1, mod2);
+ return compareFullyQualifiedNames(mod1, mod2);
}
};
}
@@ -1772,9 +1772,8 @@
/**
* Returns a Comparator for index file presentations, and are sorted as follows.
- * If comparing modules then simply compare the simple names,
- * comparing packages then simply compare the qualified names, if comparing a package with a
- * module/type/member then compare the FullyQualifiedName of the package
+ * If comparing modules and packages then simply compare the qualified names, if comparing a module
+ * or a package with a type/member then compare the FullyQualifiedName of the module or a package
* with the SimpleName of the entity, otherwise
* 1. compare the ElementKind ex: Module, Package, Interface etc.
* 2a. if equal and if the type is of ExecutableElement(Constructor, Methods),
@@ -1786,10 +1785,9 @@
public Comparator<Element> makeIndexUseComparator() {
return new Utils.ElementComparator<Element>() {
/**
- * Compare two given elements, if comparing two modules, return the
- * comparison of SimpleName, if comparing two packages, return the
- * comparison of FullyQualifiedName, if comparing a package with a
- * module/type/member then compare the FullyQualifiedName of the package
+ * Compare two given elements, if comparing two modules or two packages, return the
+ * comparison of FullyQualifiedName, if comparing a module or a package with a
+ * type/member then compare the FullyQualifiedName of the module or the package
* with the SimpleName of the entity, then sort on the kinds, then on
* the parameters only if the type is an ExecutableElement,
* the parameters are compared and finally the qualified names.
@@ -1802,16 +1800,17 @@
@Override
public int compare(Element e1, Element e2) {
int result = 0;
- if (isModule(e1) && isModule(e2)) {
- return compareNames(e1, e2);
+ if ((isModule(e1) || isPackage(e1)) && (isModule(e2) || isPackage(e2))) {
+ result = compareFullyQualifiedNames(e1, e2);
+ if (result != 0) {
+ return result;
+ }
+ return compareElementTypeKinds(e1, e2);
}
- if (isPackage(e1) && isPackage(e2)) {
- return compareFullyQualifiedNames(e1, e2);
- }
- if (isPackage(e1) || isPackage(e2)) {
- result = (isPackage(e1))
- ? compareStrings(getFullyQualifiedName(e1), getSimpleName(e2))
- : compareStrings(getSimpleName(e1), getFullyQualifiedName(e2));
+ if (isModule(e1) || isPackage(e1)) {
+ result = compareStrings(getFullyQualifiedName(e1), getSimpleName(e2));
+ } else if (isModule(e2) || isPackage(e2)) {
+ result = compareStrings(getSimpleName(e1), getFullyQualifiedName(e2));
} else {
result = compareNames(e1, e2);
}
@@ -1916,6 +1915,11 @@
public String getFullyQualifiedName(Element e, final boolean outer) {
return new SimpleElementVisitor9<String, Void>() {
@Override
+ public String visitModule(ModuleElement e, Void p) {
+ return e.getQualifiedName().toString();
+ }
+
+ @Override
public String visitPackage(PackageElement e, Void p) {
return e.getQualifiedName().toString();
}
@@ -2527,7 +2531,7 @@
snvisitor = new SimpleElementVisitor9<String, Void>() {
@Override
public String visitModule(ModuleElement e, Void p) {
- return e.getSimpleName().toString();
+ return e.getQualifiedName().toString(); // temp fix for 8182736
}
@Override
--- a/langtools/src/jdk.javadoc/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -25,7 +25,7 @@
/**
* Defines the implementation of the
- * {@link javax.tools.ToolProvider#getSystemDocumentationTool system documentation tool}
+ * {@linkplain javax.tools.ToolProvider#getSystemDocumentationTool system documentation tool}
* and its command line equivalent, <em>{@index javadoc javadoc tool}</em>.
*
* <h2 style="font-family:'DejaVu Sans Mono', monospace; font-style:italic">javadoc</h2>
@@ -39,7 +39,7 @@
*
* <p> Instances of the tools can be obtained by calling
* {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst}
- * or the {@link java.util.ServiceLoader service loader} with the name
+ * or the {@linkplain java.util.ServiceLoader service loader} with the name
* {@code "javadoc"}.
*
* <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
--- a/langtools/src/jdk.jdeps/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.jdeps/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -26,7 +26,7 @@
/**
* Defines tools for analysing dependencies in Java libraries and programs,
* including the <em>{@index jdeps jdeps tool}</em>,
- * <em>{@index javap javap tool}</em> and
+ * <em>{@index javap javap tool}</em>, and
* <em>{@index jdeprscan jdeprscan tool}</em> tools.
*
* <p>
@@ -37,7 +37,7 @@
*
* <p> Instances of the tools can be obtained by calling
* {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst}
- * or the {@link java.util.ServiceLoader service loader} with the name
+ * or the {@linkplain java.util.ServiceLoader service loader} with the name
* {@code "javap"} or {@code "jdeps"} as appropriate.
*
* <p>
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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
@@ -72,7 +72,7 @@
* or a static on-demand type import
* ({@link jdk.jshell.Snippet.SubKind#SINGLE_STATIC_IMPORT_SUBKIND}) --
* use {@link jdk.jshell.Snippet#subKind()} to distinguish.
- * <P>
+ *
* @jls 8.3: importDeclaration.
* <P>
* An import declaration is {@linkplain Kind#isPersistent() persistent}.
@@ -90,7 +90,7 @@
* classes {@link jdk.jshell.Snippet.SubKind#CLASS_SUBKIND}, enums, and
* annotation interfaces -- see {@link jdk.jshell.Snippet.SubKind} to
* differentiate.
- * <P>
+ *
* @jls 7.6: TypeDeclaration.
* <P>
* A type declaration is {@linkplain Kind#isPersistent() persistent}.
@@ -100,7 +100,7 @@
/**
* A method declaration.
* The snippet is an instance of {@link jdk.jshell.MethodSnippet}.
- * <P>
+ *
* @jls 8.4: MethodDeclaration.
* <P>
* A method declaration is {@linkplain Kind#isPersistent() persistent}.
@@ -115,7 +115,7 @@
* The variable may be with or without initializer, or be a temporary
* variable representing an expression -- see
* {@link jdk.jshell.Snippet.SubKind}to differentiate.
- * <P>
+ *
* @jls 8.3: FieldDeclaration.
* <P>
* A variable declaration is {@linkplain Kind#isPersistent() persistent}.
@@ -132,7 +132,7 @@
* names) -- see {@link jdk.jshell.Snippet.SubKind} to differentiate.
* All other expression forms (operators, method calls, ...) generate a
* scratch variable and so are instead of the VAR Kind.
- * <P>
+ *
* @jls 15: Expression.
*/
EXPRESSION(false),
@@ -140,7 +140,7 @@
/**
* A statement.
* The snippet is an instance of {@link jdk.jshell.StatementSnippet}.
- * <P>
+ *
* @jls 14.5: Statement.
*/
STATEMENT(false),
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControlProvider.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiExecutionControlProvider.java Mon Jul 17 09:13:49 2017 -0700
@@ -90,33 +90,37 @@
* {@code ExecutionControlProvider}. The map can optionally be modified;
* Modified or unmodified it can be passed to
* {@link #generate(jdk.jshell.spi.ExecutionEnv, java.util.Map) }.
- * <table>
+ * <table class="striped">
* <caption>Parameters</caption>
+ * <thead>
* <tr>
- * <th>Parameter</th>
- * <th>Description</th>
- * <th>Constant Field</th>
+ * <th scope="col">Parameter</th>
+ * <th scope="col">Description</th>
+ * <th scope="col">Constant Field</th>
* </tr>
+ * </thead>
+ * <tbody>
* <tr>
- * <td>remoteAgent</td>
+ * <th scope="row">remoteAgent</th>
* <td>the remote agent to launch</td>
* <td>{@link #PARAM_REMOTE_AGENT}</td>
* </tr>
* <tr>
- * <td>timeout</td>
+ * <th scope="row">timeout</th>
* <td>milliseconds before connect timeout</td>
* <td>{@link #PARAM_TIMEOUT}</td>
* </tr>
* <tr>
- * <td>launch</td>
+ * <th scope="row">launch</th>
* <td>"true" for JDI controlled launch</td>
* <td>{@link #PARAM_LAUNCH}</td>
* </tr>
* <tr>
- * <td>hostname</td>
+ * <th scope="row">hostname</th>
* <td>connect to the named of the local host ("" for discovered)</td>
* <td>{@link #PARAM_HOST_NAME}</td>
* </tr>
+ * </tbody>
* </table>
*
* @return the default parameter map
--- a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java Mon Jul 17 09:13:49 2017 -0700
@@ -372,7 +372,20 @@
"--module", "moduleB",
"testpkg2mdlB", "testpkgmdlB");
checkExit(Exit.OK);
- //checkOverviewSummaryPackages();
+ checkGroupOptionSingleModule();
+ }
+
+ /**
+ * Test -group option for a single module.
+ */
+ @Test
+ void testModuleName() {
+ javadoc("-d", "out-modulename", "-use",
+ "--module-source-path", testSrc,
+ "--module", "moduleB,test.moduleFullName",
+ "testpkg2mdlB", "testpkgmdlB", "testpkgmdlfullname");
+ checkExit(Exit.OK);
+ checkModuleName(true);
}
void checkDescription(boolean found) {
@@ -1089,4 +1102,35 @@
"<table class=\"overviewSummary\" summary=\"Modules table, listing modules, and an explanation\">\n"
+ "<caption><span>Modules</span><span class=\"tabEnd\"> </span></caption>");
}
+
+ void checkModuleName(boolean found) {
+ checkOutput("test.moduleFullName-summary.html", found,
+ "<div class=\"header\">\n"
+ + "<h1 title=\"Module\" class=\"title\">Module test.moduleFullName</h1>\n"
+ + "</div>");
+ checkOutput("index-all.html", found,
+ "<h2 class=\"title\">T</h2>\n"
+ + "<dl>\n"
+ + "<dt><a href=\"test.moduleFullName-summary.html\">test.moduleFullName</a> - module test.moduleFullName</dt>\n"
+ + "<dd>\n"
+ + "<div class=\"block\">This is a test description for the test.moduleFullName.</div>\n"
+ + "</dd>");
+ checkOutput("module-overview-frame.html", found,
+ "<h2 title=\"Modules\">Modules</h2>\n"
+ + "<ul title=\"Modules\">\n"
+ + "<li><a href=\"moduleB-frame.html\" target=\"packageListFrame\" onclick=\"updateModuleFrame('moduleB-type-frame.html','moduleB-summary.html');\">moduleB</a></li>\n"
+ + "<li><a href=\"test.moduleFullName-frame.html\" target=\"packageListFrame\" onclick=\"updateModuleFrame('test.moduleFullName-type-frame.html','test.moduleFullName-summary.html');\">test.moduleFullName</a></li>\n"
+ + "</ul>");
+ checkOutput("test.moduleFullName-summary.html", !found,
+ "<div class=\"header\">\n"
+ + "<h1 title=\"Module\" class=\"title\">Module moduleFullName</h1>\n"
+ + "</div>");
+ checkOutput("index-all.html", !found,
+ "<dl>\n"
+ + "<dt><a href=\"test.moduleFullName-summary.html\">moduleFullName</a> - module moduleFullName</dt>\n"
+ + "<dd>\n"
+ + "<div class=\"block\">This is a test description for the test.moduleFullName.</div>\n"
+ + "</dd>\n"
+ + "</dl>");
}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testModules/test.moduleFullName/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This is a test description for the test.moduleFullName.
+ *
+ */
+module test.moduleFullName {
+ exports testpkgmdlfullname;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testModules/test.moduleFullName/testpkgmdlfullname/TestClassInTestModuleFullName.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package testpkgmdlfullname;
+
+public class TestClassInTestModuleFullName {
+ public void testMethod() { }
+}
--- a/langtools/test/jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -23,8 +23,8 @@
/*
* @test
- * @bug 8150096
- * @summary Make sure package.html is recognized by doclint
+ * @bug 8150096 8179704
+ * @summary test package.html handling
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build JavadocTester
@@ -37,12 +37,36 @@
tester.runTests();
}
+ // Make sure package.html is recognized by doclint
@Test
void testPackageHtml() {
- javadoc("-d", "out-pkg-html",
+ javadoc("-d", "out-pkg-html-1",
"-sourcepath", testSrc,
"pkg1");
checkExit(Exit.ERROR);
checkOutput(Output.OUT, true, "package.html:10: error: bad use of '>'");
}
+
+ // Doclet must handle empty body in package.html, must
+ // ignore html comment in the first sentence and must
+ // ignore trailing whitespace in a first sentence.
+ @Test
+ void testPackageHtmlWithEmptyBody() {
+ javadoc("-d", "out-pkg-html-2",
+ "-sourcepath", testSrc,
+ "pkg2", "pkg3", "pkg4");
+ checkExit(Exit.OK);
+ checkOutput("index-all.html", true,
+ "<dl>\n"
+ + "<dt><a href=\"pkg2/package-summary.html\">pkg2</a> - package pkg2</dt>\n"
+ + "<dt><a href=\"pkg3/package-summary.html\">pkg3</a> - package pkg3</dt>\n"
+ + "<dd>\n"
+ + "<div class=\"block\">This is a documentation for <a href=\"pkg3/package-summary.html\"><code>pkg3</code></a></div>\n"
+ + "</dd>\n"
+ + "<dt><a href=\"pkg4/package-summary.html\">pkg4</a> - package pkg4</dt>\n"
+ + "<dd>\n"
+ + "<div class=\"block\">This is a documentation for <a href=\"pkg4/package-summary.html\"><code>pkg4</code></a></div>\n"
+ + "</dd>\n"
+ + "</dl>\n");
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg2/X.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg2;
+
+/**
+ * An empty class.
+ */
+public class X {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg2/package.html Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,6 @@
+<HTML>
+ <BODY>
+ <!-- an empty package.html -->
+ </BODY>
+</HTML>
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg3/X.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg3;
+
+/**
+ * An empty class.
+ */
+public class X {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg3/package.html Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,9 @@
+<HTML>
+ <BODY>
+ <!-- a HTML comment -->
+ This is a documentation for {@link pkg3}
+
+ <p>Next para</p>
+ </BODY>
+</HTML>
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg4/X.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg4;
+
+/**
+ * An empty class.
+ */
+public class X {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testPackageHtml/pkg4/package.html Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,9 @@
+<HTML>
+ <BODY>
+ <!-- a HTML comment --> <!--another comment -->
+ This is a documentation for {@link pkg4}
+
+ <p>Next para</p>
+ </BODY>
+</HTML>
+
--- a/langtools/test/tools/javac/IllegalAnnotation.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/tools/javac/IllegalAnnotation.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,6 +1,6 @@
/**
* @test /nodynamiccopyright/
- * @bug 5012028 6384539
+ * @bug 5012028 6384539 8074364
* @summary javac crash when declare an annotation type illegally
*
* @compile/fail/ref=IllegalAnnotation.out -XDrawDiagnostics IllegalAnnotation.java
--- a/langtools/test/tools/javac/IllegalAnnotation.out Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/tools/javac/IllegalAnnotation.out Mon Jul 17 09:13:49 2017 -0700
@@ -1,2 +1,2 @@
-IllegalAnnotation.java:10:10: compiler.err.intf.not.allowed.here
+IllegalAnnotation.java:10:10: compiler.err.annotation.decl.not.allowed.here
1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/IllegalAnnotationDeclaration.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.annotation.decl.not.allowed.here
+
+class IllegalAnnotationDeclaration {
+ {
+ @interface SomeAnnotation { }
+ }
+}
--- a/langtools/test/tools/javac/lambda/LambdaConv18.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/tools/javac/lambda/LambdaConv18.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,24 +1,19 @@
/*
* @test /nodynamiccopyright/
- * @bug 8003280 8064365
+ * @bug 8003280 8064365 8183126
* @summary Add lambda tests
* simple test for lambda candidate check
- * @compile/fail/ref=LambdaConv18.out -XDrawDiagnostics -XDfind=lambda LambdaConv18.java
+ * @compile/fail/ref=LambdaConv18.out -XDrawDiagnostics LambdaConv18.java
*/
class LambdaConv18 {
- interface SAM {
- void m();
- }
-
interface NonSAM {
void m1();
void m2();
}
- SAM s1 = new SAM() { public void m() {} };
- NonSAM s2 = new NonSAM() { public void m1() {}
+ NonSAM s1 = new NonSAM() { public void m1() {}
public void m2() {} };
- NonExistent s3 = new NonExistent() { public void m() {} };
+ NonExistent s2 = new NonExistent() { public void m() {} };
}
--- a/langtools/test/tools/javac/lambda/LambdaConv18.out Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/tools/javac/lambda/LambdaConv18.out Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,3 @@
-LambdaConv18.java:23:5: compiler.err.cant.resolve.location: kindname.class, NonExistent, , , (compiler.misc.location: kindname.class, LambdaConv18, null)
-LambdaConv18.java:20:24: compiler.warn.potential.lambda.found
-LambdaConv18.java:23:26: compiler.err.cant.resolve.location: kindname.class, NonExistent, , , (compiler.misc.location: kindname.class, LambdaConv18, null)
+LambdaConv18.java:18:5: compiler.err.cant.resolve.location: kindname.class, NonExistent, , , (compiler.misc.location: kindname.class, LambdaConv18, null)
+LambdaConv18.java:18:26: compiler.err.cant.resolve.location: kindname.class, NonExistent, , , (compiler.misc.location: kindname.class, LambdaConv18, null)
2 errors
-1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/LambdaConv29.java Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,15 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8183126
+ * @summary test for lambda finder
+ * @compile/fail/ref=LambdaConv29.out -XDrawDiagnostics -Werror -XDfind=lambda LambdaConv29.java
+ */
+
+class LambdaConv29 {
+
+ interface SAM {
+ void m();
+ }
+
+ SAM s1 = new SAM() { public void m() {} };
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/LambdaConv29.out Mon Jul 17 09:13:49 2017 -0700
@@ -0,0 +1,4 @@
+LambdaConv29.java:14:24: compiler.warn.potential.lambda.found
+- compiler.err.warnings.and.werror
+1 error
+1 warning
--- a/langtools/test/tools/javadoc/8147801/T8147801.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/tools/javadoc/8147801/T8147801.java Mon Jul 17 09:13:49 2017 -0700
@@ -31,6 +31,7 @@
* @run main T8147801
*/
+import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -42,6 +43,7 @@
import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
+import java.util.stream.Stream;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.FieldDoc;
@@ -143,13 +145,18 @@
}
void initJar() throws IOException {
- Path testClasses = Paths.get(System.getProperty("test.classes"));
+ String testClassPath = System.getProperty("test.class.path", "");
+ Path jarsrc = Stream.of(testClassPath.split(File.pathSeparator))
+ .map(Paths::get)
+ .filter(e -> e.endsWith("jarsrc"))
+ .findAny()
+ .orElseThrow(() -> new InternalError("jarsrc not found"));
jarPath = Paths.get("lib.jar");
try (JarOutputStream out = new JarOutputStream(Files.newOutputStream(jarPath))) {
String[] classNames = {"Lib1.class", "Lib2.class"};
for (String cn : classNames) {
out.putNextEntry(new JarEntry("lib/" + cn));
- Path libClass = testClasses.resolve("jarsrc").resolve("lib").resolve(cn);
+ Path libClass = jarsrc.resolve("lib").resolve(cn);
out.write(Files.readAllBytes(libClass));
}
}
--- a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestLoad.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestLoad.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -37,6 +37,7 @@
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
@@ -48,6 +49,7 @@
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import com.sun.tools.jdeprscan.Main;
@@ -63,8 +65,11 @@
@Test
public void test1() throws IOException, UnsupportedEncodingException {
- String testclasses = System.getProperty("test.classes");
- String deprcases = testclasses + "/../../../cases";
+ String testClassPath = System.getProperty("test.class.path", "");
+ String deprcases = Stream.of(testClassPath.split(File.pathSeparator))
+ .filter(e -> e.endsWith("cases"))
+ .findAny()
+ .orElseThrow(() -> new InternalError("cases not found"));
boolean rval;
System.out.println("test.src = " + System.getProperty("test.src"));
--- a/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestScan.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/tools/jdeprscan/tests/jdk/jdeprscan/TestScan.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -40,6 +40,7 @@
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
@@ -50,6 +51,7 @@
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -65,9 +67,16 @@
@Test
public void testScanAgainstReferenceFile() throws IOException {
- String testclasses = System.getProperty("test.classes");
- String deprcases = testclasses + "/../../../cases";
- String deprusage = testclasses + "/../../../usage";
+ String[] testClassPath = System.getProperty("test.class.path", "")
+ .split(File.pathSeparator);
+ String deprcases = Stream.of(testClassPath)
+ .filter(e -> e.endsWith("cases"))
+ .findAny()
+ .orElseThrow(() -> new InternalError("cases not found"));
+ String deprusage = Stream.of(testClassPath)
+ .filter(e -> e.endsWith("usage"))
+ .findAny()
+ .orElseThrow(() -> new InternalError("usage not found"));
Set<String> expected = loadExpected();
System.out.println("expected = " + expected);
--- a/langtools/test/tools/jdeps/MultiReleaseJar.java Thu Jul 06 09:36:17 2017 -0700
+++ b/langtools/test/tools/jdeps/MultiReleaseJar.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -36,11 +36,13 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
public class MultiReleaseJar {
Path mrjar;
@@ -50,7 +52,12 @@
@BeforeClass
public void initialize() throws Exception {
- mrjar = Paths.get(System.getProperty("test.classes", "."), "mrjar");
+ String testClassPath = System.getProperty("test.class.path", "");
+ mrjar = Stream.of(testClassPath.split(File.pathSeparator))
+ .map(Paths::get)
+ .filter(e -> e.endsWith("mrjar"))
+ .findAny()
+ .orElseThrow(() -> new InternalError("mrjar not found"));
testJdk = System.getProperty("test.jdk");
fileSep = System.getProperty("file.separator");
cmdPath = Paths.get(testJdk, "bin");
--- a/make/Docs.gmk Thu Jul 06 09:36:17 2017 -0700
+++ b/make/Docs.gmk Mon Jul 17 09:13:49 2017 -0700
@@ -158,7 +158,7 @@
JDK_SHORT_NAME := Java SE $(VERSION_SPECIFICATION) & JDK $(VERSION_SPECIFICATION)
JDK_LONG_NAME := Java<sup>®</sup> Platform, Standard Edition \
- <span style="white-space: nowrap;">& Java Development Kit</span>
+ & Java Development Kit
################################################################################
# Java SE javadoc titles/text snippets
@@ -206,10 +206,10 @@
#
$1_OVERVIEW_TEXT += $$(foreach g, $$($1_GROUPS), \
<dt style="margin-top: 8px;"><a href="\#$$g">$$($$g_GROUP_NAME)</a></dt> \
- <dd style="margin-top: 8px;">$$($$g_GROUP_DESCRIPTION)</dt> \
+ <dd style="margin-top: 8px;">$$($$g_GROUP_DESCRIPTION)</dd> \
)
$1_OVERVIEW_TEXT += \
- </dl><blockquote> \
+ </dl></blockquote> \
#
endif
$1_OVERVIEW_TEXT += \
--- a/make/Init.gmk Thu Jul 06 09:36:17 2017 -0700
+++ b/make/Init.gmk Mon Jul 17 09:13:49 2017 -0700
@@ -329,7 +329,7 @@
$(call PrintFailureReports)
$(call PrintBuildLogFailures)
$(call ReportProfileTimes)
- $(PRINTF) "Hint: If caused by a warning, try configure --disable-warnings-as-errors.\n\n"
+ $(PRINTF) "Hint: See common/doc/building.html#troubleshooting for assistance.\n\n"
ifneq ($(COMPARE_BUILD), )
$(call CleanupCompareBuild)
endif
--- a/make/Main.gmk Thu Jul 06 09:36:17 2017 -0700
+++ b/make/Main.gmk Mon Jul 17 09:13:49 2017 -0700
@@ -699,6 +699,9 @@
jdk.jdeps-gendata: java rmic
+ # The ct.sym generation uses all the moduleinfos as input
+ jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS)
+
# Declare dependencies between jmod targets.
# java.base jmod needs jrt-fs.jar and access to the other jmods to be built.
# When creating a BUILDJDK, we don't need to add hashes to java.base, thus
--- a/make/UpdateBuildDocs.gmk Thu Jul 06 09:36:17 2017 -0700
+++ b/make/UpdateBuildDocs.gmk Mon Jul 17 09:13:49 2017 -0700
@@ -39,7 +39,7 @@
$(error Cannot continue)
endif
-GLOBAL_SPECS_DEFAULT_CSS_FILE := $(JDK_TOPDIR)/make/data/docs-resources/specs/resources/jdk-default.css
+GLOBAL_SPECS_DEFAULT_CSS_FILE := $(JDK_TOPDIR)/make/data/docs-resources/resources/jdk-default.css
################################################################################
@@ -49,6 +49,7 @@
FILES := $(DOCS_DIR)/building.md, \
DEST := $(DOCS_DIR), \
CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
+ OPTIONS := --toc, \
))
TARGETS += $(building)
--- a/nashorn/.hgtags Thu Jul 06 09:36:17 2017 -0700
+++ b/nashorn/.hgtags Mon Jul 17 09:13:49 2017 -0700
@@ -423,3 +423,6 @@
de571c0a93258599054f18184cbdeae42cd95265 jdk-10+12
734b3209b6edeb57e482c97793ae9c066af72871 jdk-9+175
2ab4a2055c2e309872f648fa7ab4daae0bf8994c jdk-10+13
+fed3f329875710c74f3ec1a0c4714046a79af100 jdk-10+14
+3c6fbdf6e785aaf18d35ce9c6684369952fd22ec jdk-9+176
+aa7404e062b95f679018f25eaaf933dcf0cf3f2b jdk-9+177
--- a/nashorn/src/jdk.dynalink/share/classes/module-info.java Thu Jul 06 09:36:17 2017 -0700
+++ b/nashorn/src/jdk.dynalink/share/classes/module-info.java Mon Jul 17 09:13:49 2017 -0700
@@ -32,8 +32,8 @@
* useful for implementing programming languages where at least some expressions
* have dynamic types (that is, types that can not be decided statically), and
* the operations on dynamic types are expressed as
- * {@link java.lang.invoke.CallSite call sites}. These call sites will be
- * linked to appropriate target {@link java.lang.invoke.MethodHandle method handles}
+ * {@linkplain java.lang.invoke.CallSite call sites}. These call sites will be
+ * linked to appropriate target {@linkplain java.lang.invoke.MethodHandle method handles}
* at run time based on actual types of the values the expressions evaluated to.
* These can change between invocations, necessitating relinking the call site
* multiple times to accommodate new types; Dynalink handles all that and more.
@@ -205,7 +205,7 @@
* on how it links the various operations.
* <h2>Cross-language interoperability</h2>
* A {@code DynamicLinkerFactory} can be configured with a
- * {@link jdk.dynalink.DynamicLinkerFactory#setClassLoader(ClassLoader) class
+ * {@linkplain jdk.dynalink.DynamicLinkerFactory#setClassLoader(ClassLoader) class
* loader}. It will try to instantiate all
* {@link jdk.dynalink.linker.GuardingDynamicLinkerExporter} classes visible to
* that class loader and compose the linkers they provide into the
--- a/test/jtreg-ext/requires/VMProps.java Thu Jul 06 09:36:17 2017 -0700
+++ b/test/jtreg-ext/requires/VMProps.java Mon Jul 17 09:13:49 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -73,6 +73,19 @@
}
/**
+ * Prints a stack trace before returning null.
+ * Used by the various helper functions which parse information from
+ * VM properties in the case where they don't find an expected property
+ * or a propoerty doesn't conform to an expected format.
+ *
+ * @return null
+ */
+ private String nullWithException(String message) {
+ new Exception(message).printStackTrace();
+ return null;
+ }
+
+ /**
* @return vm.simpleArch value of "os.simpleArch" property of tested JDK.
*/
protected String vmArch() {
@@ -96,7 +109,7 @@
// E.g. "Java HotSpot(TM) 64-Bit Server VM"
String vmName = System.getProperty("java.vm.name");
if (vmName == null) {
- return null;
+ return nullWithException("Can't get 'java.vm.name' property");
}
Pattern startP = Pattern.compile(".* (\\S+) VM");
@@ -104,7 +117,7 @@
if (m.matches()) {
return m.group(1).toLowerCase();
}
- return null;
+ return nullWithException("Can't get VM flavor from 'java.vm.name'");
}
/**
@@ -114,18 +127,16 @@
// E.g. "mixed mode"
String vmInfo = System.getProperty("java.vm.info");
if (vmInfo == null) {
- return null;
- }
- int k = vmInfo.toLowerCase().indexOf(" mode");
- if (k < 0) {
- return null;
+ return nullWithException("Can't get 'java.vm.info' property");
}
- vmInfo = vmInfo.substring(0, k);
- switch (vmInfo) {
- case "mixed" : return "Xmixed";
- case "compiled" : return "Xcomp";
- case "interpreted" : return "Xint";
- default: return null;
+ if (vmInfo.toLowerCase().indexOf("mixed mode") != -1) {
+ return "Xmixed";
+ } else if (vmInfo.toLowerCase().indexOf("compiled mode") != -1) {
+ return "Xcomp";
+ } else if (vmInfo.toLowerCase().indexOf("interpreted mode") != -1) {
+ return "Xint";
+ } else {
+ return nullWithException("Can't get compilation mode from 'java.vm.info'");
}
}
@@ -133,7 +144,12 @@
* @return VM bitness, the value of the "sun.arch.data.model" property.
*/
protected String vmBits() {
- return System.getProperty("sun.arch.data.model");
+ String dataModel = System.getProperty("sun.arch.data.model");
+ if (dataModel != null) {
+ return dataModel;
+ } else {
+ return nullWithException("Can't get 'sun.arch.data.model' property");
+ }
}
/**
@@ -158,7 +174,12 @@
* @return debug level value extracted from the "jdk.debug" property.
*/
protected String vmDebug() {
- return "" + System.getProperty("jdk.debug").contains("debug");
+ String debug = System.getProperty("jdk.debug");
+ if (debug != null) {
+ return "" + debug.contains("debug");
+ } else {
+ return nullWithException("Can't get 'jdk.debug' property");
+ }
}
/**